Changeset 228441 in webkit

Timestamp:

Feb 13, 2018 3:34:49 PM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Move RenderBlock::takeChild() to RenderTreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=182746
<rdar://problem/37512871>

Reviewed by Antti Koivisto.

No change in functionality.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::takeChild): Deleted.

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

(WebCore::RenderTreeBuilder::takeChild):
(WebCore::RenderTreeBuilder::takeChildFromRenderMenuList):
(WebCore::RenderTreeBuilder::takeChildFromRenderButton):
(WebCore::RenderTreeBuilder::takeChildFromRenderGrid):
(WebCore::RenderTreeBuilder::takeChildFromRenderBlock): Deleted.

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

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/updating/RenderTreeBuilder.cpp (modified) (5 diffs)
• rendering/updating/RenderTreeBuilder.h (modified) (1 diff)
• rendering/updating/RenderTreeBuilderBlock.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-13  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move RenderBlock::takeChild() to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=182746
+        <rdar://problem/37512871>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::takeChild): Deleted.
+        * rendering/RenderBlock.h:
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::takeChild):
+        (WebCore::RenderTreeBuilder::takeChildFromRenderMenuList):
+        (WebCore::RenderTreeBuilder::takeChildFromRenderButton):
+        (WebCore::RenderTreeBuilder::takeChildFromRenderGrid):
+        (WebCore::RenderTreeBuilder::takeChildFromRenderBlock): Deleted.
+        * rendering/updating/RenderTreeBuilder.h:
+        * rendering/updating/RenderTreeBuilderBlock.cpp:
+        (WebCore::RenderTreeBuilder::Block::takeChild):
+
 2018-02-13  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -483 +483 @@
 }
 
-RenderPtr<RenderObject> RenderBlock::takeChild(RenderTreeBuilder& builder, RenderObject& oldChild)
-{
-    return builder.takeChildFromRenderBlock(*this, oldChild);
-}
-
 bool RenderBlock::childrenPreventSelfCollapsing() const
 {

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -75 +75 @@
 
     void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> newChild, RenderObject* beforeChild = 0) override;
-    RenderPtr<RenderObject> takeChild(RenderTreeBuilder&, RenderObject&) override;
 
     virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0);

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

@@ -228 +228 @@
         return blockBuilder().takeChild(downcast<RenderBlockFlow>(parent), child);
 
+    if (is<RenderBlock>(parent))
+        return blockBuilder().takeChild(downcast<RenderBlock>(parent), child);
+
     return parent.takeChild(*this, child);
 }
@@ -515 +518 @@
 }
 
-RenderPtr<RenderObject> RenderTreeBuilder::takeChildFromRenderBlock(RenderBlock& parent, RenderObject& oldChild)
-{
-    return blockBuilder().takeChild(parent, oldChild);
-}
-
 void RenderTreeBuilder::updateAfterDescendants(RenderElement& renderer)
 {
@@ -539 +537 @@
     auto* innerRenderer = parent.innerRenderer();
     if (!innerRenderer || &child == innerRenderer)
-        return parent.RenderBlock::takeChild(*this, child);
+        return blockBuilder().takeChild(parent, child);
     return takeChild(*innerRenderer, child);
 }
@@ -548 +546 @@
     if (!innerRenderer || &child == innerRenderer || child.parent() == &parent) {
         ASSERT(&child == innerRenderer || !innerRenderer);
-        return parent.RenderBlock::takeChild(*this, child);
+        return blockBuilder().takeChild(parent, child);
     }
     return takeChild(*innerRenderer, child);
@@ -555 +553 @@
 RenderPtr<RenderObject> RenderTreeBuilder::takeChildFromRenderGrid(RenderGrid& parent, RenderObject& child)
 {
-    auto takenChild = parent.RenderBlock::takeChild(*this, child);
+    auto takenChild = blockBuilder().takeChild(parent, child);
     // Positioned grid items do not take up space or otherwise participate in the layout of the grid,
     // for that reason we don't need to mark the grid as dirty when they are removed.

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

@@ -79 +79 @@
     void insertChildToRenderMathMLFenced(RenderMathMLFenced& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
 
-    RenderPtr<RenderObject> takeChildFromRenderBlock(RenderBlock& parent, RenderObject& oldChild);
-
     bool childRequiresTable(const RenderElement& parent, const RenderObject& child);
     void makeChildrenNonInline(RenderBlock& parent, RenderObject* insertionPoint = nullptr);

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

@@ -374 +374 @@
             m_builder.multiColumnBuilder().multiColumnRelativeWillBeRemoved(*fragmentedFlow, child);
     }
-    return parent.RenderBlock::takeChild(m_builder, child);
-}
-
-}
+    return takeChild(static_cast<RenderBlock&>(parent), child);
+}
+
+}