commit f6b7aed3f7ce69aca0d7a032d144cbd088b04393
author Torne (Richard Coles) <torne@google.com> Mon Jun 09 12:01:17 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Mon Jun 09 12:01:17 2014 +0100
tree 50d4ba789305920c2ab663df65fe20b4d1f90cef
parent 3251f4cad0ad21e3602b881e6aa4e51719aec6e6

Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Id3e5fc241d238b5648d8202304515911b565d457

Source/core/svg/SVGAnimationElement.h

diff --git a/Source/core/svg/SVGAnimationElement.h b/Source/core/svg/SVGAnimationElement.h
index ef5d2b2..068fda8 100644
--- a/Source/core/svg/SVGAnimationElement.h
+++ b/Source/core/svg/SVGAnimationElement.h
@@ -80,7 +80,7 @@
 
     static bool isTargetAttributeCSSProperty(SVGElement*, const QualifiedName&);
 
-    virtual bool isAdditive() const;
+    virtual bool isAdditive();
     bool isAccumulated() const;
     AnimationMode animationMode() const { return m_animationMode; }
     CalcMode calcMode() const { return m_calcMode; }
@@ -164,7 +164,6 @@
 
     virtual void setTargetElement(SVGElement*) OVERRIDE;
     virtual void setAttributeName(const QualifiedName&) OVERRIDE;
-    AnimatedPropertyType determineAnimatedPropertyType() const;
 
     bool hasInvalidCSSAttributeType() const { return m_hasInvalidCSSAttributeType; }