Changeset 228428 in webkit

Timestamp:

Feb 13, 2018 11:52:46 AM (6 years ago)

Author:

Alan Bujtas

Message:

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

Reviewed by Antti Koivisto.

No change in functionality.

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::takeChild): Deleted.

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

(WebCore::RenderTreeBuilder::takeChildFromRenderGrid):

• rendering/updating/RenderTreeBuilder.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderGrid.cpp (modified) (1 diff)
• rendering/RenderGrid.h (modified) (1 diff)
• rendering/updating/RenderTreeBuilder.cpp (modified) (3 diffs)
• rendering/updating/RenderTreeBuilder.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-13  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move RenderGrid::takeChild() to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=182734
+        <rdar://problem/37500876>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality.
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::takeChild): Deleted.
+        * rendering/RenderGrid.h:
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::takeChildFromRenderGrid):
+        * rendering/updating/RenderTreeBuilder.h:
+
 2018-02-13  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -84 +84 @@
     // will change their position.
     dirtyGrid();
-}
-
-RenderPtr<RenderObject> RenderGrid::takeChild(RenderTreeBuilder& builder, RenderObject& child)
-{
-    auto takenChild = RenderBlock::takeChild(builder, 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.
-    if (child.isOutOfFlowPositioned())
-        return takenChild;
-
-    // The grid needs to be recomputed as it might contain auto-placed items that
-    // will change their position.
-    dirtyGrid();
-    return takenChild;
 }
 

trunk/Source/WebCore/rendering/RenderGrid.h

@@ -81 +81 @@
 
     void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> newChild, RenderObject* beforeChild) final;
-    RenderPtr<RenderObject> takeChild(RenderTreeBuilder&, RenderObject&) final;
 
     StyleSelfAlignmentData selfAlignmentForChild(GridAxis, const RenderBox&, const RenderStyle* = nullptr) const;

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

@@ -29 +29 @@
 #include "RenderButton.h"
 #include "RenderElement.h"
+#include "RenderGrid.h"
 #include "RenderMenuList.h"
 #include "RenderRuby.h"
@@ -203 +204 @@
         return takeChildFromRenderMenuList(downcast<RenderMenuList>(parent), child);
 
+    if (is<RenderButton>(parent))
+        return takeChildFromRenderButton(downcast<RenderButton>(parent), child);
+
+    if (is<RenderGrid>(parent))
+        return takeChildFromRenderGrid(downcast<RenderGrid>(parent), child);
+
     return parent.takeChild(*this, child);
 }
@@ -533 +540 @@
 }
 
-}
+RenderPtr<RenderObject> RenderTreeBuilder::takeChildFromRenderGrid(RenderGrid& parent, RenderObject& child)
+{
+    auto takenChild = parent.RenderBlock::takeChild(*this, 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.
+    if (child.isOutOfFlowPositioned())
+        return takenChild;
+
+    // The grid needs to be recomputed as it might contain auto-placed items that will change their position.
+    parent.dirtyGrid();
+    return takenChild;
+}
+
+}

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

@@ -31 +31 @@
 
 class RenderButton;
+class RenderGrid;
 class RenderMathMLFenced;
 class RenderMenuList;
@@ -108 +109 @@
     RenderPtr<RenderObject> takeChildFromRenderMenuList(RenderMenuList& parent, RenderObject& child);
     RenderPtr<RenderObject> takeChildFromRenderButton(RenderButton& parent, RenderObject& child);
+    RenderPtr<RenderObject> takeChildFromRenderGrid(RenderGrid& parent, RenderObject& child);
 
     FirstLetter& firstLetterBuilder() { return *m_firstLetterBuilder; }