Title: [207069] releases/WebKitGTK/webkit-2.14/Source/WebCore
Revision
207069
Author
carlo...@webkit.org
Date
2016-10-11 01:49:18 -0700 (Tue, 11 Oct 2016)

Log Message

Merge r206299 - Replace redundant prepareForDestruction() call with RELEASE_ASSERT in Document::removedLastRef.
https://bugs.webkit.org/show_bug.cgi?id=162467

Reviewed by Chris Dumez.

Since r205786 fixed the root cause of webkit.org/b/159372, we no longer need the workaround.
Replace it with a RELEASE_ASSERT to ensure clean state.

No new tests, covered by existing test.

* dom/Document.cpp:
(WebCore::Document::removedLastRef):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207068 => 207069)


--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog	2016-10-11 08:48:26 UTC (rev 207068)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog	2016-10-11 08:49:18 UTC (rev 207069)
@@ -1,3 +1,18 @@
+2016-09-22  Zalan Bujtas  <za...@apple.com>
+
+        Replace redundant prepareForDestruction() call with RELEASE_ASSERT in Document::removedLastRef.
+        https://bugs.webkit.org/show_bug.cgi?id=162467
+
+        Reviewed by Chris Dumez.
+
+        Since r205786 fixed the root cause of webkit.org/b/159372, we no longer need the workaround.
+        Replace it with a RELEASE_ASSERT to ensure clean state.
+
+        No new tests, covered by existing test.
+
+        * dom/Document.cpp:
+        (WebCore::Document::removedLastRef):
+
 2016-09-10  Chris Dumez  <cdu...@apple.com>
 
         It is possible for Document::m_frame pointer to become stale

Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Document.cpp (207068 => 207069)


--- releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Document.cpp	2016-10-11 08:48:26 UTC (rev 207068)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Document.cpp	2016-10-11 08:49:18 UTC (rev 207069)
@@ -678,7 +678,7 @@
         // until after removeDetachedChildren returns, so we protect ourselves.
         incrementReferencingNodeCount();
 
-        prepareForDestruction();
+        RELEASE_ASSERT(!hasLivingRenderTree());
         // We must make sure not to be retaining any of our children through
         // these extra pointers or we will create a reference cycle.
         m_focusedElement = nullptr;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to