Title: [131529] branches/safari-536.26-branch/Source/WebCore
Revision
131529
Author
[email protected]
Date
2012-10-16 16:59:16 -0700 (Tue, 16 Oct 2012)

Log Message

Merged r130855 -> <rdar://problem/12474791>

Modified Paths

Diff

Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (131528 => 131529)


--- branches/safari-536.26-branch/Source/WebCore/ChangeLog	2012-10-16 23:47:57 UTC (rev 131528)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog	2012-10-16 23:59:16 UTC (rev 131529)
@@ -1,3 +1,20 @@
+2012-10-16  Lucas Forschler  <[email protected]>
+
+        Merge r130855.
+
+    2012-10-09  Philip Rogers  <[email protected]>
+
+            Recursively detach SVGElementInstances
+            https://bugs.webkit.org/show_bug.cgi?id=98851
+
+            Reviewed by Ryosuke Niwa and Abhishek Arya
+
+            Before this patch, SVGElementInstance child nodes were not being detached. This
+            patch makes detach() recursively detach SVGElementInstances.
+
+            * svg/SVGElementInstance.cpp:
+            (WebCore::SVGElementInstance::detach):
+
 2012-08-29  Timothy Hatcher  <[email protected]>
 
         Merge r126921.

Modified: branches/safari-536.26-branch/Source/WebCore/svg/SVGElementInstance.cpp (131528 => 131529)


--- branches/safari-536.26-branch/Source/WebCore/svg/SVGElementInstance.cpp	2012-10-16 23:47:57 UTC (rev 131528)
+++ branches/safari-536.26-branch/Source/WebCore/svg/SVGElementInstance.cpp	2012-10-16 23:59:16 UTC (rev 131529)
@@ -77,6 +77,9 @@
     // Clear all pointers. When the node is detached from the shadow DOM it should be removed but,
     // due to ref counting, it may not be. So clear everything to avoid dangling pointers.
 
+    for (SVGElementInstance* node = firstChild(); node; node = node->nextSibling())
+        node->detach();
+
     // Deregister as instance for passed element, if we haven't already.
     if (m_element->instancesForElement().contains(this))
         m_element->removeInstanceMapping(this);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to