Changeset 208390 in webkit

Timestamp:

Nov 4, 2016 11:32:45 AM (8 years ago)

Author:

Antti Koivisto

Message:

slotted() pseudo does not work with ID selector
​https://bugs.webkit.org/show_bug.cgi?id=160538
<rdar://problem/28534529>

Reviewed by Andreas Kling.

Source/WebCore:

When we saw an id selector while addin rules we immediately threw it into the m_idRules
optimization bucket and bailed out. However selectors containing ::slotted must always end
up in m_slottedPseudoElementRules list no matter what else is there.

Fix by treating id like other selectors and only choosing the bucket after analysing all
the selector components.

Test: fast/shadow-dom/css-scoping-slot-with-id.html

• css/RuleSet.cpp:

(WebCore::RuleSet::addRule): Also made this use switch instead of a series of ifs.

LayoutTests:

• fast/shadow-dom/css-scoping-slot-with-id-expected.html: Added.
• fast/shadow-dom/css-scoping-slot-with-id.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/css-scoping-slot-with-id-expected.html (added)
• LayoutTests/fast/shadow-dom/css-scoping-slot-with-id.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/RuleSet.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-11-04  Antti Koivisto  <antti@apple.com>
+
+        slotted() pseudo does not work with ID selector
+        https://bugs.webkit.org/show_bug.cgi?id=160538
+        <rdar://problem/28534529>
+
+        Reviewed by Andreas Kling.
+
+        * fast/shadow-dom/css-scoping-slot-with-id-expected.html: Added.
+        * fast/shadow-dom/css-scoping-slot-with-id.html: Added.
+
 2016-11-04  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-04  Antti Koivisto  <antti@apple.com>
+
+        slotted() pseudo does not work with ID selector
+        https://bugs.webkit.org/show_bug.cgi?id=160538
+        <rdar://problem/28534529>
+
+        Reviewed by Andreas Kling.
+
+        When we saw an id selector while addin rules we immediately threw it into the m_idRules
+        optimization bucket and bailed out. However selectors containing ::slotted must always end
+        up in m_slottedPseudoElementRules list no matter what else is there.
+
+        Fix by treating id like other selectors and only choosing the bucket after analysing all
+        the selector components.
+
+        Test: fast/shadow-dom/css-scoping-slot-with-id.html
+
+        * css/RuleSet.cpp:
+        (WebCore::RuleSet::addRule): Also made this use switch instead of a series of ifs.
+
 2016-11-04  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/css/RuleSet.cpp

@@ -201 +201 @@
 
     unsigned classBucketSize = 0;
+    const CSSSelector* idSelector = nullptr;
     const CSSSelector* tagSelector = nullptr;
     const CSSSelector* classSelector = nullptr;
     const CSSSelector* linkSelector = nullptr;
     const CSSSelector* focusSelector = nullptr;
