[CSS Container Queries] Remove size() function syntax

https://bugs.webkit.org/show_bug.cgi?id=237639 Reviewed by Antoine Quint. LayoutTests/imported/w3c: * web-platform-tests/css/css-contain/container-queries/at-container-parsing-expected.txt: * web-platform-tests/css/css-contain/container-queries/container-name-parsing-expected.txt: Source/WebCore: Per w3c/csswg-drafts#6870 * css/ContainerQueryParser.cpp: (WebCore::ContainerQueryParser::consumeContainerQuery): * css/parser/CSSPropertyParserHelpers.cpp: (WebCore::CSSPropertyParserHelpers::consumeSingleContainerName): Also disallow strings as container names (they need to be identifiers). Canonical link: https://commits.webkit.org/248220@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291046 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Mar 9, 2022 · fe33dbe · fe33dbe
1 parent f0c5446
commit fe33dbe
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 23 deletions.
diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,13 @@
+2022-03-09  Antti Koivisto  <[email protected]>
+
+        [CSS Container Queries] Remove size() function syntax
+        https://bugs.webkit.org/show_bug.cgi?id=237639
+
+        Reviewed by Antoine Quint.
+
+        * web-platform-tests/css/css-contain/container-queries/at-container-parsing-expected.txt:
+        * web-platform-tests/css/css-contain/container-queries/container-name-parsing-expected.txt:
+
 2022-03-09  Antoine Quint  <[email protected]>
 
         [web-animations] color-interpolation-filters should support discrete animation

diff --git a/...3c/web-platform-tests/css/css-contain/container-queries/at-container-parsing-expected.txt b/...3c/web-platform-tests/css/css-contain/container-queries/at-container-parsing-expected.txt
@@ -24,7 +24,7 @@ PASS (width < 100px)
 PASS (100px < width)
 PASS (100px < width < 200px)
 PASS foo(width)
-FAIL size(width) assert_equals: expected "" but got "true"
+PASS size(width)
 PASS (asdf)
 PASS (resolution > 100dpi)
 PASS (resolution: 150dpi)
@@ -50,6 +50,6 @@ PASS Container selector: 1px
 PASS Container selector: 50gil
 PASS Container selector: name(foo)
 PASS Container selector: type(inline-size)
-FAIL Container selector: "foo" assert_equals: expected 0 but got 1
-FAIL Container selector: "inherit" assert_equals: expected 0 but got 1
+PASS Container selector: "foo"
+PASS Container selector: "inherit"
 
diff --git a/.../web-platform-tests/css/css-contain/container-queries/container-name-parsing-expected.txt b/.../web-platform-tests/css/css-contain/container-queries/container-name-parsing-expected.txt
@@ -12,10 +12,10 @@ PASS e.style['container-name'] = "foo, bar" should not set the property value
 PASS e.style['container-name'] = "#fff" should not set the property value
 PASS e.style['container-name'] = "1px" should not set the property value
 PASS e.style['container-name'] = "default" should not set the property value
-FAIL e.style['container-name'] = "\"initial\"" should not set the property value assert_equals: expected "" but got "\"initial\""
-FAIL e.style['container-name'] = "\"inherit\"" should not set the property value assert_equals: expected "" but got "\"inherit\""
-FAIL e.style['container-name'] = "\"unset\"" should not set the property value assert_equals: expected "" but got "\"unset\""
-FAIL e.style['container-name'] = "\"revert\"" should not set the property value assert_equals: expected "" but got "\"revert\""
-FAIL e.style['container-name'] = "\"none\"" should not set the property value assert_equals: expected "" but got "\"none\""
-FAIL e.style['container-name'] = "\"foo\"" should not set the property value assert_equals: expected "" but got "\"foo\""
+PASS e.style['container-name'] = "\"initial\"" should not set the property value
+PASS e.style['container-name'] = "\"inherit\"" should not set the property value
+PASS e.style['container-name'] = "\"unset\"" should not set the property value
+PASS e.style['container-name'] = "\"revert\"" should not set the property value
+PASS e.style['container-name'] = "\"none\"" should not set the property value
+PASS e.style['container-name'] = "\"foo\"" should not set the property value
 
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2022-03-09  Antti Koivisto  <[email protected]>
+
+        [CSS Container Queries] Remove size() function syntax
+        https://bugs.webkit.org/show_bug.cgi?id=237639
+
+        Reviewed by Antoine Quint.
+
+        Per https://github.com/w3c/csswg-drafts/issues/6870
+
+        * css/ContainerQueryParser.cpp:
+        (WebCore::ContainerQueryParser::consumeContainerQuery):
+        * css/parser/CSSPropertyParserHelpers.cpp:
+        (WebCore::CSSPropertyParserHelpers::consumeSingleContainerName):
+
+        Also disallow strings as container names (they need to be identifiers).
+
 2022-03-09  Fujii Hironori  <[email protected]>
 
         [WinCairo] SpatialNavigation.h(93): error C2365: 'WebCore::None': redefinition; previous definition was 'enumerator'

diff --git a/Source/WebCore/css/ContainerQueryParser.cpp b/Source/WebCore/css/ContainerQueryParser.cpp
@@ -39,18 +39,9 @@ std::optional<ContainerQuery> ContainerQueryParser::consumeContainerQuery(CSSPar
 std::optional<CQ::ContainerQuery> ContainerQueryParser::consumeContainerQuery(CSSParserTokenRange& range)
 {
     if (range.peek().type() == FunctionToken) {
-        bool isSizeQuery = range.peek().functionId() == CSSValueSize;
-
-        auto blockRange = range.consumeBlock();
-        blockRange.consumeWhitespace();
-
-        if (!isSizeQuery)
-            return CQ::UnknownQuery { };
-
-        auto sizeQuery = consumeSizeQuery(blockRange);
-        if (!sizeQuery)
-            return { };
-        return { *sizeQuery };
+        range.consumeBlock();
+        // This is where we would support style() queries.
+        return CQ::UnknownQuery { };
     }
 
     if (range.peek().type() == LeftParenthesisToken) {

diff --git a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
@@ -4285,8 +4285,6 @@ RefPtr<CSSPrimitiveValue> consumeSingleContainerName(CSSParserTokenRange& range)
         return nullptr;
     if (auto ident = consumeCustomIdent(range))
         return ident;
-    if (auto string = consumeString(range))
-        return string;
     return nullptr;
 }