Changeset 228465 in webkit

Timestamp:

Feb 14, 2018 9:47:15 AM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Remove redundant RenderTreeBuilder methods
​https://bugs.webkit.org/show_bug.cgi?id=182770
<rdar://problem/37525627>

Reviewed by Daniel Bates.

No change in functionality.

• rendering/updating/RenderTreeBuilder.cpp:

(WebCore::RenderTreeBuilder::dropAnonymousBoxChild): Deleted.
(WebCore::RenderTreeBuilder::moveRubyChildren): Deleted.
(WebCore::RenderTreeBuilder::resolveMovedChildForMultiColumnFlow): Deleted.

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

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

• rendering/updating/RenderTreeBuilderInline.cpp:

(WebCore::RenderTreeBuilder::Inline::insertChild):

• rendering/updating/RenderTreeBuilderRuby.cpp:

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-14  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Remove redundant RenderTreeBuilder methods
+        https://bugs.webkit.org/show_bug.cgi?id=182770
+        <rdar://problem/37525627>
+
+        Reviewed by Daniel Bates.
+
+        No change in functionality.
+
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::dropAnonymousBoxChild): Deleted.
+        (WebCore::RenderTreeBuilder::moveRubyChildren): Deleted.
+        (WebCore::RenderTreeBuilder::resolveMovedChildForMultiColumnFlow): Deleted.
+        * rendering/updating/RenderTreeBuilder.h:
+        * rendering/updating/RenderTreeBuilderBlockFlow.cpp:
+        (WebCore::RenderTreeBuilder::BlockFlow::insertChild):
+        * rendering/updating/RenderTreeBuilderInline.cpp:
+        (WebCore::RenderTreeBuilder::Inline::insertChild):
+        * rendering/updating/RenderTreeBuilderRuby.cpp:
+        (WebCore::RenderTreeBuilder::Ruby::takeChild):
+
 2018-02-14  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -458 +458 @@
 }
 
-void RenderTreeBuilder::dropAnonymousBoxChild(RenderBlock& parent, RenderBlock& child)
-{
-    blockBuilder().dropAnonymousBoxChild(parent, child);
-}
-
 void RenderTreeBuilder::insertChildToRenderInline(RenderInline& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
 {
@@ -506 +501 @@
 {
     tableBuilder().insertChild(parent, WTFMove(child), beforeChild);
-}
-
-void RenderTreeBuilder::moveRubyChildren(RenderRubyBase& from, RenderRubyBase& to)
-{
-    rubyBuilder().moveChildren(from, to);
 }
 
@@ -531 +521 @@
     if (is<RenderBlockFlow>(renderer))
         multiColumnBuilder().updateAfterDescendants(downcast<RenderBlockFlow>(renderer));
-}
-
-RenderObject* RenderTreeBuilder::resolveMovedChildForMultiColumnFlow(RenderFragmentedFlow& enclosingFragmentedFlow, RenderObject* beforeChild)
-{
-    return multiColumnBuilder().resolveMovedChild(enclosingFragmentedFlow, beforeChild);
 }
 

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

@@ -81 +81 @@
     RenderPtr<RenderObject> takeChildFromRenderElement(RenderElement& parent, RenderObject& child) WARN_UNUSED_RETURN;
 
-    bool childRequiresTable(const RenderElement& parent, const RenderObject& child);
-    void makeChildrenNonInline(RenderBlock& parent, RenderObject* insertionPoint = nullptr);
-    RenderObject* splitAnonymousBoxesAroundChild(RenderBox& parent, RenderObject* beforeChild);
-    void moveRubyChildren(RenderRubyBase& from, RenderRubyBase& to);
     void childFlowStateChangesAndAffectsParentBlock(RenderElement& child);
     void childFlowStateChangesAndNoLongerAffectsParentBlock(RenderElement& child);
-    RenderObject* resolveMovedChildForMultiColumnFlow(RenderFragmentedFlow& enclosingFragmentedFlow, RenderObject* beforeChild);
     void removeFromParentAndDestroyCleaningUpAnonymousWrappers(RenderObject& child);
     void multiColumnDescendantInserted(RenderMultiColumnFlow&, RenderObject& newDescendant);
-    void dropAnonymousBoxChild(RenderBlock& parent, RenderBlock& child);
 
 private:
@@ -105 +99 @@
     class MathML;
 
+    RenderObject* splitAnonymousBoxesAroundChild(RenderBox& parent, RenderObject* beforeChild);
+    void makeChildrenNonInline(RenderBlock& parent, RenderObject* insertionPoint = nullptr);
     void removeAnonymousWrappersForInlineChildrenIfNeeded(RenderElement& parent);
     RenderPtr<RenderObject> takeChildFromRenderMenuList(RenderMenuList& parent, RenderObject& child);

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

@@ -42 +42 @@
     auto* beforeChildOrPlaceholder = beforeChild;
     if (auto* containingFragmentedFlow = parent.enclosingFragmentedFlow())
-        beforeChildOrPlaceholder = m_builder.resolveMovedChildForMultiColumnFlow(*containingFragmentedFlow, beforeChild);
+        beforeChildOrPlaceholder = m_builder.multiColumnBuilder().resolveMovedChild(*containingFragmentedFlow, beforeChild);
     m_builder.insertChildToRenderBlock(parent, WTFMove(child), beforeChildOrPlaceholder);
 }

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

@@ -107 +107 @@
     auto* beforeChildOrPlaceholder = beforeChild;
     if (auto* fragmentedFlow = parent.enclosingFragmentedFlow())
-        beforeChildOrPlaceholder = m_builder.resolveMovedChildForMultiColumnFlow(*fragmentedFlow, beforeChild);
+        beforeChildOrPlaceholder = m_builder.multiColumnBuilder().resolveMovedChild(*fragmentedFlow, beforeChild);
     if (parent.continuation()) {
         insertChildToContinuation(parent, WTFMove(child), beforeChildOrPlaceholder);

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

@@ -436 +436 @@
                 RenderRubyBase* rightBase = rightRun.rubyBase();
                 // Collect all children in a single base, then swap the bases.
-                m_builder.moveRubyChildren(*rightBase, *base);
+                moveChildren(*rightBase, *base);
                 parent.moveChildTo(m_builder, &rightRun, base, RenderBoxModelObject::NormalizeAfterInsertion::No);
                 rightRun.moveChildTo(m_builder, &parent, rightBase, RenderBoxModelObject::NormalizeAfterInsertion::No);