Changeset 228704 in webkit

Timestamp:

Feb 19, 2018 11:55:04 AM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Rename RenderTreeBuilder::removeAndDestroyChild() -> removeAndDestroy()
​https://bugs.webkit.org/show_bug.cgi?id=182934
<rdar://problem/37678241>

Reviewed by Antti Koivisto.

No change in functionality.

• dom/Document.cpp:

(WebCore::Document::setFullScreenRenderer):

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::removeAndDestroyAllContinuations):

• rendering/RenderButton.cpp:

(WebCore::RenderButton::setText):

• rendering/RenderFullScreen.cpp:

(WebCore::RenderFullScreen::willBeDestroyed):
(WebCore::RenderFullScreen::unwrapRenderer):

• rendering/RenderListItem.cpp:

(WebCore::RenderListItem::willBeDestroyed):

• rendering/RenderTextFragment.cpp:

(WebCore::RenderTextFragment::willBeDestroyed):
(WebCore::RenderTextFragment::setText):

• rendering/RenderView.cpp:

(WebCore::RenderView::willBeDestroyed):

• rendering/updating/RenderTreeBuilder.cpp:

(WebCore::RenderTreeBuilder::removeAndDestroy):
(WebCore::RenderTreeBuilder::removeFromParentAndDestroyCleaningUpAnonymousWrappers):
(WebCore::RenderTreeBuilder::removeAndDestroyChild): Deleted.

• rendering/updating/RenderTreeBuilder.h:
• rendering/updating/RenderTreeBuilderBlock.cpp:

(WebCore::RenderTreeBuilder::Block::takeChild):

• rendering/updating/RenderTreeBuilderFirstLetter.cpp:

(WebCore::RenderTreeBuilder::FirstLetter::updateStyle):
(WebCore::RenderTreeBuilder::FirstLetter::createRenderers):

• rendering/updating/RenderTreeBuilderList.cpp:

(WebCore::RenderTreeBuilder::List::updateItemMarker):

• rendering/updating/RenderTreeBuilderMultiColumn.cpp:

(WebCore::RenderTreeBuilder::MultiColumn::destroyFragmentedFlow):
(WebCore::RenderTreeBuilder::MultiColumn::handleSpannerRemoval):

• rendering/updating/RenderTreeBuilderRuby.cpp:

(WebCore::RenderTreeBuilder::Ruby::moveBlockChildren):
(WebCore::RenderTreeBuilder::Ruby::takeChild):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/RenderButton.cpp (modified) (1 diff)
• rendering/RenderFullScreen.cpp (modified) (3 diffs)
• rendering/RenderListItem.cpp (modified) (1 diff)
• rendering/RenderTextFragment.cpp (modified) (2 diffs)
• rendering/RenderView.cpp (modified) (1 diff)
• rendering/updating/RenderTreeBuilder.cpp (modified) (4 diffs)
• rendering/updating/RenderTreeBuilder.h (modified) (1 diff)
• rendering/updating/RenderTreeBuilderBlock.cpp (modified) (1 diff)
• rendering/updating/RenderTreeBuilderFirstLetter.cpp (modified) (2 diffs)
• rendering/updating/RenderTreeBuilderList.cpp (modified) (2 diffs)
• rendering/updating/RenderTreeBuilderMultiColumn.cpp (modified) (3 diffs)
• rendering/updating/RenderTreeBuilderRuby.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-19  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Rename RenderTreeBuilder::removeAndDestroyChild() -> removeAndDestroy()
+        https://bugs.webkit.org/show_bug.cgi?id=182934
+        <rdar://problem/37678241>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFullScreenRenderer):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::removeAndDestroyAllContinuations):
+        * rendering/RenderButton.cpp:
+        (WebCore::RenderButton::setText):
+        * rendering/RenderFullScreen.cpp:
+        (WebCore::RenderFullScreen::willBeDestroyed):
+        (WebCore::RenderFullScreen::unwrapRenderer):
+        * rendering/RenderListItem.cpp:
+        (WebCore::RenderListItem::willBeDestroyed):
+        * rendering/RenderTextFragment.cpp:
+        (WebCore::RenderTextFragment::willBeDestroyed):
+        (WebCore::RenderTextFragment::setText):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::willBeDestroyed):
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::removeAndDestroy):
+        (WebCore::RenderTreeBuilder::removeFromParentAndDestroyCleaningUpAnonymousWrappers):
+        (WebCore::RenderTreeBuilder::removeAndDestroyChild): Deleted.
+        * rendering/updating/RenderTreeBuilder.h:
+        * rendering/updating/RenderTreeBuilderBlock.cpp:
+        (WebCore::RenderTreeBuilder::Block::takeChild):
+        * rendering/updating/RenderTreeBuilderFirstLetter.cpp:
+        (WebCore::RenderTreeBuilder::FirstLetter::updateStyle):
+        (WebCore::RenderTreeBuilder::FirstLetter::createRenderers):
+        * rendering/updating/RenderTreeBuilderList.cpp:
+        (WebCore::RenderTreeBuilder::List::updateItemMarker):
+        * rendering/updating/RenderTreeBuilderMultiColumn.cpp:
+        (WebCore::RenderTreeBuilder::MultiColumn::destroyFragmentedFlow):
+        (WebCore::RenderTreeBuilder::MultiColumn::handleSpannerRemoval):
+        * rendering/updating/RenderTreeBuilderRuby.cpp:
+        (WebCore::RenderTreeBuilder::Ruby::moveBlockChildren):
+        (WebCore::RenderTreeBuilder::Ruby::takeChild):
+
 2018-02-19  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -6316 +6316 @@
 
     if (m_fullScreenRenderer)
