Changeset 258464 in webkit

Timestamp:

Mar 14, 2020 12:15:14 AM (4 years ago)

Author:

rniwa@webkit.org

Message:

Call SVGTRefElement::buildPendingResource in SVGElement::didFinishInsertingNode
​https://bugs.webkit.org/show_bug.cgi?id=208981

Reviewed by Antti Koivisto.

This patch moves the call to SVGTRefElement::buildPendingResource from SVGElement::insertedIntoAncestor
to SVGElement::didFinishInsertingNode.

• svg/SVGElement.cpp:

(WebCore::SVGElement::insertedIntoAncestor): Return true when the element has a pending resource ID.
(WebCore::SVGElement::didFinishInsertingNode): Added. Calls buildPendingResourcesIfNeeded.

• svg/SVGElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGElement.cpp (modified) (1 diff)
• svg/SVGElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Call SVGTRefElement::buildPendingResource in SVGElement::didFinishInsertingNode
+        https://bugs.webkit.org/show_bug.cgi?id=208981
+
+        Reviewed by Antti Koivisto.
+
+        This patch moves the call to SVGTRefElement::buildPendingResource from SVGElement::insertedIntoAncestor
+        to SVGElement::didFinishInsertingNode.
+
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::insertedIntoAncestor): Return true when the element has a pending resource ID.
+        (WebCore::SVGElement::didFinishInsertingNode): Added. Calls buildPendingResourcesIfNeeded.
+        * svg/SVGElement.h:
+
 2020-03-13  Said Abou-Hallawa  <said@apple.com>
 

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -834 +834 @@
     StyledElement::insertedIntoAncestor(insertionType, parentOfInsertedTree);
     updateRelativeLengthsInformation();
+
+    if (needsPendingResourceHandling() && insertionType.connectedToDocument && !isInShadowTree()) {
+        SVGDocumentExtensions& extensions = document().accessSVGExtensions();
+        String resourceId = getIdAttribute();
+        if (extensions.isIdOfPendingResource(resourceId))
+            return InsertedIntoAncestorResult::NeedsPostInsertionCallback;
+    }
+
+    return InsertedIntoAncestorResult::Done;
+}
+
+void SVGElement::didFinishInsertingNode()
+{
     buildPendingResourcesIfNeeded();
-    return InsertedIntoAncestorResult::Done;
 }
 

trunk/Source/WebCore/svg/SVGElement.h

@@ -167 +167 @@
     void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) override;
     InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) override;
+    void didFinishInsertingNode() override;
     void removedFromAncestor(RemovalType, ContainerNode&) override;
     void childrenChanged(const ChildChange&) override;