Fold SVGAnimatedTypeAnimator into SVGAnimateElement

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

Index: third_party/WebKit/Source/core/svg/SVGAnimateElement.h
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateElement.h b/third_party/WebKit/Source/core/svg/SVGAnimateElement.h
index 2325e5218085cc4734d7f395b41246de6f1207ec..87c38eab9246f6df372b9fb3751ab43a8ed66922 100644
--- a/third_party/WebKit/Source/core/svg/SVGAnimateElement.h
+++ b/third_party/WebKit/Source/core/svg/SVGAnimateElement.h
@@ -23,9 +23,9 @@
 #ifndef SVGAnimateElement_h
 #define SVGAnimateElement_h
 
+#include "core/CSSPropertyNames.h"
 #include "core/CoreExport.h"
 #include "core/SVGNames.h"
-#include "core/svg/SVGAnimatedTypeAnimator.h"
 #include "core/svg/SVGAnimationElement.h"
 #include "platform/heap/Handle.h"
 #include <base/gtest_prod_util.h>
@@ -101,16 +101,32 @@ class CORE_EXPORT SVGAnimateElement : public SVGAnimationElement {
   bool hasValidAttributeName() const;
   virtual bool hasValidAttributeType();
 
+  virtual void resolveTargetProperty();
+  void clearTargetProperty();
+
+  virtual SVGPropertyBase* createPropertyForAnimation(const String&) const;
+  SVGPropertyBase* createPropertyForAttributeAnimation(const String&) const;
+  SVGPropertyBase* createPropertyForCSSAnimation(const String&) const;
+
   SVGPropertyBase* adjustForInheritance(SVGPropertyBase*,
                                         AnimatedPropertyValueType) const;
 
   Member<SVGPropertyBase> m_fromProperty;
   Member<SVGPropertyBase> m_toProperty;
   Member<SVGPropertyBase> m_toAtEndOfDurationProperty;
-  Member<SVGPropertyBase> m_animatedProperty;
+  Member<SVGPropertyBase> m_animatedValue;
+
+ protected:
+  Member<SVGAnimatedPropertyBase> m_targetProperty;
+  AnimatedPropertyType m_type;
+  CSSPropertyID m_cssPropertyId;
 
-  SVGAnimatedTypeAnimator m_animator;
+  bool isAnimatingSVGDom() const { return m_targetProperty; }
+  bool isAnimatingCSSProperty() const {
+    return m_cssPropertyId != CSSPropertyInvalid;
+  }
 
+ private:
   AnimatedPropertyValueType m_fromPropertyValueType;
   AnimatedPropertyValueType m_toPropertyValueType;
   AttributeType m_attributeType;