Changeset 228530 in webkit

Timestamp:

Feb 15, 2018 1:06:53 PM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Move RenderTableSection::addChild() to RenderTreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=182835
<rdar://problem/37579191>

Reviewed by Antti Koivisto.

No change in functionality.

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::willInsertTableRow):
(WebCore::RenderTableSection::addChild): Deleted.

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

(WebCore::RenderTreeBuilder::insertChild): Leftover from r228529.
(WebCore::RenderTreeBuilder::insertChildToRenderTable): Deleted. Leftover from r228529.
(WebCore::RenderTreeBuilder::insertChildToRenderTableSection): Deleted.

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

(WebCore::RenderTreeBuilder::Table::insertChild):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-15  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move RenderTableSection::addChild() to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=182835
+        <rdar://problem/37579191>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality.
+
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::willInsertTableRow):
+        (WebCore::RenderTableSection::addChild): Deleted.
+        * rendering/RenderTableSection.h:
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::insertChild): Leftover from r228529.
+        (WebCore::RenderTreeBuilder::insertChildToRenderTable): Deleted. Leftover from r228529.
+        (WebCore::RenderTreeBuilder::insertChildToRenderTableSection): Deleted.
+        * rendering/updating/RenderTreeBuilder.h:
+        * rendering/updating/RenderTreeBuilderTable.cpp:
+        (WebCore::RenderTreeBuilder::Table::insertChild):
+
 2018-02-15  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -122 +122 @@
 }
 
-void RenderTableSection::addChild(RenderTreeBuilder& builder, RenderPtr<RenderObject> child, RenderObject* beforeChild)
+void RenderTableSection::willInsertTableRow(RenderTableRow& child, RenderObject* beforeChild)
 {
     if (beforeChild)
@@ -133 +133 @@
     ensureRows(m_cRow);
 
-    RenderTableRow& row = downcast<RenderTableRow>(*child);
-    m_grid[insertionRow].rowRenderer = &row;
-    row.setRowIndex(insertionRow);
+    m_grid[insertionRow].rowRenderer = &child;
+    child.setRowIndex(insertionRow);
 
     if (!beforeChild)
         setRowLogicalHeightToRowStyleLogicalHeightIfNotRelative(m_grid[insertionRow]);
-    builder.insertChildToRenderTableSection(*this, WTFMove(child), beforeChild);
 }
 

trunk/Source/WebCore/rendering/RenderTableSection.h

@@ -63 +63 @@
     RenderTableRow* lastRow() const;
 
-    void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild = 0) override;
-
     std::optional<int> firstLineBaseline() const override;
 
@@ -149 +147 @@
     
     void paint(PaintInfo&, const LayoutPoint&) override;
+
+    void willInsertTableRow(RenderTableRow& child, RenderObject* beforeChild);
 
 protected:

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

@@ -162 +162 @@
 
     if (is<RenderTableSection>(parent)) {
-        insertRecursiveIfNeeded(tableBuilder().findOrCreateParentForChild(downcast<RenderTableSection>(parent), *child, beforeChild));
+        auto& parentCandidate = tableBuilder().findOrCreateParentForChild(downcast<RenderTableSection>(parent), *child, beforeChild);
+        if (&parent == &parentCandidate) {
+            tableBuilder().insertChild(downcast<RenderTableSection>(parent), WTFMove(child), beforeChild);
+            return;
+        }
+        insertRecursiveIfNeeded(parentCandidate);
         return;
     }
@@ -168 +173 @@
     if (is<RenderTable>(parent)) {
         auto& parentCandidate = tableBuilder().findOrCreateParentForChild(downcast<RenderTable>(parent), *child, beforeChild);
-        if (is<RenderTable>(parentCandidate) && &parentCandidate == &parent) {
+        if (&parentCandidate == &parent) {
             tableBuilder().insertChild(downcast<RenderTable>(parentCandidate), WTFMove(child), beforeChild);
             return;
@@ -504 +509 @@
 }
 
-void RenderTreeBuilder::insertChildToRenderTable(RenderTable& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
-{
-    tableBuilder().insertChild(parent, WTFMove(child), beforeChild);
-}
-
-void RenderTreeBuilder::insertChildToRenderTableSection(RenderTableSection& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
-{
-    tableBuilder().insertChild(parent, WTFMove(child), beforeChild);
-}
-
 void RenderTreeBuilder::insertChildToRenderTableRow(RenderTableRow& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
 {

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

@@ -69 +69 @@
     void insertChildToRenderBlockFlow(RenderBlockFlow& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr);
     void insertChildToRenderInlineIgnoringContinuation(RenderInline& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr);
-    void insertChildToRenderTable(RenderTable& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
-    void insertChildToRenderTableSection(RenderTableSection& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
     void insertChildToRenderTableRow(RenderTableRow& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
 

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

@@ -176 +176 @@
         beforeChild = m_builder.splitAnonymousBoxesAroundChild(parent, beforeChild);
 
+    // FIXME: child should always be a RenderTableRow at this point.
+    if (is<RenderTableRow>(*child.get()))
+        parent.willInsertTableRow(downcast<RenderTableRow>(*child.get()), beforeChild);
     ASSERT(!beforeChild || is<RenderTableRow>(*beforeChild));
     parent.RenderBox::addChild(m_builder, WTFMove(child), beforeChild);