Move handling of 'attributeType' to SVGAnimateElement

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

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Cameron McCormack <cam@mcc.id.au>
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 100 matching lines @@
   }
 
  protected:
   SVGAnimationElement(const QualifiedName&, Document&);
 
   void parseAttribute(const QualifiedName&,
                       const AtomicString&,
                       const AtomicString&) override;
   void svgAttributeChanged(const QualifiedName&) override;
 
-  enum AttributeType { AttributeTypeCSS, AttributeTypeXML, AttributeTypeAuto };
-  AttributeType getAttributeType() const { return m_attributeType; }
-
   String toValue() const;
   String byValue() const;
   String fromValue() const;
 
   // from SVGSMILElement
   void startedActiveInterval() override;
   void updateAnimation(float percent,
                        unsigned repeat,
                        SVGSMILElement* resultElement) override;
 
-  void setTargetElement(SVGElement*) override;
-  void setAttributeName(const QualifiedName&) override;
-
-  bool hasInvalidCSSAttributeType() const {
-    return m_hasInvalidCSSAttributeType;
-  }
-
   virtual void updateAnimationMode();
   void setAnimationMode(AnimationMode animationMode) {
     m_animationMode = animationMode;
   }
   void setCalcMode(CalcMode calcMode) { m_calcMode = calcMode; }
 
   // Parses a list of values as specified by SVG, stripping leading
   // and trailing whitespace, and places them in result. If the
   // format of the string is not valid, parseValues empties result
   // and returns false. See
   // http://www.w3.org/TR/SVG/animate.html#ValuesAttribute .
   static bool parseValues(const String&, Vector<String>& result);
 
+  void animationAttributeChanged() override;
+
  private:
   bool isValid() const final { return SVGTests::isValid(); }
 
-  void animationAttributeChanged() override;
-  void setAttributeType(const AtomicString&);
-
-  void checkInvalidCSSAttributeType();
-
   virtual bool calculateToAtEndOfDurationValue(
       const String& toAtEndOfDurationString) = 0;
   virtual bool calculateFromAndToValues(const String& fromString,
                                         const String& toString) = 0;
   virtual bool calculateFromAndByValues(const String& fromString,
                                         const String& byString) = 0;
   virtual void calculateAnimatedValue(float percent,
                                       unsigned repeatCount,
                                       SVGSMILElement* resultElement) = 0;
   virtual float calculateDistance(const String& /*fromString*/,
@@ skipping 12 matching lines @@
                                   String& from,
                                   String& to) const;
   float calculatePercentForSpline(float percent, unsigned splineIndex) const;
   float calculatePercentForFromTo(float percent) const;
   unsigned calculateKeyTimesIndex(float percent) const;
 
   void setCalcMode(const AtomicString&);
 
   bool m_animationValid;
 
-  AttributeType m_attributeType;
   Vector<String> m_values;
   // FIXME: We should probably use doubles for this, but there's no point
   // making such a change unless all SVG logic for sampling animations is
   // changed to use doubles.
   Vector<float> m_keyTimes;
   Vector<float> m_keyPoints;
   Vector<gfx::CubicBezier> m_keySplines;
   String m_lastValuesAnimationFrom;
   String m_lastValuesAnimationTo;
-  bool m_hasInvalidCSSAttributeType;
   CalcMode m_calcMode;
   AnimationMode m_animationMode;
 };
 
 }  // namespace blink
 
 #endif  // SVGAnimationElement_h