Title: [134282] branches/safari-536.28-branch/Source/WebCore
- Revision
- 134282
- Author
- [email protected]
- Date
- 2012-11-12 12:34:27 -0800 (Mon, 12 Nov 2012)
Log Message
Merged r130855. <rdar://problem/12655076>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebCore/ChangeLog (134281 => 134282)
--- branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-12 20:32:56 UTC (rev 134281)
+++ branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-12 20:34:27 UTC (rev 134282)
@@ -1,5 +1,22 @@
2012-11-12 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-11-12 Lucas Forschler <[email protected]>
+
Merge r129796
2012-09-27 Philip Rogers <[email protected]>
@@ -207317,3 +207334,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebCore/svg/SVGElementInstance.cpp (134281 => 134282)
--- branches/safari-536.28-branch/Source/WebCore/svg/SVGElementInstance.cpp 2012-11-12 20:32:56 UTC (rev 134281)
+++ branches/safari-536.28-branch/Source/WebCore/svg/SVGElementInstance.cpp 2012-11-12 20:34:27 UTC (rev 134282)
@@ -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
