Changeset 288111 in webkit

Timestamp:

Jan 17, 2022 11:57:43 PM (6 months ago)

Author:

Antti Koivisto

Message:

[:has() pseudo-class] Disallow nested :has()
​https://bugs.webkit.org/show_bug.cgi?id=235231

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

• web-platform-tests/css/selectors/has-argument-with-explicit-scope.tentative-expected.txt:
• web-platform-tests/css/selectors/has-basic-expected.txt:
• web-platform-tests/css/selectors/parsing/parse-has-expected.txt:

Source/WebCore:

Nested case ':has(:has(foo))' adds no meaningful capability and would complicate invalidation.
See ​https://github.com/w3c/csswg-drafts/issues/6952 for more details.

• css/parser/CSSSelectorParser.cpp:

(WebCore::CSSSelectorParser::consumePseudo):

Also set m_resistDefaultNamespace like other logical combination pseudo-classes.

• css/parser/CSSSelectorParser.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/selectors/has-basic-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/selectors/has-relative-argument-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/selectors/parsing/parse-has-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/parser/CSSSelectorParser.cpp (modified) (3 diffs)
• Source/WebCore/css/parser/CSSSelectorParser.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-01-17  Antti Koivisto  <antti@apple.com>
+
+        [:has() pseudo-class] Disallow nested :has()
+        https://bugs.webkit.org/show_bug.cgi?id=235231
+
+        Reviewed by Dean Jackson.
+
+        * web-platform-tests/css/selectors/has-argument-with-explicit-scope.tentative-expected.txt:
+        * web-platform-tests/css/selectors/has-basic-expected.txt:
+        * web-platform-tests/css/selectors/parsing/parse-has-expected.txt:
+
 2022-01-17  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/selectors/has-basic-expected.txt

@@ -10 +10 @@
 PASS .parent:has(:is(.target ~ .sibling .descendant)) matches expected elements
 PASS .sibling:has(.descendant) ~ .target matches expected elements
-PASS :has(.sibling:has(.descendant) ~ .target) matches expected elements
-PASS :has(.sibling:has(.descendant) ~ .target) ~ .parent > .descendant matches expected elements
+FAIL :has(.sibling:has(.descendant) ~ .target) matches expected elements The string did not match the expected pattern.
+FAIL :has(.sibling:has(.descendant) ~ .target) ~ .parent > .descendant matches expected elements The string did not match the expected pattern.
 PASS :has(> .parent) matches expected elements
 PASS :has(> .target) matches expected elements

trunk/LayoutTests/imported/w3c/web-platform-tests/css/selectors/has-relative-argument-expected.txt

@@ -33 +33 @@
 PASS .y:has(> .g .h) .i matches expected elements
 PASS .y:has(.g .h) .i matches expected elements
-PASS .x:has(+ .y:has(> .g .h) .i) matches expected elements
-PASS .x:has(+ .y:has(.g .h) .i) matches expected elements
-PASS .x:has(+ .y:has(> .g .h) .i) ~ .j matches expected elements
-PASS .x:has(+ .y:has(.g .h) .i) ~ .j matches expected elements
-PASS .x:has(~ .y:has(> .g .h) .i) matches expected elements
-PASS .x:has(~ .y:has(.g .h) .i) matches expected elements
+FAIL .x:has(+ .y:has(> .g .h) .i) matches expected elements The string did not match the expected pattern.
+FAIL .x:has(+ .y:has(.g .h) .i) matches expected elements The string did not match the expected pattern.
+FAIL .x:has(+ .y:has(> .g .h) .i) ~ .j matches expected elements The string did not match the expected pattern.
+FAIL .x:has(+ .y:has(.g .h) .i) ~ .j matches expected elements The string did not match the expected pattern.
+FAIL .x:has(~ .y:has(> .g .h) .i) matches expected elements The string did not match the expected pattern.
+FAIL .x:has(~ .y:has(.g .h) .i) matches expected elements The string did not match the expected pattern.
 PASS .d .x:has(.e) matches expected elements
 PASS .d ~ .x:has(~ .e) matches expected elements

trunk/LayoutTests/imported/w3c/web-platform-tests/css/selectors/parsing/parse-has-expected.txt

@@ -16 +16 @@
 PASS ".a .b:has(.c .d)" should be a valid selector
 PASS ".a .b:has(.c .d) .e" should be a valid selector
-PASS ".a:has(.b:has(.c))" should be a valid selector
+FAIL ".a:has(.b:has(.c))" should be a valid selector The string did not match the expected pattern.
 PASS ".a:has(.b:is(.c .d))" should be a valid selector
-PASS ".a:has(.b:is(.c:has(.d) .e))" should be a valid selector
+FAIL ".a:has(.b:is(.c:has(.d) .e))" should be a valid selector assert_equals: serialization should be canonical expected ".a:has(.b:is(.c:has(.d) .e))" but got ".a:has(.b:is())"
 PASS ".a:is(.b:has(.c) .d)" should be a valid selector
 PASS ".a:not(:has(.b))" should be a valid selector

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-17  Antti Koivisto  <antti@apple.com>
+
+        [:has() pseudo-class] Disallow nested :has()
+        https://bugs.webkit.org/show_bug.cgi?id=235231
+
+        Reviewed by Dean Jackson.
+
+        Nested case ':has(:has(foo))' adds no meaningful capability and would complicate invalidation.
+        See https://github.com/w3c/csswg-drafts/issues/6952 for more details.
+
+        * css/parser/CSSSelectorParser.cpp:
+        (WebCore::CSSSelectorParser::consumePseudo):
+
+        Also set m_resistDefaultNamespace like other logical combination pseudo-classes.
+
+        * css/parser/CSSSelectorParser.h:
+
 2022-01-17  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp

@@ -687 +687 @@
         switch (selector->pseudoClassType()) {
         case CSSSelector::PseudoClassNot: {
-            SetForScope<bool> resistDefaultNamespace(m_resistDefaultNamespace, true);
+            SetForScope resistDefaultNamespace(m_resistDefaultNamespace, true);
             auto selectorList = makeUnique<CSSSelectorList>();
             *selectorList = consumeComplexSelectorList(block);
@@ -735 +735 @@
         case CSSSelector::PseudoClassMatches:
         case CSSSelector::PseudoClassAny: {
-            SetForScope<bool> resistDefaultNamespace(m_resistDefaultNamespace, true);
+            SetForScope resistDefaultNamespace(m_resistDefaultNamespace, true);
             auto selectorList = makeUnique<CSSSelectorList>();
             *selectorList = consumeForgivingComplexSelectorList(block);
@@ -752 +752 @@
         }
         case CSSSelector::PseudoClassHas: {
+            if (m_disallowHasPseudoClass)
+                return nullptr;
+            SetForScope resistDefaultNamespace(m_resistDefaultNamespace, true);
+            SetForScope disallowNestedHas(m_disallowHasPseudoClass, true);
             auto selectorList = makeUnique<CSSSelectorList>();
             *selectorList = consumeForgivingRelativeSelectorList(block);

trunk/Source/WebCore/css/parser/CSSSelectorParser.h

@@ -90 +90 @@
     bool m_failedParsing { false };
     bool m_disallowPseudoElements { false };
+    bool m_disallowHasPseudoClass { false };
     bool m_resistDefaultNamespace { false };
     bool m_ignoreDefaultNamespace { false };