Changeset 276707 in webkit

Timestamp:

Apr 28, 2021, 6:30:36 AM (4 years ago)

Author:

Alan Bujtas

Message:

Remove unused RenderObject::isOutOfFlowRenderFragmentedFlow
​https://bugs.webkit.org/show_bug.cgi?id=225133

Reviewed by Simon Fraser.

Out-of-flow fragmented flows were originally added for CSS regions (r91760) to provide
an anonymous container for the region content. This is not to be confused with a multi-column box with
"position: absolute/fixed" (such content would still generate an in-flow fragment container).

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeVisibleRectInContainer const):

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::mapAbsoluteToLocalPoint const):

• rendering/RenderElement.h:

(WebCore::RenderElement::canContainFixedPositionObjects const):

• rendering/RenderLayer.cpp:

(WebCore::accumulateOffsetTowardsAncestor):
(WebCore::RenderLayer::hitTestContents const):
(WebCore::RenderLayer::calculateClipRects const):

• rendering/RenderLayer.h:

(WebCore::RenderLayer::isRenderFragmentedFlow const):
(WebCore::RenderLayer::isOutOfFlowRenderFragmentedFlow const): Deleted.

• rendering/RenderObject.h:

(WebCore::RenderObject::isInFlowRenderFragmentedFlow const):
(WebCore::RenderObject::isOutOfFlowRenderFragmentedFlow const): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/RenderElement.h (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (4 diffs)
• rendering/RenderLayer.h (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-28  Zalan Bujtas  <zalan@apple.com>
+
+        Remove unused RenderObject::isOutOfFlowRenderFragmentedFlow
+        https://bugs.webkit.org/show_bug.cgi?id=225133
+
+        Reviewed by Simon Fraser.
+
+        Out-of-flow fragmented flows were originally added for CSS regions (r91760) to provide
+        an anonymous container for the region content. This is not to be confused with a multi-column box with
+        "position: absolute/fixed" (such content would still generate an in-flow fragment container).
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeVisibleRectInContainer const):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::mapAbsoluteToLocalPoint const):
+        * rendering/RenderElement.h:
+        (WebCore::RenderElement::canContainFixedPositionObjects const):
+        * rendering/RenderLayer.cpp:
+        (WebCore::accumulateOffsetTowardsAncestor):
+        (WebCore::RenderLayer::hitTestContents const):
+        (WebCore::RenderLayer::calculateClipRects const):
+        * rendering/RenderLayer.h:
+        (WebCore::RenderLayer::isRenderFragmentedFlow const):
+        (WebCore::RenderLayer::isOutOfFlowRenderFragmentedFlow const): Deleted.
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isInFlowRenderFragmentedFlow const):
+        (WebCore::RenderObject::isOutOfFlowRenderFragmentedFlow const): Deleted.
+
 2021-04-28  Miguel Gomez  <magomez@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2369 +2369 @@
         return adjustedRect;
     
