Changeset 289617 in webkit

Timestamp:

Feb 11, 2022 4:47:17 AM (5 months ago)

Author:

Antti Koivisto

Message:

[CSS Container Queries] Implement container name matching
​https://bugs.webkit.org/show_bug.cgi?id=236495

Reviewed by Tim Nguyen.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt:
• web-platform-tests/css/css-contain/container-queries/container-selection-expected.txt:

Source/WebCore:

Find the right container to evaluate against.

• style/ContainerQueryEvaluator.cpp:

(WebCore::Style::ContainerQueryEvaluator::evaluate const):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-selection-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/ContainerQueryEvaluator.cpp (modified) (3 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-11  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Implement container name matching
+        https://bugs.webkit.org/show_bug.cgi?id=236495
+
+        Reviewed by Tim Nguyen.
+
+        * web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt:
+        * web-platform-tests/css/css-contain/container-queries/container-selection-expected.txt:
+
 2022-02-11  Andreu Botella  <andreu@andreubotella.com>
 

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

@@ -1 +1 @@
 Test
 
-FAIL Changing a named container invalidates relevant descendants assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
-FAIL Changing container-name invalidates relevant descendants assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
+PASS Changing a named container invalidates relevant descendants
+FAIL Changing container-name invalidates relevant descendants assert_equals: expected "rgb(0, 0, 0)" but got "rgb(0, 128, 0)"
 

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

@@ -13 +13 @@
 PASS name(c) size(width) for .a-size > .b-size > span
 FAIL name(a) size(width: 16px) for .a-size > .a-size > span assert_equals: expected "true" but got ""
-FAIL a size(width: 32px) for .a-size > .b-size > span assert_equals: expected "true" but got ""
+PASS a size(width: 32px) for .a-size > .b-size > span
 PASS b size(width: 16px) for .a-size > .b-size > span
-FAIL c size(width) for .a-size > .b-size > span assert_equals: expected "" but got "true"
+PASS c size(width) for .a-size > .b-size > span
 PASS a size(width: 16px) for .a-size > .a-size > span
 PASS a size(width: 32px) for .a-size > .a > span

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-11  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Implement container name matching
+        https://bugs.webkit.org/show_bug.cgi?id=236495
+
+        Reviewed by Tim Nguyen.
+
+        Find the right container to evaluate against.
+
+        * style/ContainerQueryEvaluator.cpp:
+        (WebCore::Style::ContainerQueryEvaluator::evaluate const):
+
 2022-02-11  Tim Nguyen  <ntim@apple.com>
 

trunk/Source/WebCore/style/ContainerQueryEvaluator.cpp

@@ -65 +65 @@
         return false;
 
-    // FIXME: Match the container selector.
-    auto* renderer = m_containers.last()->renderer();
+    auto rendererForContainerSelector = [&]() -> RenderBox* {
+        for (auto& container : makeReversedRange(m_containers)) {
+            auto* renderer = dynamicDowncast<RenderBox>(container->renderer());
+            if (!renderer)
+                return nullptr;
+            if (containerQuery.containerName.isEmpty())
+                return renderer;
+            if (renderer->style().containerNames().contains(containerQuery.containerName))
+                return renderer;
+        }
+        return nullptr;
+    };
+
+    auto* renderer = rendererForContainerSelector();
     if (!renderer)
         return false;
@@ -75 +87 @@
     auto evaluateSize = [&](const MediaQueryExpression& expression, Comparator comparator, auto&& sizeGetter)
     {
-        if (!is<RenderBox>(renderer))
-            return false;
-
         std::optional<LayoutUnit> expressionSize;
 
@@ -86 +95 @@
         }
 
-        auto size = sizeGetter(downcast<RenderBox>(*renderer));
+        auto size = sizeGetter(*renderer);
 
         switch (comparator) {