Changeset 228387 in webkit

Timestamp:

Feb 12, 2018 12:12:35 PM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Remove redundant RenderTreeBuilder instance
​https://bugs.webkit.org/show_bug.cgi?id=182700
<rdar://problem/37463958>

Reviewed by Antti Koivisto.

• rendering/RenderView.cpp:

(WebCore::RenderView::willBeDestroyed):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-12  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Remove redundant RenderTreeBuilder instance
+        https://bugs.webkit.org/show_bug.cgi?id=182700
+        <rdar://problem/37463958>
+
+        Reviewed by Antti Koivisto.
+
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::willBeDestroyed):
+
 2018-02-12  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2316 +2316 @@
 
     // FIXME: RenderObject::view() uses m_renderView and we can't null it before destruction is completed
-    m_renderView->destroy();
+    {
+        RenderTreeBuilder builder(*m_renderView);
+        m_renderView->destroy();
+    }
     m_renderView.release();
 

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -616 +616 @@
     RenderBlockFlow::willBeDestroyed(builder);
     // FIXME: This is a workaround for leftover content (see webkit.org/b/182547).
-    if (firstChild()) {
-        RenderTreeBuilder builder(*this);
-        while (firstChild())
-            removeAndDestroyChild(builder, *firstChild());
-    }
+    while (firstChild())
+        removeAndDestroyChild(builder, *firstChild());
 
     ASSERT_WITH_MESSAGE(m_rendererCount == 1, "All other renderers in this render tree should have been destroyed");