Push animation value 'inherit' handling into SVGAnimateElement

third_party/WebKit/Source/core/svg/SVGAnimationElement.h

Index: third_party/WebKit/Source/core/svg/SVGAnimationElement.h
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimationElement.h b/third_party/WebKit/Source/core/svg/SVGAnimationElement.h
index 03628d241622ee23df1264b6f97b58729999671a..18cb04d0e6ce42ae2abc17adb473192ade60b749 100644
--- a/third_party/WebKit/Source/core/svg/SVGAnimationElement.h
+++ b/third_party/WebKit/Source/core/svg/SVGAnimationElement.h
@@ -28,7 +28,6 @@
 #include "core/CoreExport.h"
 #include "core/svg/animation/SVGSMILElement.h"
 #include "ui/gfx/geometry/cubic_bezier.h"
-#include "wtf/Functional.h"
 #include "wtf/Vector.h"
 
 namespace blink {
@@ -45,10 +44,6 @@ enum AnimationMode {
   PathAnimation  // Used by AnimateMotion.
 };
 
-// If we have 'inherit' as animation value, we need to grab the value
-// during the animation since the value can be animated itself.
-enum AnimatedPropertyValueType { RegularPropertyValue, InheritValue };
-
 enum CalcMode {
   CalcModeDiscrete,
   CalcModeLinear,
@@ -92,26 +87,6 @@ class CORE_EXPORT SVGAnimationElement : public SVGSMILElement {
       SVGElement* targetElement,
       const QualifiedName& attributeName);
 
-  AnimatedPropertyValueType fromPropertyValueType() const {
-    return m_fromPropertyValueType;
-  }
-  AnimatedPropertyValueType toPropertyValueType() const {
-    return m_toPropertyValueType;
-  }
-
-  template <typename AnimatedType, typename ParseTypeFromStringType>
-  void adjustForInheritance(ParseTypeFromStringType parseTypeFromString,
-                            AnimatedPropertyValueType valueType,
-                            AnimatedType& animatedType,
-                            SVGElement* contextElement) {
-    if (valueType != InheritValue)
-      return;
-    // Replace 'inherit' by its computed property value.
-    String typeString;
-    adjustForInheritance(contextElement, attributeName(), typeString);
-    animatedType = parseTypeFromString(this, typeString);
-  }
-
   template <typename AnimatedType>
   void animateDiscreteType(float percentage,
                            const AnimatedType& fromType,
@@ -149,9 +124,6 @@ class CORE_EXPORT SVGAnimationElement : public SVGSMILElement {
  protected:
   SVGAnimationElement(const QualifiedName&, Document&);
 
-  void computeCSSPropertyValue(SVGElement*, CSSPropertyID, String& value);
-  void determinePropertyValueTypes(const String& from, const String& to);
-
   void parseAttribute(const QualifiedName&,
                       const AtomicString&,
                       const AtomicString&) override;
@@ -170,9 +142,6 @@ class CORE_EXPORT SVGAnimationElement : public SVGSMILElement {
                        unsigned repeat,
                        SVGSMILElement* resultElement) override;
 
-  AnimatedPropertyValueType m_fromPropertyValueType;
-  AnimatedPropertyValueType m_toPropertyValueType;
-
   void setTargetElement(SVGElement*) override;
   void setAttributeName(const QualifiedName&) override;
 
@@ -229,10 +198,6 @@ class CORE_EXPORT SVGAnimationElement : public SVGSMILElement {
   float calculatePercentForFromTo(float percent) const;
   unsigned calculateKeyTimesIndex(float percent) const;
 
-  void adjustForInheritance(SVGElement* targetElement,
-                            const QualifiedName& attributeName,
-                            String&);
-
   void setCalcMode(const AtomicString&);
 
   bool m_animationValid;