Reduce 'iterate self and instances' helper-count in SVGElement.cpp

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 219 matching lines @@
     ActiveInterpolationsMap activeInterpolationsMap = AnimationStack::activeInterpolations(
         &elementAnimations()->animationStack(), nullptr, nullptr, KeyframeEffect::DefaultPriority, isSVGAttributeHandle);
     for (auto& entry : activeInterpolationsMap) {
         const QualifiedName& attribute = entry.key.svgAttribute();
         InterpolationEnvironment environment(*this, propertyFromAttribute(attribute)->baseValueBase());
         InvalidatableInterpolation::applyStack(entry.value, environment);
     }
     svgRareData()->setWebAnimatedAttributesDirty(false);
 }
 
-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)
+static void forSelfAndInstances(SVGElement* element, T callback)
 {
     SVGElement::InstanceUpdateBlocker blocker(element);
-    for (SVGElement* instance : SVGAnimateElement::findElementInstances(element)) {
-        if (SVGAnimatedPropertyBase* animatedProperty = instance->propertyFromAttribute(attribute)) {
-            callback(*animatedProperty);
-            notifyAnimValChanged(instance, attribute);
-        }
-    }
+    for (SVGElement* instance : SVGAnimateElement::findElementInstances(element))
+        callback(instance);
 }
 
 void SVGElement::setWebAnimatedAttribute(const QualifiedName& attribute, SVGPropertyBase* value)
 {
-    updateInstancesAnimatedAttribute(this, attribute, [&value](SVGAnimatedPropertyBase& animatedProperty) {
-        animatedProperty.setAnimatedValue(value);
+    forSelfAndInstances(this, [&attribute, &value](SVGElement* element) {
+        if (SVGAnimatedPropertyBase* animatedProperty = element->propertyFromAttribute(attribute)) {
+            animatedProperty->setAnimatedValue(value);
+            notifyAnimValChanged(element, attribute);
+        }
     });
     ensureSVGRareData()->webAnimatedAttributes().add(&attribute);
 }
 
 void SVGElement::clearWebAnimatedAttributes()
 {
     if (!hasSVGRareData())
         return;
     for (const QualifiedName* attribute : svgRareData()->webAnimatedAttributes()) {
-        updateInstancesAnimatedAttribute(this, *attribute, [](SVGAnimatedPropertyBase& animatedProperty) {
-            animatedProperty.animationEnded();
+        forSelfAndInstances(this, [&attribute](SVGElement* element) {
+            if (SVGAnimatedPropertyBase* animatedProperty = element->propertyFromAttribute(*attribute)) {
+                animatedProperty->animationEnded();
+                notifyAnimValChanged(element, *attribute);
+            }
         });
     }
     svgRareData()->webAnimatedAttributes().clear();
 }
 
 void SVGElement::setAnimatedAttribute(const QualifiedName& attribute, SVGPropertyBase* value)
 {
-    updateInstancesAnimatedAttributeNoInvalidate(this, attribute, [&value](SVGAnimatedPropertyBase& animatedProperty) {
-        animatedProperty.setAnimatedValue(value);
+    forSelfAndInstances(this, [&attribute, &value](SVGElement* element) {
+        if (SVGAnimatedPropertyBase* animatedProperty = element->propertyFromAttribute(attribute))
+            animatedProperty->setAnimatedValue(value);
     });
 }
 
 void SVGElement::invalidateAnimatedAttribute(const QualifiedName& attribute)
 {
-    InstanceUpdateBlocker blocker(this);
-    notifyAnimValChanged(this, attribute);
-
-    for (SVGElement* element : instancesForElement())
+    forSelfAndInstances(this, [&attribute](SVGElement* element) {
         notifyAnimValChanged(element, attribute);
+    });
 }
 
 void SVGElement::clearAnimatedAttribute(const QualifiedName& attribute)
 {
-    updateInstancesAnimatedAttributeNoInvalidate(this, attribute, [](SVGAnimatedPropertyBase& animatedProperty) {
-        animatedProperty.animationEnded();
+    forSelfAndInstances(this, [&attribute](SVGElement* element) {
+        if (SVGAnimatedPropertyBase* animatedProperty = element->propertyFromAttribute(attribute))
+            animatedProperty->animationEnded();
     });
 }
 
 AffineTransform SVGElement::localCoordinateSpaceTransform(CTMScope) const
 {
     // To be overriden by SVGGraphicsElement (or as special case SVGTextElement and SVGPatternElement)
     return AffineTransform();
 }
 
 Node::InsertionNotificationRequest SVGElement::insertedInto(ContainerNode* rootParent)
@@ skipping 899 matching lines @@
     Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
     return evtString;
 }
 
 } // namespace blink