Changeset 226632 in webkit

Timestamp:

Jan 9, 2018 7:22:13 AM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Transition Render*::addChild() calls to RenderTreeBuilder::insertChildToRender*()
​https://bugs.webkit.org/show_bug.cgi?id=181407
<rdar://problem/36361176>

Reviewed by Antti Koivisto.

Eventually all mutation will be going through the RenderTreeBuilder.

No change in functionality.

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::addChild):

• rendering/RenderMultiColumnFlow.cpp:

(WebCore::RenderMultiColumnFlow::processPossibleSpannerDescendant):

• rendering/RenderRubyRun.cpp:

(WebCore::RenderRubyRun::rubyBaseSafe):

• rendering/updating/RenderTreeBuilderBlockFlow.cpp:

(WebCore::RenderTreeBuilder::BlockFlow::insertChild):

• rendering/updating/RenderTreeBuilderMultiColumn.cpp:

(WebCore::RenderTreeBuilder::MultiColumn::createFragmentedFlow):

• rendering/updating/RenderTreeBuilderRuby.cpp:

(WebCore::RenderTreeBuilder::Ruby::findOrCreateParentForChild):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderGrid.cpp (modified) (2 diffs)
• rendering/RenderMultiColumnFlow.cpp (modified) (2 diffs)
• rendering/RenderRubyRun.cpp (modified) (1 diff)
• rendering/updating/RenderTreeBuilderBlockFlow.cpp (modified) (1 diff)
• rendering/updating/RenderTreeBuilderMultiColumn.cpp (modified) (1 diff)
• rendering/updating/RenderTreeBuilderRuby.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-09  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Transition Render*::addChild() calls to RenderTreeBuilder::insertChildToRender*()
+        https://bugs.webkit.org/show_bug.cgi?id=181407
+        <rdar://problem/36361176>
+
+        Reviewed by Antti Koivisto.
+
+        Eventually all mutation will be going through the RenderTreeBuilder.
+
+        No change in functionality.
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::addChild):
+        * rendering/RenderMultiColumnFlow.cpp:
+        (WebCore::RenderMultiColumnFlow::processPossibleSpannerDescendant):
+        * rendering/RenderRubyRun.cpp:
+        (WebCore::RenderRubyRun::rubyBaseSafe):
+        * rendering/updating/RenderTreeBuilderBlockFlow.cpp:
+        (WebCore::RenderTreeBuilder::BlockFlow::insertChild):
+        * rendering/updating/RenderTreeBuilderMultiColumn.cpp:
+        (WebCore::RenderTreeBuilder::MultiColumn::createFragmentedFlow):
+        * rendering/updating/RenderTreeBuilderRuby.cpp:
+        (WebCore::RenderTreeBuilder::Ruby::findOrCreateParentForChild):
+
 2018-01-09  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -36 +36 @@
 #include "RenderChildIterator.h"
 #include "RenderLayer.h"
+#include "RenderTreeBuilder.h"
 #include "RenderView.h"
 #include <cstdlib>
@@ -73 +74 @@
 {
     auto& child = *newChild;
-    RenderBlock::addChild(builder, WTFMove(newChild), beforeChild);
+    builder.insertChildToRenderBlock(*this, WTFMove(newChild), beforeChild);
 
     // Positioned grid items do not take up space or otherwise participate in the layout of the grid,

trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp

@@ -299 +299 @@
         // This is a guard to stop an ancestor flow thread from processing the spanner.
         gShiftingSpanner = true;
-        multicolContainer->RenderBlock::addChild(*RenderTreeBuilder::current(), WTFMove(takenDescendant), insertBeforeMulticolChild);
+        RenderTreeBuilder::current()->insertChildToRenderBlock(*multicolContainer, WTFMove(takenDescendant), insertBeforeMulticolChild);
         gShiftingSpanner = false;
         
@@ -336 +336 @@
     newSet->initializeStyle();
     auto& set = *newSet;
-    multicolContainer->RenderBlock::addChild(*RenderTreeBuilder::current(), WTFMove(newSet), insertBeforeMulticolChild);
+    RenderTreeBuilder::current()->insertChildToRenderBlock(*multicolContainer, WTFMove(newSet), insertBeforeMulticolChild);
     invalidateFragments();
 

trunk/Source/WebCore/rendering/RenderRubyRun.cpp

@@ -94 +94 @@
         auto newBase = createRubyBase();
         base = newBase.get();
-        RenderBlockFlow::addChild(*RenderTreeBuilder::current(), WTFMove(newBase));
+        RenderTreeBuilder::current()->insertChildToRenderBlockFlow(*this, WTFMove(newBase));
     }
     return base;

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

@@ -43 +43 @@
     if (auto* containingFragmentedFlow = parent.enclosingFragmentedFlow())
         beforeChildOrPlaceholder = containingFragmentedFlow->resolveMovedChild(beforeChild);
-    parent.RenderBlock::addChild(m_builder, WTFMove(child), beforeChildOrPlaceholder);
+    m_builder.insertChildToRenderBlock(parent, WTFMove(child), beforeChildOrPlaceholder);
 }
 

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

@@ -87 +87 @@
     newFragmentedFlow->initializeStyle();
     auto& fragmentedFlow = *newFragmentedFlow;
-    flow.RenderBlock::addChild(m_builder, WTFMove(newFragmentedFlow));
+    m_builder.insertChildToRenderBlock(flow, WTFMove(newFragmentedFlow));
 
     // Reparent children preceding the fragmented flow into the fragmented flow.

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

@@ -233 +233 @@
             auto newBlock = createAnonymousRubyInlineBlock(parent);
             beforeBlock = newBlock.get();
-            parent.RenderInline::addChild(m_builder, WTFMove(newBlock), parent.firstChild());
+            m_builder.insertChildToRenderInline(parent, WTFMove(newBlock), parent.firstChild());
         }
         beforeChild = nullptr;
@@ -248 +248 @@
             auto newBlock = createAnonymousRubyInlineBlock(parent);
             afterBlock = newBlock.get();
-            parent.RenderInline::addChild(m_builder, WTFMove(newBlock));
+            m_builder.insertChildToRenderInline(parent, WTFMove(newBlock));
         }
         beforeChild = nullptr;
@@ -277 +277 @@
         auto newRun = RenderRubyRun::staticCreateRubyRun(&parent);
         lastRun = newRun.get();
-        parent.RenderInline::addChild(m_builder, WTFMove(newRun), beforeChild);
+        m_builder.insertChildToRenderInline(parent, WTFMove(newRun), beforeChild);
     }
     beforeChild = nullptr;