Rework SMIL animation target invalidation

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

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 38 matching lines @@
       const Attribute&) const override;
 
   AnimatedPropertyType animatedPropertyType();
   bool animatedPropertyTypeSupportsAddition();
 
  protected:
   SVGAnimateElement(const QualifiedName&, Document&);
 
   bool hasValidTarget() override;
 
+  void willChangeAnimationTarget() final;
+  void didChangeAnimationTarget() final;
+
   void resetAnimatedType() final;
   void clearAnimatedType() final;
 
   bool calculateToAtEndOfDurationValue(
       const String& toAtEndOfDurationString) final;
   bool calculateFromAndToValues(const String& fromString,
                                 const String& toString) final;
   bool calculateFromAndByValues(const String& fromString,
                                 const String& byString) final;
   void calculateAnimatedValue(float percentage,
                               unsigned repeatCount,
                               SVGSMILElement* resultElement) final;
   void applyResultsToTarget() final;
   float calculateDistance(const String& fromString,
                           const String& toString) final;
   bool isAdditive() final;
 
   void parseAttribute(const AttributeModificationParams&) override;
 
-  void setTargetElement(SVGElement*) final;
   void setAttributeName(const QualifiedName&);
 
   enum AttributeType { AttributeTypeCSS, AttributeTypeXML, AttributeTypeAuto };
   AttributeType getAttributeType() const { return m_attributeType; }
 
   FRIEND_TEST_ALL_PREFIXES(UnsafeSVGAttributeSanitizationTest,
                            stringsShouldNotSupportAddition);
 
  private:
   void resetAnimatedPropertyType();
 
   bool shouldApplyAnimation(const SVGElement& targetElement,
                             const QualifiedName& attributeName);
 
   void setAttributeType(const AtomicString&);
 
   InsertionNotificationRequest insertedInto(ContainerNode*) final;
   void removedFrom(ContainerNode*) final;
 
-  void checkInvalidCSSAttributeType();
-  bool hasValidAttributeName() const;
-
   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_animatedValue;
 
  protected:
   Member<SVGAnimatedPropertyBase> m_targetProperty;
   AnimatedPropertyType m_type;
   CSSPropertyID m_cssPropertyId;
 
   bool isAnimatingSVGDom() const { return m_targetProperty; }
   bool isAnimatingCSSProperty() const {
     return m_cssPropertyId != CSSPropertyInvalid;
   }
 
  private:
   AnimatedPropertyValueType m_fromPropertyValueType;
   AnimatedPropertyValueType m_toPropertyValueType;
   AttributeType m_attributeType;
-  bool m_hasInvalidCSSAttributeType;
 };
 
 inline bool isSVGAnimateElement(const SVGElement& element) {
   return element.hasTagName(SVGNames::animateTag) ||
          element.hasTagName(SVGNames::animateTransformTag) ||
          element.hasTagName(SVGNames::setTag);
 }
 
 DEFINE_SVGELEMENT_TYPE_CASTS_WITH_FUNCTION(SVGAnimateElement);
 
 }  // namespace blink
 
 #endif  // SVGAnimateElement_h