commit d5428f32f5d1719f774f62e19147104ca245a3ab
author Torne (Richard Coles) <torne@google.com> Tue Mar 18 10:21:16 2014 +0000
committer Torne (Richard Coles) <torne@google.com> Tue Mar 18 10:21:16 2014 +0000
tree fd77736d241e8efae3036625c1c5fb056d3bd84a
parent 0422625e8fbb39f6cb3aa07393a1c05d70b22b4b

Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I834f3ca85c1ef7ec2c1061847a3d92aa461da043

Source/core/svg/SVGAnimationElement.h

diff --git a/Source/core/svg/SVGAnimationElement.h b/Source/core/svg/SVGAnimationElement.h
index bec165a..2749778 100644
--- a/Source/core/svg/SVGAnimationElement.h
+++ b/Source/core/svg/SVGAnimationElement.h
@@ -196,6 +196,8 @@
 
     virtual void setTargetElement(SVGElement*) OVERRIDE;
     virtual void setAttributeName(const QualifiedName&) OVERRIDE;
+    AnimatedPropertyType determineAnimatedPropertyType() const;
+
     bool hasInvalidCSSAttributeType() const { return m_hasInvalidCSSAttributeType; }
 
     virtual void updateAnimationMode();
@@ -224,9 +226,6 @@
 
     void adjustForInheritance(SVGElement* targetElement, const QualifiedName& attributeName, String&);
 
-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGAnimationElement)
-    END_DECLARE_ANIMATED_PROPERTIES
-
     void setCalcMode(const AtomicString&);
 
     bool m_animationValid;