Changeset 280830 in webkit

Timestamp:

Aug 10, 2021, 2:20:44 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r273938 - Deploy Ref<T> in SVGUseElement.cpp
​https://bugs.webkit.org/show_bug.cgi?id=222637

Patch by Julian Gonzalez <​julian_a_gonzalez@apple.com> on 2021-03-04
Reviewed by Ryosuke Niwa.

Remove usage of raw pointers in a few functions here
that showed issues in 222397.

Thanks to Darin Adler for the initial version of this patch
and Ryosuke Niwa for refinements.

• svg/SVGUseElement.cpp:

(WebCore::disassociateAndRemoveClones):
(WebCore::removeDisallowedElementsFromSubtree):
(WebCore::removeSymbolElementsFromSubtree):

Location:

releases/WebKitGTK/webkit-2.32/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGUseElement.cpp (modified) (3 diffs)

releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-04  Julian Gonzalez  <julian_a_gonzalez@apple.com>
+
+        Deploy Ref<T> in SVGUseElement.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=222637
+
+        Reviewed by Ryosuke Niwa.
+
+        Remove usage of raw pointers in a few functions here
+        that showed issues in 222397.
+
+        Thanks to Darin Adler for the initial version of this patch
+        and Ryosuke Niwa for refinements.
+
+        * svg/SVGUseElement.cpp:
+        (WebCore::disassociateAndRemoveClones):
+        (WebCore::removeDisallowedElementsFromSubtree):
+        (WebCore::removeSymbolElementsFromSubtree):
+
 2021-03-04  Ryosuke Niwa  <rniwa@webkit.org>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/SVGUseElement.cpp

@@ -310 +310 @@
 }
 
-static inline void disassociateAndRemoveClones(const Vector<Element*>& clones)
+static inline void disassociateAndRemoveClones(const Vector<Ref<Element>>& clones)
 {
     for (auto& clone : clones) {
-        for (auto& descendant : descendantsOfType<SVGElement>(*clone))
+        for (auto& descendant : descendantsOfType<SVGElement>(clone.get()))
             descendant.setCorrespondingElement(nullptr);
         if (is<SVGElement>(clone))
-            downcast<SVGElement>(*clone).setCorrespondingElement(nullptr);
-        clone->parentNode()->removeChild(*clone);
+            downcast<SVGElement>(clone.get()).setCorrespondingElement(nullptr);
+        clone->remove();
     }
 }
@@ -331 +331 @@
     ASSERT(!subtree.isConnected());
 
-    Vector<Element*> disallowedElements;
+    Vector<Ref<Element>> disallowedElements;
     for (auto it = descendantsOfType<Element>(subtree).begin(); it; ) {
         if (isDisallowedElement(*it)) {
-            disallowedElements.append(&*it);
+            disallowedElements.append(*it);
             it.traverseNextSkippingChildren();
             continue;
@@ -350 +350 @@
     // 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;
+    Vector<Ref<Element>> symbolElements;
     for (auto it = descendantsOfType<Element>(subtree).begin(); it; ) {
         if (is<SVGSymbolElement>(*it)) {
-            symbolElements.append(&*it);
+            symbolElements.append(*it);
             it.traverseNextSkippingChildren();
             continue;