+    const CSSSelector* customPseudoElementSelector = nullptr;
+    const CSSSelector* slottedPseudoElementSelector = nullptr;
+    const CSSSelector* cuePseudoElementSelector = nullptr;
     const CSSSelector* selector = ruleData.selector();
     do {
-        if (selector->match() == CSSSelector::Id) {
-            addToRuleSet(selector->value().impl(), m_idRules, ruleData);
-            return;
-        }
-
-#if ENABLE(VIDEO_TRACK)
-        if (selector->match() == CSSSelector::PseudoElement && selector->pseudoElementType() == CSSSelector::PseudoElementCue) {
-            m_cuePseudoRules.append(ruleData);
-            return;
-        }
-#endif
-
-        if (selector->isCustomPseudoElement()) {
-            // FIXME: Custom pseudo elements are handled by the shadow tree's selector filter. It doesn't know about the main DOM.
-            ruleData.disableSelectorFiltering();
-            addToRuleSet(selector->value().impl(), m_shadowPseudoElementRules, ruleData);
-            return;
-        }
-
-        if (selector->match() == CSSSelector::Class) {
-            AtomicStringImpl* className = selector->value().impl();
+        switch (selector->match()) {
+        case CSSSelector::Id:
+            idSelector = selector;
+            break;
+        case CSSSelector::Class: {
+            auto* className = selector->value().impl();
             if (!classSelector) {
                 classSelector = selector;
@@ -238 +227 @@
                 }
             }
-        }
-
-        if (selector->match() == CSSSelector::Tag && selector->tagQName().localName() != starAtom)
-            tagSelector = selector;
-
-        if (SelectorChecker::isCommonPseudoClassSelector(selector)) {
+            break;
+        }
+        case CSSSelector::Tag:
+            if (selector->tagQName().localName() != starAtom)
+                tagSelector = selector;
+            break;
+        case CSSSelector::PseudoElement:
+            switch (selector->pseudoElementType()) {
+            case CSSSelector::PseudoElementUserAgentCustom:
+            case CSSSelector::PseudoElementWebKitCustom:
+            case CSSSelector::PseudoElementWebKitCustomLegacyPrefixed:
+                customPseudoElementSelector = selector;
+                break;
+            case CSSSelector::PseudoElementSlotted:
+                slottedPseudoElementSelector = selector;
+                break;
+#if ENABLE(VIDEO_TRACK)
+            case CSSSelector::PseudoElementCue:
+                cuePseudoElementSelector = selector;
+                break;
+#endif
+            default:
+                break;
+            }
+            break;
+        case CSSSelector::PseudoClass:
             switch (selector->pseudoClassType()) {
             case CSSSelector::PseudoClassLink:
@@ -254 +263 @@
                 focusSelector = selector;
                 break;
+            case CSSSelector::PseudoClassHost:
+                m_hostPseudoClassRules.append(ruleData);
+                return;
             default:
-                ASSERT_NOT_REACHED();
+                break;
             }
-        }
-
-        if (selector->match() == CSSSelector::PseudoClass && selector->pseudoClassType() == CSSSelector::PseudoClassHost) {
-            m_hostPseudoClassRules.append(ruleData);
-            return;
-        }
-        if (selector->match() == CSSSelector::PseudoElement && selector->pseudoElementType() == CSSSelector::PseudoElementSlotted) {
-            // ::slotted pseudo elements work accross shadow boundary making filtering difficult.
-            ruleData.disableSelectorFiltering();
-            m_slottedPseudoElementRules.append(ruleData);
-            return;
+            break;
+        case CSSSelector::Unknown:
+        case CSSSelector::Exact:
+        case CSSSelector::Set:
+        case CSSSelector::List:
+        case CSSSelector::Hyphen:
+        case CSSSelector::Contain:
+        case CSSSelector::Begin:
+        case CSSSelector::End:
+        case CSSSelector::PagePseudoClass:
+            break;
         }
         if (selector->relation() != CSSSelector::Subselector)
@@ -273 +285 @@
         selector = selector->tagHistory();
     } while (selector);
+
+    if (cuePseudoElementSelector) {
+        m_cuePseudoRules.append(ruleData);
+        return;
+    }
+
+    if (slottedPseudoElementSelector) {
+        // ::slotted pseudo elements work accross shadow boundary making filtering difficult.
+        ruleData.disableSelectorFiltering();
+        m_slottedPseudoElementRules.append(ruleData);
+        return;
+    }
+
+    if (customPseudoElementSelector) {
+        // FIXME: Custom pseudo elements are handled by the shadow tree's selector filter. It doesn't know about the main DOM.
+        ruleData.disableSelectorFiltering();
+        addToRuleSet(customPseudoElementSelector->value().impl(), m_shadowPseudoElementRules, ruleData);
+        return;
+    }
+
+    if (idSelector) {
+        addToRuleSet(idSelector->value().impl(), m_idRules, ruleData);
+        return;
+    }
 
     if (classSelector) {