-        builder.removeAndDestroyChild(*m_fullScreenRenderer);
+        builder.removeAndDestroy(*m_fullScreenRenderer);
     ASSERT(!m_fullScreenRenderer);
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2559 +2559 @@
     auto& continuationChainNode = *continuationChainNodeMap().get(this);
     while (continuationChainNode.next)
-        builder.removeAndDestroyChild(*continuationChainNode.next->renderer);
+        builder.removeAndDestroy(*continuationChainNode.next->renderer);
     removeFromContinuationChain();
 }

trunk/Source/WebCore/rendering/RenderButton.cpp

@@ -118 +118 @@
     }
     if (RenderTreeBuilder::current())
-        RenderTreeBuilder::current()->removeAndDestroyChild(*m_buttonText);
+        RenderTreeBuilder::current()->removeAndDestroy(*m_buttonText);
     else
-        RenderTreeBuilder(*document().renderView()).removeAndDestroyChild(*m_buttonText);
+        RenderTreeBuilder(*document().renderView()).removeAndDestroy(*m_buttonText);
 }
 

trunk/Source/WebCore/rendering/RenderFullScreen.cpp

@@ -62 +62 @@
 {
     if (m_placeholder) {
-        builder.removeAndDestroyChild(*m_placeholder);
+        builder.removeAndDestroy(*m_placeholder);
         ASSERT(!m_placeholder);
     }
@@ -170 +170 @@
                     child = nonAnonymousChild;
                 else {
-                    builder.removeAndDestroyChild(*child);
+                    builder.removeAndDestroy(*child);
                     continue;
                 }
@@ -185 +185 @@
     }
     if (placeholder())
-        builder.removeAndDestroyChild(*placeholder());
+        builder.removeAndDestroy(*placeholder());
     ASSERT(!placeholder());
 
-    builder.removeAndDestroyChild(*this);
+    builder.removeAndDestroy(*this);
 }
 

trunk/Source/WebCore/rendering/RenderListItem.cpp

@@ -59 +59 @@
 {
     if (m_marker)
-        builder.removeAndDestroyChild(*m_marker);
+        builder.removeAndDestroy(*m_marker);
     RenderBlockFlow::willBeDestroyed(builder);
 }

trunk/Source/WebCore/rendering/RenderTextFragment.cpp

@@ -78 +78 @@
 {
     if (m_firstLetter)
-        builder.removeAndDestroyChild(*m_firstLetter);
+        builder.removeAndDestroy(*m_firstLetter);
     RenderText::willBeDestroyed(builder);
 }
@@ -90 +90 @@
         return;
     if (RenderTreeBuilder::current())
-        RenderTreeBuilder::current()->removeAndDestroyChild(*m_firstLetter);
+        RenderTreeBuilder::current()->removeAndDestroy(*m_firstLetter);
     else
-        RenderTreeBuilder(*document().renderView()).removeAndDestroyChild(*m_firstLetter);
+        RenderTreeBuilder(*document().renderView()).removeAndDestroy(*m_firstLetter);
     ASSERT(!m_firstLetter);
     ASSERT(!textNode() || textNode()->renderer() == this);

trunk/Source/WebCore/rendering/RenderView.cpp

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

trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp

@@ -140 +140 @@
 }
 
-void RenderTreeBuilder::removeAndDestroyChild(RenderObject& child)
+void RenderTreeBuilder::removeAndDestroy(RenderObject& child)
 {
     ASSERT(child.parent());
@@ -155 +155 @@
         if (auto* node = firstChild.node())
             node->setRenderer(nullptr);
-        removeAndDestroyChild(firstChild);
+        removeAndDestroy(firstChild);
     }
 }
@@ -647 +647 @@
     // If the tree is destroyed, there is no need for a clean-up phase.
     if (child.renderTreeBeingDestroyed()) {
-        removeAndDestroyChild(child);
+        removeAndDestroy(child);
         return;
     }
