Move SVGAnimateElement::findElementInstances to 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 24 matching lines @@
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/events/Event.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLElement.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/svg/LayoutSVGResourceContainer.h"
-#include "core/svg/SVGAnimateElement.h"
 #include "core/svg/SVGCursorElement.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGElementRareData.h"
 #include "core/svg/SVGGraphicsElement.h"
 #include "core/svg/SVGSVGElement.h"
 #include "core/svg/SVGTitleElement.h"
 #include "core/svg/SVGUseElement.h"
 #include "core/svg/properties/SVGProperty.h"
 #include "wtf/AutoReset.h"
 #include "wtf/Threading.h"
@@ skipping 180 matching lines @@
     }
     svgRareData()->setWebAnimatedAttributesDirty(false);
 }
 
 static inline void notifyAnimValChanged(SVGElement* targetElement, const QualifiedName& attributeName)
 {
     targetElement->invalidateSVGAttributes();
     targetElement->svgAttributeChanged(attributeName);
 }
 
+// The size of SVGElementInstances is 1 unless there is a <use> instance of the element.
+using SVGElementInstances = HeapVector<Member<SVGElement>, 1u>;
+
+static SVGElementInstances findElementInstances(SVGElement* element)

[pdr., 2016/08/30 23:06:51]

This looks great. WDYT about taking it one step further and merging into
forSelfAndInstances?

Something like:
template<typename T>
static void forSelfAndInstances(SVGElement* element, T callback)
{
    SVGElement::InstanceUpdateBlocker blocker(element);
    callback(element);
    for (SVGElement* instance : element->instancesForElement())
        callback(instance);
}

[fs, 2016/08/31 09:00:35]

I was considering doing that separately (in case there happened to be a instance
invalidation lurking - although there shouldn't be because of the blocker.) I
guess I can fold it in though.

+{
+    SVGElementInstances animatedElements;
+    animatedElements.append(element);
+
+    const auto& instances = element->instancesForElement();
+    animatedElements.appendRange(instances.begin(), instances.end());
+
+    return animatedElements;
+}
+
 template<typename T>
 static void forSelfAndInstances(SVGElement* element, T callback)
 {
     SVGElement::InstanceUpdateBlocker blocker(element);
-    for (SVGElement* instance : SVGAnimateElement::findElementInstances(element))
+    for (SVGElement* instance : findElementInstances(element))
         callback(instance);
 }
 
 void SVGElement::setWebAnimatedAttribute(const QualifiedName& attribute, SVGPropertyBase* value)
 {
     forSelfAndInstances(this, [&attribute, &value](SVGElement* element) {
         if (SVGAnimatedPropertyBase* animatedProperty = element->propertyFromAttribute(attribute)) {
             animatedProperty->setAnimatedValue(value);
             notifyAnimValChanged(element, attribute);
         }
@@ skipping 947 matching lines @@
     Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
     return evtString;
 }
 
 } // namespace blink