Changeset 285100 in webkit

Timestamp:

Oct 31, 2021 11:20:41 PM (9 months ago)

Author:

Antti Koivisto

Message:

Fix :host invalidation when combined with pseudo classes in descendant position
​https://bugs.webkit.org/show_bug.cgi?id=232544

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-scoping/host-functional-descendant-invalidation-expected.txt:

Source/WebCore:

• style/RuleSet.cpp:

(WebCore::Style::isHostSelectorMatchingInShadowTree):

Make more readable and accurate.

(WebCore::Style::RuleSet::addRule):

Compute m_hasHostPseudoClassRulesMatchingInShadowTree before bailing out for pseudo elements.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-scoping/host-functional-descendant-invalidation-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/RuleSet.cpp (modified) (3 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-10-31  Antti Koivisto  <antti@apple.com>
+
+        Fix :host invalidation when combined with pseudo classes in descendant position
+        https://bugs.webkit.org/show_bug.cgi?id=232544
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-scoping/host-functional-descendant-invalidation-expected.txt:
+
 2021-10-30  Brandon Stewart  <brandonstewart@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scoping/host-functional-descendant-invalidation-expected.txt

@@ -1 +1 @@
 
-FAIL CSS Test: element style is correctly updated for rule with :host(..) assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
+PASS CSS Test: element style is correctly updated for rule with :host(..)
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-31  Antti Koivisto  <antti@apple.com>
+
+        Fix :host invalidation when combined with pseudo classes in descendant position
+        https://bugs.webkit.org/show_bug.cgi?id=232544
+
+        Reviewed by Simon Fraser.
+
+        * style/RuleSet.cpp:
+        (WebCore::Style::isHostSelectorMatchingInShadowTree):
+
+        Make more readable and accurate.
+
+        (WebCore::Style::RuleSet::addRule):
+
+        Compute m_hasHostPseudoClassRulesMatchingInShadowTree before bailing out for pseudo elements.
+
 2021-10-31  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/style/RuleSet.cpp

@@ -72 +72 @@
 static bool isHostSelectorMatchingInShadowTree(const CSSSelector& startSelector)
 {
-    auto* leftmostSelector = &startSelector;
-    bool hasDescendantOrChildRelation = false;
-    while (auto* previous = leftmostSelector->tagHistory()) {
-        hasDescendantOrChildRelation = leftmostSelector->hasDescendantOrChildRelation();
-        leftmostSelector = previous;
-    }
-    if (!hasDescendantOrChildRelation)
-        return false;
-
-    return leftmostSelector->match() == CSSSelector::PseudoClass && leftmostSelector->pseudoClassType() == CSSSelector::PseudoClassHost;
+    bool hasOnlyOneCompound = true;
+    bool hasHostInLastCompound = false;
+    for (auto* selector = &startSelector; selector; selector = selector->tagHistory()) {
+        if (selector->match() == CSSSelector::PseudoClass && selector->pseudoClassType() == CSSSelector::PseudoClassHost)
+            hasHostInLastCompound = true;
+        if (selector->tagHistory() && selector->relation() != CSSSelector::Subselector) {
+            hasOnlyOneCompound = false;
+            hasHostInLastCompound = false;
+        }
+    }
+    return !hasOnlyOneCompound && hasHostInLastCompound;
 }
 
@@ -198 +199 @@
     } while (selector);
 
+    if (!m_hasHostPseudoClassRulesMatchingInShadowTree)
+        m_hasHostPseudoClassRulesMatchingInShadowTree = isHostSelectorMatchingInShadowTree(*ruleData.selector());
+
 #if ENABLE(VIDEO)
     if (cuePseudoElementSelector) {
@@ -233 +237 @@
         return;
     }
-
-    if (!m_hasHostPseudoClassRulesMatchingInShadowTree)
-        m_hasHostPseudoClassRulesMatchingInShadowTree = isHostSelectorMatchingInShadowTree(*ruleData.selector());
 
     if (hostPseudoClassSelector) {