Changeset 292416 in webkit

Timestamp:

Apr 5, 2022 1:11:37 PM (4 months ago)

Author:

Alan Bujtas

Message:

[CSS-Contain] Flex layout should take "contain: inline-size" into account when computing the flex item's logical width
​https://bugs.webkit.org/show_bug.cgi?id=238805

Reviewed by Antti Koivisto.

Source/WebCore:

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths const):

LayoutTests:

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-05  Alan Bujtas  <zalan@apple.com>
+
+        [CSS-Contain] Flex layout should take "contain: inline-size" into account when computing the flex item's logical width
+        https://bugs.webkit.org/show_bug.cgi?id=238805
+
+        Reviewed by Antti Koivisto.
+
+        * TestExpectations:
+
 2022-04-05  Matteo Flores  <matteo_flores@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -4637 +4637 @@
 # CSS containment tests that fail
 imported/w3c/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-001.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-contain/contain-inline-size-flex.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-contain/contain-inline-size-grid.html [ ImageOnlyFailure ]
 # webkit-ruby-text

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-05  Alan Bujtas  <zalan@apple.com>
+
+        [CSS-Contain] Flex layout should take "contain: inline-size" into account when computing the flex item's logical width
+        https://bugs.webkit.org/show_bug.cgi?id=238805
+
+        Reviewed by Antti Koivisto.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths const):
+
 2022-04-05  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -103 +103 @@
     };
 
-    if (shouldApplySizeContainment(*this)) {
+    auto shouldIgnoreFlexItemContentForLogicalWidth = shouldApplySizeContainment(*this) || shouldApplyInlineSizeContainment(*this);
+    if (shouldIgnoreFlexItemContentForLogicalWidth) {
         addScrollbarWidth();
         return;