Changeset 270955 in webkit

Timestamp:

Dec 17, 2020 3:21:58 PM (19 months ago)

Author:

Manuel Rego Casasnovas

Message:

[selectors] Default namespace gets ignored inside non-type selectors for :is() and :not()
​https://bugs.webkit.org/show_bug.cgi?id=219950

Reviewed by Antti Koivisto.

Source/WebCore:

Based on Blink r820500 and r820557 by <​andruud@chromium.org>.

Default namespace declarations do not affect the compound selector
representing the subject of any selector within a :is() or :not() pseudo-class,
unless that compound selector contains an explicit universal selector or type selector.
Spec: ​https://drafts.csswg.org/selectors-4/#matches

This patch aligns WebKit implementation with Chromium and Firefox, so two WPT tests pass now.

• css/parser/CSSSelectorParser.cpp:

(WebCore::atEndIgnoringWhitespace):
(WebCore::CSSSelectorParser::consumeCompoundSelector):
(WebCore::CSSSelectorParser::consumePseudo):
(WebCore::CSSSelectorParser::defaultNamespace const):

• css/parser/CSSSelectorParser.h:

LayoutTests:

• TestExpectations: Two WPT tests pass now.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/parser/CSSSelectorParser.cpp (modified) (7 diffs)
• Source/WebCore/css/parser/CSSSelectorParser.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-12-17  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [selectors] Default namespace gets ignored inside non-type selectors for :is() and :not()
+        https://bugs.webkit.org/show_bug.cgi?id=219950
+
+        Reviewed by Antti Koivisto.
+
+        * TestExpectations: Two WPT tests pass now.
+
 2020-12-17  Truitt Savell  <tsavell@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1234 +1234 @@
 webkit.org/b/185859 imported/w3c/web-platform-tests/css/selectors/focus-visible-002.html [ Skip ]
 webkit.org/b/185859 imported/w3c/web-platform-tests/css/selectors/focus-visible-012.html [ Skip ]
-webkit.org/b/219950 imported/w3c/web-platform-tests/css/selectors/is-default-ns-002.html [ ImageOnlyFailure ]
 webkit.org/b/217904 imported/w3c/web-platform-tests/css/selectors/is-where-visited.html [ ImageOnlyFailure ]
-webkit.org/b/219950 imported/w3c/web-platform-tests/css/selectors/not-default-ns-002.html [ ImageOnlyFailure ]
 webkit.org/b/64861 imported/w3c/web-platform-tests/css/selectors/selectors-dir-selector-change-001.html [ ImageOnlyFailure ]
 webkit.org/b/64861 imported/w3c/web-platform-tests/css/selectors/selectors-dir-selector-change-002.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-17  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [selectors] Default namespace gets ignored inside non-type selectors for :is() and :not()
+        https://bugs.webkit.org/show_bug.cgi?id=219950
+
+        Reviewed by Antti Koivisto.
+
+        Based on Blink r820500 and r820557 by <andruud@chromium.org>.
+
+        Default namespace declarations do not affect the compound selector
+        representing the subject of any selector within a :is() or :not() pseudo-class,
+        unless that compound selector contains an explicit universal selector or type selector.
+        Spec: https://drafts.csswg.org/selectors-4/#matches
+
+        This patch aligns WebKit implementation with Chromium and Firefox, so two WPT tests pass now.
+
+        * css/parser/CSSSelectorParser.cpp:
+        (WebCore::atEndIgnoringWhitespace):
+        (WebCore::CSSSelectorParser::consumeCompoundSelector):
+        (WebCore::CSSSelectorParser::consumePseudo):
+        (WebCore::CSSSelectorParser::defaultNamespace const):
+        * css/parser/CSSSelectorParser.h:
+
 2020-12-17  Eric Carlson  <eric.carlson@apple.com>
 

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

@@ -33 +33 @@
 #include <memory>
 #include <wtf/OptionSet.h>
+#include <wtf/SetForScope.h>
 #include <wtf/text/StringBuilder.h>
 
@@ -325 +326 @@
 }
 
+static bool atEndIgnoringWhitespace(CSSParserTokenRange range)
+{
+    range.consumeWhitespace();
+    return range.atEnd();
+}
+
 std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumeCompoundSelector(CSSParserTokenRange& range)
 {
@@ -332 +339 @@
     AtomString elementName;
     CSSSelector::PseudoElementType compoundPseudoElement = CSSSelector::PseudoElementUnknown;
-    if (!consumeName(range, elementName, namespacePrefix)) {
+    const bool hasName = consumeName(range, elementName, namespacePrefix);
+    if (!hasName) {
         compoundSelector = consumeSimpleSelector(range);
         if (!compoundSelector)
@@ -357 +365 @@
     }
 
+
+    // While inside a nested selector like :is(), the default namespace shall be ignored when [1]:
+    // * The compound selector represents the subject [2], and
+    // * The compound selector does not contain a type/universal selector.
+    //
+    // [1] https://drafts.csswg.org/selectors/#matches
+    // [2] https://drafts.csswg.org/selectors/#selector-subject
+    SetForScope<bool> ignoreDefaultNamespace(m_ignoreDefaultNamespace, m_resistDefaultNamespace && !hasName && atEndIgnoringWhitespace(range));
     if (!compoundSelector) {
         AtomString namespaceURI = determineNamespace(namespacePrefix);
@@ -599 +615 @@
         switch (selector->pseudoClassType()) {
         case CSSSelector::PseudoClassNot: {
+            SetForScope<bool> resistDefaultNamespace(m_resistDefaultNamespace, true);
             DisallowPseudoElementsScope scope(*this);
             auto selectorList = makeUnique<CSSSelectorList>();
@@ -647 +664 @@
         case CSSSelector::PseudoClassMatches:
         case CSSSelector::PseudoClassWhere: {
+            SetForScope<bool> resistDefaultNamespace(m_resistDefaultNamespace, true);
             DisallowPseudoElementsScope scope(*this);
             auto selectorList = makeUnique<CSSSelectorList>();
@@ -898 +916 @@
 const AtomString& CSSSelectorParser::defaultNamespace() const
 {
-    if (!m_styleSheet)
+    if (!m_styleSheet || m_ignoreDefaultNamespace)
         return starAtom();
     return m_styleSheet->defaultNamespace();

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

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