Don't dispatch '(SVG)load' to ancestors of <svg:image> after doc. 'load'

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 818 matching lines @@
         const EventListenerVector& entry = element->getEventListeners(EventTypeNames::load);
         for (size_t i = 0; i < entry.size(); ++i) {
             if (entry[i].useCapture)
                 return true;
         }
     }
 
     return false;
 }
 
-void SVGElement::sendSVGLoadEventIfPossible(bool sendParentLoadEvents)
+bool SVGElement::sendSVGLoadEventIfPossible()
 {
-    RefPtrWillBeRawPtr<SVGElement> currentTarget = this;
-    while (currentTarget && currentTarget->haveLoadedRequiredResources()) {
-        RefPtrWillBeRawPtr<Element> parent = nullptr;
-        if (sendParentLoadEvents)
-            parent = currentTarget->parentOrShadowHostElement(); // save the next parent to dispatch too incase dispatching the event changes the tree
-        if (hasLoadListener(currentTarget.get())
-            && (currentTarget->isStructurallyExternal() || isSVGSVGElement(*currentTarget)))
-            currentTarget->dispatchEvent(Event::create(EventTypeNames::load));
-        currentTarget = (parent && parent->isSVGElement()) ? static_pointer_cast<SVGElement>(parent) : nullptr;
-        SVGElement* element = currentTarget.get();
-        if (!element || !element->isOutermostSVGSVGElement())
-            continue;
+    if (!haveLoadedRequiredResources())
+        return false;
+    if ((isStructurallyExternal() || isSVGSVGElement(*this)) && hasLoadListener(this))
+        dispatchEvent(Event::create(EventTypeNames::load));
+    return true;
+}
 
-        // Consider <svg onload="foo()"><image xlink:href="foo.png" externalResourcesRequired="true"/></svg>.
-        // If foo.png is not yet loaded, the first SVGLoad event will go to the <svg> element, sent through
-        // Document::implicitClose(). Then the SVGLoad event will fire for <image>, once its loaded.
-        ASSERT(sendParentLoadEvents);
+void SVGElement::sendSVGLoadEventToSelfAndAncestorChainIfPossible()
+{
+    // Let Document::implicitClose() dispatch the 'load' to the outermost SVG root.
+    if (isOutermostSVGSVGElement())
+        return;
 
-        // If the load event was not sent yet by Document::implicitClose(), but the <image> from the example
-        // above, just appeared, don't send the SVGLoad event to the outermost <svg>, but wait for the document
-        // to be "ready to render", first.
-        if (!document().loadEventFinished())
-            break;
-    }
+    // Save the next parent to dispatch to in case dispatching the event mutates the tree.
+    RefPtrWillBeRawPtr<Element> parent = parentOrShadowHostElement();
+    if (!sendSVGLoadEventIfPossible())
+        return;
+
+    // If document/window 'load' has been sent already, then only deliver to
+    // the element in question.
+    if (document().loadEventFinished())
+        return;
+
+    if (!parent || !parent->isSVGElement())
+        return;
+
+    toSVGElement(parent)->sendSVGLoadEventToSelfAndAncestorChainIfPossible();
 }
 
 void SVGElement::sendSVGLoadEventIfPossibleAsynchronously()
 {
     svgLoadEventTimer()->startOneShot(0, FROM_HERE);
 }
 
 void SVGElement::svgLoadEventTimerFired(Timer<SVGElement>*)
 {
     sendSVGLoadEventIfPossible();
@@ skipping 336 matching lines @@
     Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt", AtomicString::ConstructFromLiteral));
     return evtString;
 }
 
 }