Title: [292416] trunk
- Revision
- 292416
- Author
- za...@apple.com
- Date
- 2022-04-05 13:11:37 -0700 (Tue, 05 Apr 2022)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (292415 => 292416)
--- trunk/LayoutTests/ChangeLog 2022-04-05 20:02:36 UTC (rev 292415)
+++ trunk/LayoutTests/ChangeLog 2022-04-05 20:11:37 UTC (rev 292416)
@@ -1,3 +1,12 @@
+2022-04-05 Alan Bujtas <za...@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_flo...@apple.com>
[ iOS Mac ] http/tests/workers/service/openwindow-from-notification-click.html is a flaky text failure
Modified: trunk/LayoutTests/TestExpectations (292415 => 292416)
--- trunk/LayoutTests/TestExpectations 2022-04-05 20:02:36 UTC (rev 292415)
+++ trunk/LayoutTests/TestExpectations 2022-04-05 20:11:37 UTC (rev 292416)
@@ -4636,7 +4636,6 @@
# 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
imported/w3c/web-platform-tests/css/css-contain/contain-layout-017.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (292415 => 292416)
--- trunk/Source/WebCore/ChangeLog 2022-04-05 20:02:36 UTC (rev 292415)
+++ trunk/Source/WebCore/ChangeLog 2022-04-05 20:11:37 UTC (rev 292416)
@@ -1,3 +1,13 @@
+2022-04-05 Alan Bujtas <za...@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 <cdu...@apple.com>
Unreviewed WinCairo build fix after r292408.
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (292415 => 292416)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2022-04-05 20:02:36 UTC (rev 292415)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2022-04-05 20:11:37 UTC (rev 292416)
@@ -102,7 +102,8 @@
minLogicalWidth += scrollbarWidth;
};
- if (shouldApplySizeContainment(*this)) {
+ auto shouldIgnoreFlexItemContentForLogicalWidth = shouldApplySizeContainment(*this) || shouldApplyInlineSizeContainment(*this);
+ if (shouldIgnoreFlexItemContentForLogicalWidth) {
addScrollbarWidth();
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
