[CSS Container Queries] Implement inline-size containment
https://bugs.webkit.org/show_bug.cgi?id=236354
Reviewed by Antoine Quint.
LayoutTests/imported/w3c:
* web-platform-tests/css/css-contain/container-queries/container-type-containment-expected.txt:
Source/WebCore:
"Giving an element inline-size containment applies size containment to the inline-axis sizing
of its principal box. This means the inline-axis intrinsic sizes of the principal box are
determined as if the element had no content."
https://drafts.csswg.org/css-contain-3/#containment-inline-size
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):
Compute inline axis preferred width as if the block had no content.
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::effectiveContainment const):
* rendering/style/RenderStyleConstants.h:
For completeness, add an enum value for inline-size containment. It can only be set by 'container'
property for now.
* style/StyleScope.cpp:
(WebCore::Style::Scope::updateQueryContainerState):
Ignore block axis for inline-size containers.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@289466 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/rendering/RenderBlockFlow.cpp b/Source/WebCore/rendering/RenderBlockFlow.cpp
index a7e95c8..9074f57 100644
--- a/Source/WebCore/rendering/RenderBlockFlow.cpp
+++ b/Source/WebCore/rendering/RenderBlockFlow.cpp
@@ -4081,6 +4081,11 @@
void RenderBlockFlow::computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
{
+ // "The inline-axis intrinsic sizes of the principal box are determined as if the element had no content."
+ // https://drafts.csswg.org/css-contain-3/#containment-inline-size
+ if (style().effectiveContainment().contains(Containment::InlineSize))
+ return;
+
#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
if (const_cast<RenderBlockFlow&>(*this).tryComputePreferredWidthsUsingModernPath(minLogicalWidth, maxLogicalWidth))
return;