@@ -659 +659 @@
 
     auto& destroyRootParent = *destroyRoot.parent();
-    removeAndDestroyChild(destroyRoot);
+    removeAndDestroy(destroyRoot);
     removeAnonymousWrappersForInlineChildrenIfNeeded(destroyRootParent);
 

trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.h

@@ -45 +45 @@
     void insertChild(RenderElement& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr);
 
-    void removeAndDestroyChild(RenderObject& child);
+    void removeAndDestroy(RenderObject& child);
     RenderPtr<RenderObject> takeChild(RenderElement&, RenderObject&) WARN_UNUSED_RETURN;
 

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp

@@ -320 +320 @@
             // Delete the now-empty block's lines and nuke it.
             nextBlock.deleteLines();
-            m_builder.removeAndDestroyChild(nextBlock);
+            m_builder.removeAndDestroy(nextBlock);
             next = nullptr;
         }

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp

@@ -186 +186 @@
             newFirstLetter->setFirstLetterRemainingText(*remainingText);
         }
-        m_builder.removeAndDestroyChild(*firstLetter);
+        m_builder.removeAndDestroy(*firstLetter);
         m_builder.insertChild(*firstLetterContainer, WTFMove(newFirstLetter), nextSibling);
         return;
@@ -242 +242 @@
         auto* textNode = currentTextChild.textNode();
         auto* beforeChild = currentTextChild.nextSibling();
-        m_builder.removeAndDestroyChild(currentTextChild);
+        m_builder.removeAndDestroy(currentTextChild);
 
         // Construct a text fragment for the text after the first letter.

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderList.cpp

@@ -81 +81 @@
     if (style.listStyleType() == NoneListStyle && (!style.listStyleImage() || style.listStyleImage()->errorOccurred())) {
         if (auto* marker = listItemRenderer.markerRenderer())
-            m_builder.removeAndDestroyChild(*marker);
+            m_builder.removeAndDestroy(*marker);
         return;
     }
@@ -122 +122 @@
     // If current parent is an anonymous block that has lost all its children, destroy it.
     if (currentParent && currentParent->isAnonymousBlock() && !currentParent->firstChild() && !downcast<RenderBlock>(*currentParent).continuation())
-        m_builder.removeAndDestroyChild(*currentParent);
+        m_builder.removeAndDestroy(*currentParent);
 }
 

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderMultiColumn.cpp

@@ -213 +213 @@
     }
     while (auto* columnSet = multiColumnFlow.firstMultiColumnSet())
-        m_builder.removeAndDestroyChild(*columnSet);
+        m_builder.removeAndDestroy(*columnSet);
 
     flow.clearMultiColumnFlow();
     m_builder.moveAllChildrenTo(multiColumnFlow, flow, RenderTreeBuilder::NormalizeAfterInsertion::Yes);
-    m_builder.removeAndDestroyChild(multiColumnFlow);
+    m_builder.removeAndDestroy(multiColumnFlow);
     for (auto& parentAndSpanner : parentAndSpannerList)
         m_builder.insertChild(*parentAndSpanner.first, WTFMove(parentAndSpanner.second));
@@ -373 +373 @@
     // The placeholder may already have been removed, but if it hasn't, do so now.
     if (auto placeholder = flow.spannerMap().take(&downcast<RenderBox>(spanner)))
-        m_builder.removeAndDestroyChild(*placeholder);
+        m_builder.removeAndDestroy(*placeholder);
 
     if (auto* next = spanner.nextSibling()) {
@@ -379 +379 @@
             if (previous->isRenderMultiColumnSet() && next->isRenderMultiColumnSet()) {
                 // Merge two sets that no longer will be separated by a spanner.
-                m_builder.removeAndDestroyChild(*next);
+                m_builder.removeAndDestroy(*next);
                 previous->setNeedsLayout();
             }

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp

@@ -167 +167 @@
         m_builder.moveAllChildrenTo(*anonBlockHere, *anonBlockThere, RenderTreeBuilder::NormalizeAfterInsertion::Yes);
         anonBlockHere->deleteLines();
-        m_builder.removeAndDestroyChild(*anonBlockHere);
+        m_builder.removeAndDestroy(*anonBlockHere);
     }
     // Move all remaining children normally.
@@ -394 +394 @@
         auto& parent = *child.parent();
         auto takenChild = m_builder.takeChild(parent, child);
-        m_builder.removeAndDestroyChild(parent);
+        m_builder.removeAndDestroy(parent);
         return takenChild;
     }
@@ -418 +418 @@
         auto& parent = *child.parent();
         auto takenChild = m_builder.takeChild(parent, child);
-        m_builder.removeAndDestroyChild(parent);
+        m_builder.removeAndDestroy(parent);
         return takenChild;
     }