Changeset 292532 in webkit

Timestamp:

Apr 7, 2022, 6:28:51 AM (4 years ago)

Author:

Alan Bujtas

Message:

A float avoider should never take a vertical position where a float is present even when its used width is zero
​https://bugs.webkit.org/show_bug.cgi?id=238895

Reviewed by Antti Koivisto.

Source/WebCore:

A zero width available space is never a valid vertical position for a float avoider even when its width is zero too.

Test: fast/block/float/float-avoider-with-zero-width.html

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::getClearDelta): skip and check the next candidate poisition when no space is available.

LayoutTests:

• TestExpectations: inline-size-bfc-floats.html: never produced correct rendering, the red box just happened to be hidden (which made this test pass).
• fast/block/float/float-avoider-with-zero-width-expected.html: Added.
• fast/block/float/float-avoider-with-zero-width.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (2 diffs)
• LayoutTests/fast/block/float/float-avoider-with-shrinking-content-expected.html (added)
• LayoutTests/fast/block/float/float-avoider-with-shrinking-content.html (added)
• LayoutTests/fast/block/float/float-avoider-with-zero-width-expected.txt (added)
• LayoutTests/fast/block/float/float-avoider-with-zero-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-07  Alan Bujtas  <zalan@apple.com>
+
+        A float avoider should never take a vertical position where a float is present even when its used width is zero
+        https://bugs.webkit.org/show_bug.cgi?id=238895
+
+        Reviewed by Antti Koivisto.
+
+        * TestExpectations: inline-size-bfc-floats.html: never produced correct rendering, the red box just happened to be hidden (which made this test pass).
+        * fast/block/float/float-avoider-with-zero-width-expected.html: Added.
+        * fast/block/float/float-avoider-with-zero-width.html: Added.
+
 2022-04-07  Tim Nguyen  <ntim@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -4640 +4640 @@
 
 # CSS containment tests that fail
-imported/w3c/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-001.html [ ImageOnlyFailure ]
 # webkit-ruby-text
 imported/w3c/web-platform-tests/css/css-contain/contain-layout-017.html [ ImageOnlyFailure ]
@@ -4697 +4696 @@
 webkit.org/b/229659 imported/w3c/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002.html [ ImageOnlyFailure ]
 webkit.org/b/229659 imported/w3c/web-platform-tests/css/css-contain/container-queries/svg-foreignobject-no-size-container.html [ Skip ]
+webkit.org/b/229659 imported/w3c/web-platform-tests/css/css-contain/container-queries/inline-size-bfc-floats.html [ ImageOnlyFailure ]
 
 # Flaky css-contain test

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-07  Alan Bujtas  <zalan@apple.com>
+
+        A float avoider should never take a vertical position where a float is present even when its used width is zero
+        https://bugs.webkit.org/show_bug.cgi?id=238895
+
+        Reviewed by Antti Koivisto.
+
+        A zero width available space is never a valid vertical position for a float avoider even when its width is zero too.
+
+        Test: fast/block/float/float-avoider-with-zero-width.html
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::getClearDelta): skip and check the next candidate poisition when no space is available.
+
 2022-04-07  Tim Nguyen  <ntim@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -2844 +2844 @@
             child.setMarginRight(childOldMarginRight);
             
-            if (childLogicalWidthAtNewLogicalTopOffset <= availableLogicalWidthAtNewLogicalTopOffset) {
+            auto shouldAvoidCurrentVerticalPosition = !availableLogicalWidthAtNewLogicalTopOffset || childLogicalWidthAtNewLogicalTopOffset > availableLogicalWidthAtNewLogicalTopOffset;
+            if (!shouldAvoidCurrentVerticalPosition) {
                 // Even though we may not be moving, if the logical width did shrink because of the presence of new floats, then
                 // we need to force a relayout as though we shifted. This happens because of the dynamic addition of overhanging floats