Move animVal invalidation from SVGAnimateElement to SVGElement

third_party/WebKit/Source/core/svg/SVGElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * 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
@@ skipping 229 matching lines @@
 template<typename T>
 static void updateInstancesAnimatedAttributeNoInvalidate(SVGElement* element, const QualifiedName& attribute, T callback)
 {
     SVGElement::InstanceUpdateBlocker blocker(element);
     for (SVGElement* instance : SVGAnimateElement::findElementInstances(element)) {
         if (SVGAnimatedPropertyBase* animatedProperty = instance->propertyFromAttribute(attribute))
             callback(*animatedProperty);
     }
 }
 
+static inline void notifyAnimValChanged(SVGElement* targetElement, const QualifiedName& attributeName)
+{
+    targetElement->invalidateSVGAttributes();
+    targetElement->svgAttributeChanged(attributeName);
+}
+
 template<typename T>
 static void updateInstancesAnimatedAttribute(SVGElement* element, const QualifiedName& attribute, T callback)
 {
     SVGElement::InstanceUpdateBlocker blocker(element);
     for (SVGElement* instance : SVGAnimateElement::findElementInstances(element)) {
         if (SVGAnimatedPropertyBase* animatedProperty = instance->propertyFromAttribute(attribute)) {
             callback(*animatedProperty);
-            instance->invalidateSVGAttributes();
-            instance->svgAttributeChanged(attribute);
+            notifyAnimValChanged(instance, attribute);
         }
     }
 }
 
 void SVGElement::setWebAnimatedAttribute(const QualifiedName& attribute, SVGPropertyBase* value)
 {
     updateInstancesAnimatedAttribute(this, attribute, [&value](SVGAnimatedPropertyBase& animatedProperty) {
         animatedProperty.setAnimatedValue(value);
     });
     ensureSVGRareData()->webAnimatedAttributes().add(&attribute);
@@ skipping 11 matching lines @@
     svgRareData()->webAnimatedAttributes().clear();
 }
 
 void SVGElement::setAnimatedAttribute(const QualifiedName& attribute, SVGPropertyBase* value)
 {
     updateInstancesAnimatedAttributeNoInvalidate(this, attribute, [&value](SVGAnimatedPropertyBase& animatedProperty) {
         animatedProperty.setAnimatedValue(value);
     });
 }
 
+void SVGElement::invalidateAnimatedAttribute(const QualifiedName& attribute)
+{
+    InstanceUpdateBlocker blocker(this);
+    notifyAnimValChanged(this, attribute);
+
+    for (SVGElement* element : instancesForElement())
+        notifyAnimValChanged(element, attribute);
+}
+
 void SVGElement::clearAnimatedAttribute(const QualifiedName& attribute)
 {
     updateInstancesAnimatedAttributeNoInvalidate(this, attribute, [](SVGAnimatedPropertyBase& animatedProperty) {
         animatedProperty.animationEnded();
     });
 }
 
 AffineTransform SVGElement::localCoordinateSpaceTransform(CTMScope) const
 {
     // To be overriden by SVGGraphicsElement (or as special case SVGTextElement and SVGPatternElement)
@@ skipping 903 matching lines @@
     Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
     return evtString;
 }
 
 } // namespace blink