Changeset 207069 in webkit

Timestamp:

Oct 11, 2016 1:49:18 AM (8 years ago)

Author:

Carlos Garcia Campos

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):

Location:

releases/WebKitGTK/webkit-2.14/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)

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

@@ +1 @@
+2016-09-22  Zalan Bujtas  <zalan@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  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Document.cpp

@@ -679 +679 @@
         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.