Changeset 228685 in webkit

Timestamp:

Feb 19, 2018 7:51:54 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r228327 - [RenderTreeBuilder] Move multicolumn descendant/sibling removal logic to RenderTreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=182628
<rdar://problem/37369528>

Reviewed by Antti Koivisto.

No change in functionality

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::takeChild):

• rendering/RenderFragmentedFlow.h:
• rendering/RenderMultiColumnFlow.cpp:

(WebCore::RenderMultiColumnFlow::handleSpannerRemoval): Deleted.
(WebCore::RenderMultiColumnFlow::fragmentedFlowRelativeWillBeRemoved): Deleted.

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

(WebCore::RenderTreeBuilder::multiColumnRelativeWillBeRemoved):

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

(WebCore::RenderTreeBuilder::MultiColumn::handleSpannerRemoval):
(WebCore::RenderTreeBuilder::MultiColumn::multiColumnRelativeWillBeRemoved):

• rendering/updating/RenderTreeBuilderMultiColumn.h:

Location:

releases/WebKitGTK/webkit-2.20/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (1 diff)
• rendering/RenderFragmentedFlow.h (modified) (1 diff)
• rendering/RenderMultiColumnFlow.cpp (modified) (1 diff)
• rendering/RenderMultiColumnFlow.h (modified) (2 diffs)
• rendering/updating/RenderTreeBuilder.cpp (modified) (1 diff)
• rendering/updating/RenderTreeBuilder.h (modified) (1 diff)
• rendering/updating/RenderTreeBuilderMultiColumn.cpp (modified) (1 diff)
• rendering/updating/RenderTreeBuilderMultiColumn.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-09  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move multicolumn descendant/sibling removal logic to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=182628
+        <rdar://problem/37369528>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::takeChild):
+        * rendering/RenderFragmentedFlow.h:
+        * rendering/RenderMultiColumnFlow.cpp:
+        (WebCore::RenderMultiColumnFlow::handleSpannerRemoval): Deleted.
+        (WebCore::RenderMultiColumnFlow::fragmentedFlowRelativeWillBeRemoved): Deleted.
+        * rendering/RenderMultiColumnFlow.h:
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::multiColumnRelativeWillBeRemoved):
+        * rendering/updating/RenderTreeBuilder.h:
+        * rendering/updating/RenderTreeBuilderMultiColumn.cpp:
+        (WebCore::RenderTreeBuilder::MultiColumn::handleSpannerRemoval):
+        (WebCore::RenderTreeBuilder::MultiColumn::multiColumnRelativeWillBeRemoved):
+        * rendering/updating/RenderTreeBuilderMultiColumn.h:
+
 2018-02-08  Philippe Normand  <pnormand@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3853 +3853 @@
 {
     if (!renderTreeBeingDestroyed()) {
-        RenderFragmentedFlow* fragmentedFlow = multiColumnFlow();
+        auto* fragmentedFlow = multiColumnFlow();
         if (fragmentedFlow && fragmentedFlow != &oldChild)
-            fragmentedFlow->fragmentedFlowRelativeWillBeRemoved(oldChild);
+            builder.multiColumnRelativeWillBeRemoved(*fragmentedFlow, oldChild);
     }
     return RenderBlock::takeChild(builder, oldChild);

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderFragmentedFlow.h

@@ -87 +87 @@
     virtual bool singleFragmentHasUniformLogicalHeight() const { return true; }
     
-    // Called when a sibling or descendant of the flow thread is about to be removed.
-    virtual void fragmentedFlowRelativeWillBeRemoved(RenderObject&) { }
     // Called when a descendant box's layout is finished and it has been positioned within its container.
     virtual void fragmentedFlowDescendantBoxLaidOut(RenderBox*) { }

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderMultiColumnFlow.cpp

@@ -166 +166 @@
 }
 
