Changeset 289466 in webkit

Timestamp:

Feb 9, 2022 4:42:22 AM (5 months ago)

Author:

Antti Koivisto

Message:

[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.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-type-containment-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyleConstants.h (modified) (1 diff)
• Source/WebCore/style/StyleScope.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-09  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Implement inline-size containment
+        https://bugs.webkit.org/show_bug.cgi?id=236354
+
+        Reviewed by Antoine Quint.
+
+        * web-platform-tests/css/css-contain/container-queries/container-type-containment-expected.txt:
+
 2022-02-09  Ziran Sun  <zsun@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-type-containment-expected.txt

@@ -3 +3 @@
 
 PASS container-type:inline-size turns on layout containment
-FAIL container-type:inline-size turns on inline-size containment assert_equals: expected 0 but got 12
+PASS container-type:inline-size turns on inline-size containment
 PASS container-type:size turns on full size containment
 PASS container-type:inline/size turns on style containment

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-09  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Implement inline-size containment
+        https://bugs.webkit.org/show_bug.cgi?id=236354
+
+        Reviewed by Antoine Quint.
+
+        "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.
+
 2022-02-09  Ziran Sun  <zsun@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -4082 +4082 @@
 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))

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -2836 +2836 @@
         break;
     case ContainerType::InlineSize:
-        // FIXME: Support inline-size containment.
-        containment.add({ Containment::Layout, Containment::Style });
+        containment.add({ Containment::Layout, Containment::Style, Containment::InlineSize });
         break;
     };

trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

@@ -1226 +1226 @@
 
 enum class Containment : uint8_t {
-    Layout   = 1 << 0,
-    Paint    = 1 << 1,
-    Size     = 1 << 2,
-    Style    = 1 << 3,
+    Layout      = 1 << 0,
+    Paint       = 1 << 1,
+    Size        = 1 << 2,
+    InlineSize  = 1 << 3,
+    Style       = 1 << 4,
 };
 

trunk/Source/WebCore/style/StyleScope.cpp

@@ -798 +798 @@
         if (!containerElement)
             continue;
-        auto size = containerRenderer.size();
+        
+        auto size = containerRenderer.logicalSize();
+
+        auto sizeChanged = [&](LayoutSize oldSize) {
+            switch (containerRenderer.style().containerType()) {
+            case ContainerType::InlineSize:
+                return size.width() != oldSize.width();
+            case ContainerType::Size:
+                return size != oldSize;
+            case ContainerType::None:
+                ASSERT_NOT_REACHED();
+                return false;
+            }
+        };
+
         auto it = previousStates.find(*containerElement);
-        bool changed = it == previousStates.end() || it->value != size;
+        bool changed = it == previousStates.end() || sizeChanged(it->value);
         if (changed)
             changedContainers.append(containerElement);