Title: [273822] trunk/Source/WebCore
Revision
273822
Author
ryanhad...@apple.com
Date
2021-03-03 10:11:37 -0800 (Wed, 03 Mar 2021)

Log Message

Unreviewed, reverting r273809.

Caused assertion failure on debug WK2 bots

Reverted changeset:

"Crash in removeSymbolElementsFromSubtree()"
https://bugs.webkit.org/show_bug.cgi?id=222397
https://commits.webkit.org/r273809

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (273821 => 273822)


--- trunk/Source/WebCore/ChangeLog	2021-03-03 17:59:27 UTC (rev 273821)
+++ trunk/Source/WebCore/ChangeLog	2021-03-03 18:11:37 UTC (rev 273822)
@@ -1,3 +1,15 @@
+2021-03-03  Ryan Haddad  <ryanhad...@apple.com>
+
+        Unreviewed, reverting r273809.
+
+        Caused assertion failure on debug WK2 bots
+
+        Reverted changeset:
+
+        "Crash in removeSymbolElementsFromSubtree()"
+        https://bugs.webkit.org/show_bug.cgi?id=222397
+        https://commits.webkit.org/r273809
+
 2021-03-03  Patrick Angle  <pan...@apple.com>
 
         REGRESSION (r266288): Web Inspector: ::marker shows on every element now

Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (273821 => 273822)


--- trunk/Source/WebCore/svg/SVGUseElement.cpp	2021-03-03 17:59:27 UTC (rev 273821)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp	2021-03-03 18:11:37 UTC (rev 273822)
@@ -224,9 +224,6 @@
 
     if (!isConnected())
         return;
-
-    ScriptDisallowedScope::InMainThread scriptDisallowedScope;
-
     document().removeSVGUseElement(*this);
 
     String targetID;
@@ -353,14 +350,8 @@
     // into <svg> elements, which is correct for symbol elements directly referenced by use elements,
     // but incorrect for ones that just happen to be in a subtree.
     Vector<Element*> symbolElements;
-    for (auto it = descendantsOfType<Element>(subtree).begin(); it; ) {
-        if (is<SVGSymbolElement>(*it)) {
-            symbolElements.append(&*it);
-            it.traverseNextSkippingChildren();
-            continue;
-        }
-        ++it;
-    }
+    for (auto& descendant : descendantsOfType<SVGSymbolElement>(subtree))
+        symbolElements.append(&descendant);
     disassociateAndRemoveClones(symbolElements);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to