-void RenderMultiColumnFlow::handleSpannerRemoval(RenderObject& spanner)
-{
-    // The placeholder may already have been removed, but if it hasn't, do so now.
-    if (auto placeholder = spannerMap().take(&downcast<RenderBox>(spanner)))
-        placeholder->removeFromParentAndDestroy();
-
-    if (RenderObject* next = spanner.nextSibling()) {
-        if (RenderObject* previous = spanner.previousSibling()) {
-            if (previous->isRenderMultiColumnSet() && next->isRenderMultiColumnSet()) {
-                // Merge two sets that no longer will be separated by a spanner.
-                next->removeFromParentAndDestroy();
-                previous->setNeedsLayout();
-            }
-        }
-    }
-}
-
-void RenderMultiColumnFlow::fragmentedFlowRelativeWillBeRemoved(RenderObject& relative)
-{
-    invalidateFragments();
-    if (is<RenderMultiColumnSpannerPlaceholder>(relative)) {
-        // Remove the map entry for this spanner, but leave the actual spanner renderer alone. Also
-        // keep the reference to the spanner, since the placeholder may be about to be re-inserted
-        // in the tree.
-        ASSERT(relative.isDescendantOf(this));
-        spannerMap().remove(downcast<RenderMultiColumnSpannerPlaceholder>(relative).spanner());
-        return;
-    }
-    if (relative.style().columnSpan() == ColumnSpanAll) {
-        if (relative.parent() != parent())
-            return; // not a valid spanner.
-        
-        handleSpannerRemoval(relative);
-    }
-    // Note that we might end up with empty column sets if all column content is removed. That's no
-    // big deal though (and locating them would be expensive), and they will be found and re-used if
-    // content is added again later.
-}
-
 void RenderMultiColumnFlow::fragmentedFlowDescendantBoxLaidOut(RenderBox* descendant)
 {

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderMultiColumnFlow.h

@@ -108 +108 @@
     void addFragmentToThread(RenderFragmentContainer*) override;
     void willBeRemovedFromTree() override;
-    void fragmentedFlowRelativeWillBeRemoved(RenderObject&) override;
     void fragmentedFlowDescendantBoxLaidOut(RenderBox*) override;
     LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
@@ -118 +117 @@
     bool addForcedFragmentBreak(const RenderBlock*, LayoutUnit, RenderBox* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) override;
     bool isPageLogicalHeightKnown() const override;
-
-    void handleSpannerRemoval(RenderObject& spanner);
 
 private:

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp

@@ -406 +406 @@
     // WARNING: child is deleted here.
 }
+void RenderTreeBuilder::multiColumnRelativeWillBeRemoved(RenderMultiColumnFlow& flow, RenderObject& relative)
+{
+    multiColumnBuilder().multiColumnRelativeWillBeRemoved(flow, relative);
+}
 
 void RenderTreeBuilder::insertChildToRenderInline(RenderInline& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilder.h

@@ -81 +81 @@
     void removeFromParentAndDestroyCleaningUpAnonymousWrappers(RenderObject& child);
     void multiColumnDescendantInserted(RenderMultiColumnFlow&, RenderObject& newDescendant);
+    void multiColumnRelativeWillBeRemoved(RenderMultiColumnFlow&, RenderObject& relative);
 
 private:

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderMultiColumn.cpp

@@ -368 +368 @@
 }
 
-}
+void RenderTreeBuilder::MultiColumn::handleSpannerRemoval(RenderMultiColumnFlow& flow, RenderObject& spanner)
+{
+    // The placeholder may already have been removed, but if it hasn't, do so now.
+    if (auto placeholder = flow.spannerMap().take(&downcast<RenderBox>(spanner)))
+        placeholder->removeFromParentAndDestroy();
+
+    if (auto* next = spanner.nextSibling()) {
+        if (auto* previous = spanner.previousSibling()) {
+            if (previous->isRenderMultiColumnSet() && next->isRenderMultiColumnSet()) {
+                // Merge two sets that no longer will be separated by a spanner.
+                next->removeFromParentAndDestroy();
+                previous->setNeedsLayout();
+            }
+        }
+    }
+}
+
+void RenderTreeBuilder::MultiColumn::multiColumnRelativeWillBeRemoved(RenderMultiColumnFlow& flow, RenderObject& relative)
+{
+    flow.invalidateFragments();
+    if (is<RenderMultiColumnSpannerPlaceholder>(relative)) {
+        // Remove the map entry for this spanner, but leave the actual spanner renderer alone. Also
+        // keep the reference to the spanner, since the placeholder may be about to be re-inserted
+        // in the tree.
+        ASSERT(relative.isDescendantOf(&flow));
+        flow.spannerMap().remove(downcast<RenderMultiColumnSpannerPlaceholder>(relative).spanner());
+        return;
+    }
+    if (relative.style().columnSpan() == ColumnSpanAll) {
+        if (relative.parent() != flow.parent())
+            return; // not a valid spanner.
+
+        handleSpannerRemoval(flow, relative);
+    }
+    // Note that we might end up with empty column sets if all column content is removed. That's no
+    // big deal though (and locating them would be expensive), and they will be found and re-used if
+    // content is added again later.
+}
+
+}

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderMultiColumn.h

@@ -42 +42 @@
     RenderObject* resolveMovedChild(RenderFragmentedFlow& enclosingFragmentedFlow, RenderObject* beforeChild);
     void multiColumnDescendantInserted(RenderMultiColumnFlow&, RenderObject& newDescendant);
+    void multiColumnRelativeWillBeRemoved(RenderMultiColumnFlow&, RenderObject& relative);
 
 private:
@@ -47 +48 @@
     void destroyFragmentedFlow(RenderBlockFlow&);
     RenderObject* processPossibleSpannerDescendant(RenderMultiColumnFlow&, RenderObject*& subtreeRoot, RenderObject& descendant);
+    void handleSpannerRemoval(RenderMultiColumnFlow&, RenderObject& spanner);
 
     RenderTreeBuilder& m_builder;