-    // This code isn't necessary for in-flow RenderFragmentedFlows.
-    // Don't add the location of the fragment in the flow thread for absolute positioned
-    // elements because their absolute position already pushes them down through
-    // the fragments so adding this here and then adding the topLeft again would cause
-    // us to add the height twice.
-    // The same logic applies for elements flowed directly into the flow thread. Their topLeft member
-    // will already contain the portion rect of the fragment.
-    auto position = styleToUse.position();
-    if (localContainer->isOutOfFlowRenderFragmentedFlow() && position != PositionType::Absolute && containingBlock() != enclosingFragmentedFlow()) {
-        RenderFragmentContainer* firstFragment = nullptr;
-        RenderFragmentContainer* lastFragment = nullptr;
-        if (downcast<RenderFragmentedFlow>(*localContainer).getFragmentRangeForBox(this, firstFragment, lastFragment))
-            adjustedRect.moveBy(firstFragment->fragmentedFlowPortionRect().location());
-    }
-
     if (isWritingModeRoot()) {
         if (!isOutOfFlowPositioned() || !context.dirtyRectIsFlipped) {
@@ -2419 +2404 @@
     // We are now in our parent container's coordinate space. Apply our transform to obtain a bounding box
     // in the parent's coordinate space that encloses us.
+    auto position = styleToUse.position();
     if (hasLayer() && layer()->transform()) {
         context.hasPositionFixedDescendant = position == PositionType::Fixed;

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2646 +2646 @@
         return;
     
-    // FIXME: This code is wrong for named flow threads since it only works for content in the first region.
-    // We also don't want to run it for multicolumn flow threads, since we can use our knowledge of column
-    // geometry to actually get a better result.
-    // The point inside a box that's inside a region has its coordinates relative to the region,
-    // not the FragmentedFlow that is its container in the RenderObject tree.
-    if (is<RenderBox>(*this) && container->isOutOfFlowRenderFragmentedFlow()) {
-        RenderFragmentContainer* startFragment = nullptr;
-        RenderFragmentContainer* endFragment = nullptr;
-        if (downcast<RenderFragmentedFlow>(*container).getFragmentRangeForBox(downcast<RenderBox>(this), startFragment, endFragment))
-            container = startFragment;
-    }
-
     container->mapAbsoluteToLocalPoint(mode, transformState);
 

trunk/Source/WebCore/rendering/RenderElement.h

@@ -432 +432 @@
         || (isRenderBlock() && style().willChange() && style().willChange()->createsContainingBlockForOutOfFlowPositioned())
         || isSVGForeignObject()
-        || shouldApplyLayoutContainment(*this)
-        || isOutOfFlowRenderFragmentedFlow();
+        || shouldApplyLayoutContainment(*this);
 }
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2276 +2276 @@
     if (position == PositionType::Fixed && fixedFragmentedFlowContainer) {
         ASSERT(ancestorLayer);
-        if (ancestorLayer->isOutOfFlowRenderFragmentedFlow()) {
-            location += toLayoutSize(layer->location());
-            return ancestorLayer;
-        }
-
         if (ancestorLayer == renderer.view().layer()) {
             // Add location in flow thread coordinates.
@@ -2314 +2309 @@
         // We should not reach RenderView layer past the RenderFragmentedFlow layer for any
         // children of the RenderFragmentedFlow.
-        if (renderer.enclosingFragmentedFlow() && !layer->isOutOfFlowRenderFragmentedFlow())
+        if (renderer.enclosingFragmentedFlow())
             ASSERT(parentLayer != renderer.view().layer());
 
@@ -4314 +4309 @@
     // the tree.
     if (!result.innerNode() || !result.innerNonSharedNode()) {
-        if (isOutOfFlowRenderFragmentedFlow()) {
-            // The flowthread doesn't have an enclosing element, so when hitting the layer of the
-            // flowthread (e.g. the descent area of the RootInlineBox for the image flowed alone
-            // inside the flow thread) we're letting the hit testing continue so it will hit the region.
-            return false;
-        }
-
         Element* e = enclosingElement();
         if (!result.innerNode())
@@ -4563 +4551 @@
 
     LayoutSize offsetFromRootLocal = offsetFromRoot;
-
-    if (clipRectsContext.rootLayer->isOutOfFlowRenderFragmentedFlow()) {
-        LayoutPoint absPos = LayoutPoint(renderer().view().localToAbsolute(FloatPoint(), IsFixed));
-        offsetFromRootLocal += toLayoutSize(absPos);
-    }
 
     layerBounds = LayoutRect(toLayoutPoint(offsetFromRootLocal), size());

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -828 +828 @@
 
     bool isRenderFragmentedFlow() const { return renderer().isRenderFragmentedFlow(); }
-    bool isOutOfFlowRenderFragmentedFlow() const { return renderer().isOutOfFlowRenderFragmentedFlow(); }
     bool isInsideFragmentedFlow() const { return renderer().fragmentedFlowState() != RenderObject::NotInsideFragmentedFlow; }
     bool isDirtyRenderFragmentedFlow() const

trunk/Source/WebCore/rendering/RenderObject.h

@@ -263 +263 @@
     virtual bool isRenderGrid() const { return false; }
     bool isInFlowRenderFragmentedFlow() const { return isRenderFragmentedFlow() && !isOutOfFlowPositioned(); }
-    bool isOutOfFlowRenderFragmentedFlow() const { return isRenderFragmentedFlow() && isOutOfFlowPositioned(); }
 
     virtual bool isMultiColumnBlockFlow() const { return false; }