Changeset 294754 in webkit

Timestamp:

May 24, 2022, 11:48:31 AM (4 years ago)

Author:

Alan Bujtas

Message:

REGRESSION (r292532): pge.com: Unable to focus on any of the inputs
​https://bugs.webkit.org/show_bug.cgi?id=240832
<rdar://92538460>

Reviewed by Simon Fraser.

This is a revert of r292532. Blank float avoiders (used width = 0px) do fit even when the available space is zero. We have to find a different way to address the float fitting issue in contain-inline-size-bfc-floats-001.html (though I am not convinced that the expected result is correct anymore).

• LayoutTests/TestExpectations:
• LayoutTests/fast/block/float/zero-size-float-avoider-incorrect-position-expected.html: Added.
• LayoutTests/fast/block/float/zero-size-float-avoider-incorrect-position.html: Added.
• Source/WebCore/rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::getClearDelta):

Canonical link: ​https://commits.webkit.org/250922@main

Location:

trunk

Files:

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

trunk/LayoutTests/TestExpectations

@@ -4639 +4639 @@
 
 # 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 ]
@@ -4694 +4695 @@
 webkit.org/b/229659 imported/w3c/web-platform-tests/css/css-contain/container-queries/custom-layout-container-001.https.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/rendering/RenderBlockFlow.cpp

@@ -2844 +2844 @@
             child.setMarginRight(childOldMarginRight);
             
-            auto shouldAvoidCurrentVerticalPosition = !availableLogicalWidthAtNewLogicalTopOffset || childLogicalWidthAtNewLogicalTopOffset > availableLogicalWidthAtNewLogicalTopOffset;
-            if (!shouldAvoidCurrentVerticalPosition) {
+            if (childLogicalWidthAtNewLogicalTopOffset <= availableLogicalWidthAtNewLogicalTopOffset) {
                 // 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