Changeset 289527 in webkit

Timestamp:

Feb 10, 2022 5:02:05 AM (5 months ago)

Author:

commit-queue@webkit.org

Message:

Incorrect abspos layout when toggling contain
​https://bugs.webkit.org/show_bug.cgi?id=236261

Patch by Rob Buis <​rbuis@igalia.com> on 2022-02-10
Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-contain/contain-layout-020-expected.html: Added.
• web-platform-tests/css/css-contain/contain-layout-020.html: Added.

Source/WebCore:

A change in layout containment for a container means either the container becomes
a absolute positioning containing block or ceases to be one. The method
removePositionedObjectsIfNeeded handles this, update it to take layout containment
changes into account.

Test: imported/w3c/web-platform-tests/css/css-contain/contain-layout-020.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::removePositionedObjectsIfNeeded):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/contain-layout-020-expected.html (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/contain-layout-020.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-10  Rob Buis  <rbuis@igalia.com>
+
+        Incorrect abspos layout when toggling contain
+        https://bugs.webkit.org/show_bug.cgi?id=236261
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-contain/contain-layout-020-expected.html: Added.
+        * web-platform-tests/css/css-contain/contain-layout-020.html: Added.
+
 2022-02-10  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-10  Rob Buis  <rbuis@igalia.com>
+
+        Incorrect abspos layout when toggling contain
+        https://bugs.webkit.org/show_bug.cgi?id=236261
+
+        Reviewed by Simon Fraser.
+
+        A change in layout containment for a container means either the container becomes
+        a absolute positioning containing block or ceases to be one. The method
+        removePositionedObjectsIfNeeded handles this, update it to take layout containment
+        changes into account.
+
+        Test: imported/w3c/web-platform-tests/css/css-contain/contain-layout-020.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::removePositionedObjectsIfNeeded):
+
 2022-02-10  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -377 +377 @@
     bool hadTransform = oldStyle.hasTransformRelatedProperty();
     bool willHaveTransform = newStyle.hasTransformRelatedProperty();
-    if (oldStyle.position() == newStyle.position() && hadTransform == willHaveTransform)
+    bool hadLayoutContainment = oldStyle.containsLayout();
+    bool willHaveLayoutContainment = newStyle.containsLayout();
+    if (oldStyle.position() == newStyle.position() && hadTransform == willHaveTransform && hadLayoutContainment == willHaveLayoutContainment)
         return;
 
     // We are no longer the containing block for out-of-flow descendants.
     bool outOfFlowDescendantsHaveNewContainingBlock = (hadTransform && !willHaveTransform) || (newStyle.position() == PositionType::Static && !willHaveTransform);
+    if (hadLayoutContainment != willHaveLayoutContainment)
+        outOfFlowDescendantsHaveNewContainingBlock = hadLayoutContainment && !willHaveLayoutContainment;
     if (outOfFlowDescendantsHaveNewContainingBlock) {
         // Our out-of-flow descendants will be inserted into a new containing block's positioned objects list during the next layout.