Changeset 286135 in webkit

Timestamp:

Nov 23, 2021 7:47:54 AM (8 months ago)

Author:

Antti Koivisto

Message:

[:has() pseudo-class] Basic invalidation support
​https://bugs.webkit.org/show_bug.cgi?id=233443

Reviewed by Alan Bujtas.

LayoutTests/imported/w3c:

• web-platform-tests/css/selectors/invalidation/attribute-or-elemental-selectors-in-has-expected.txt:

Source/WebCore:

Adde RuleSet based invalidation for :has(). This covers class/attribute/pseudo-class cases.

There is also a basic optimization that limits the invalidation scope based on :has() selector
matching child/descedant/sibling.

• style/RuleFeature.cpp:

(WebCore::Style::isSiblingOrSubject):
(WebCore::Style::isHasPseudoClassMatchElement):
(WebCore::Style::RuleFeatureSet::computeNextMatchElement):
(WebCore::Style::RuleFeatureSet::computeSubSelectorMatchElement):

Add new MatchElement types for :has and compute the value. This enables automatic
creation of the required invalidation rule sets.

(WebCore::Style::RuleFeatureSet::recursivelyCollectFeaturesFromSelector):

• style/RuleFeature.h:
• style/StyleInvalidator.cpp:

(WebCore::Style::Invalidator::invalidateStyleWithMatchElement):

Traverse appropriate parent/ancestors/siblings to invalidate.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/attribute-or-elemental-selectors-in-has-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/RuleFeature.cpp (modified) (6 diffs)
• Source/WebCore/style/RuleFeature.h (modified) (2 diffs)
• Source/WebCore/style/StyleInvalidator.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-11-23  Antti Koivisto  <antti@apple.com>
+
+        [:has() pseudo-class] Basic invalidation support
+        https://bugs.webkit.org/show_bug.cgi?id=233443
+
+        Reviewed by Alan Bujtas.
+
+        * web-platform-tests/css/selectors/invalidation/attribute-or-elemental-selectors-in-has-expected.txt:
+
 2021-11-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/attribute-or-elemental-selectors-in-has-expected.txt

@@ -3 +3 @@
 PASS initial_color: div#div_child.color
 PASS initial_color: div#div_grandchild.color
-FAIL add .child to #div_child: div#div_subject.color assert_equals: expected "rgb(255, 0, 0)" but got "rgb(128, 128, 128)"
+PASS add .child to #div_child: div#div_subject.color
 PASS remove .child from #div_child: div#div_subject.color
 PASS add .child to #div_grandchild: div#div_subject.color
 PASS remove .child from #div_grandchild: div#div_subject.color
-FAIL add .descendant to #div_child: div#div_subject.color assert_equals: expected "rgb(0, 128, 0)" but got "rgb(128, 128, 128)"
+PASS add .descendant to #div_child: div#div_subject.color
 PASS remove .descendant from #div_child: div#div_subject.color
-FAIL add .descendant to #div_grandchild: div#div_subject.color assert_equals: expected "rgb(0, 128, 0)" but got "rgb(128, 128, 128)"
+PASS add .descendant to #div_grandchild: div#div_subject.color
 PASS remove .descendant from #div_grandchild: div#div_subject.color
-FAIL set descendant to #div_grandchild[attrname]: div#div_subject.color assert_equals: expected "rgb(0, 0, 255)" but got "rgb(128, 128, 128)"
+PASS set descendant to #div_grandchild[attrname]: div#div_subject.color
 PASS clear #div_grandchild[attrname]: div#div_subject.color
 FAIL change #div_grandchild to #div_descendant: div#div_subject.color assert_equals: expected "rgb(255, 255, 0)" but got "rgb(128, 128, 128)"

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-23  Antti Koivisto  <antti@apple.com>
+
+        [:has() pseudo-class] Basic invalidation support
+        https://bugs.webkit.org/show_bug.cgi?id=233443
+
+        Reviewed by Alan Bujtas.
+
+        Adde RuleSet based invalidation for :has(). This covers class/attribute/pseudo-class cases.
+
+        There is also a basic optimization that limits the invalidation scope based on :has() selector
+        matching child/descedant/sibling.
+
+        * style/RuleFeature.cpp:
+        (WebCore::Style::isSiblingOrSubject):
+        (WebCore::Style::isHasPseudoClassMatchElement):
+        (WebCore::Style::RuleFeatureSet::computeNextMatchElement):
+        (WebCore::Style::RuleFeatureSet::computeSubSelectorMatchElement):
+
+        Add new MatchElement types for :has and compute the value. This enables automatic
+        creation of the required invalidation rule sets.
+
+        (WebCore::Style::RuleFeatureSet::recursivelyCollectFeaturesFromSelector):
+        * style/RuleFeature.h:
+        * style/StyleInvalidator.cpp:
+        (WebCore::Style::Invalidator::invalidateStyleWithMatchElement):
+
+        Traverse appropriate parent/ancestors/siblings to invalidate.
+
 2021-11-23  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/style/RuleFeature.cpp

@@ -44 +44 @@
     case MatchElement::DirectSibling:
     case MatchElement::AnySibling:
+    case MatchElement::HasSibling:
     case MatchElement::Host:
         return true;
@@ -50 +51 @@
     case MatchElement::ParentSibling:
     case MatchElement::AncestorSibling:
+    case MatchElement::HasChild:
+    case MatchElement::HasDescendant:
         return false;
     }
     ASSERT_NOT_REACHED();
     return false;
+}
+
+static bool isHasPseudoClassMatchElement(MatchElement matchElement)
+{
+    switch (matchElement) {
+    case MatchElement::HasSibling:
+    case MatchElement::HasChild:
+    case MatchElement::HasDescendant:
+        return true;
+    default:
+        return false;
+    }
 }
 
@@ -68 +83 @@
 MatchElement RuleFeatureSet::computeNextMatchElement(MatchElement matchElement, CSSSelector::RelationType relation)
 {
+    if (isHasPseudoClassMatchElement(matchElement))
+        return matchElement;
+
     if (isSiblingOrSubject(matchElement)) {
         switch (relation) {
@@ -112 +130 @@
 };
 
-MatchElement RuleFeatureSet::computeSubSelectorMatchElement(MatchElement matchElement, const CSSSelector& selector)
-{
-    ASSERT(selector.selectorList());
-
+MatchElement RuleFeatureSet::computeSubSelectorMatchElement(MatchElement matchElement, const CSSSelector& selector, const CSSSelector& childSelector)
+{
     if (selector.match() == CSSSelector::PseudoClass) {
         auto type = selector.pseudoClassType();
@@ -125 +141 @@
         if (type == CSSSelector::PseudoClassHost)
             return MatchElement::Host;
+
+        if (type == CSSSelector::PseudoClassHas) {
+            auto hasMatchElement = MatchElement::Subject;
+            for (auto* simpleSelector = &childSelector; simpleSelector->tagHistory(); simpleSelector = simpleSelector->tagHistory())
+                hasMatchElement = computeNextMatchElement(hasMatchElement, simpleSelector->relation());
+
+            if (hasMatchElement == MatchElement::Parent)
+                return MatchElement::HasChild;
+            if (isSiblingOrSubject(hasMatchElement))
+                return MatchElement::HasSibling;
+            return MatchElement::HasDescendant;
+        }
     }
     if (selector.match() == CSSSelector::PseudoElement) {
@@ -169 +197 @@
 
         if (const CSSSelectorList* selectorList = selector->selectorList()) {
-            auto subSelectorMatchElement = computeSubSelectorMatchElement(matchElement, *selector);
-
             for (const CSSSelector* subSelector = selectorList->first(); subSelector; subSelector = CSSSelectorList::next(subSelector)) {
+                auto subSelectorMatchElement = computeSubSelectorMatchElement(matchElement, *selector, *subSelector);
                 if (!selectorFeatures.hasSiblingSelector && selector->isSiblingSelector())
                     selectorFeatures.hasSiblingSelector = true;

trunk/Source/WebCore/style/RuleFeature.h

@@ -37 +37 @@
 class RuleData;
 
-enum class MatchElement : uint8_t { Subject, Parent, Ancestor, DirectSibling, IndirectSibling, AnySibling, ParentSibling, AncestorSibling, Host };
+enum class MatchElement : uint8_t { Subject, Parent, Ancestor, DirectSibling, IndirectSibling, AnySibling, ParentSibling, AncestorSibling, HasChild, HasDescendant, HasSibling, Host };
 constexpr unsigned matchElementCount = static_cast<unsigned>(MatchElement::Host) + 1;
 
@@ -88 +88 @@
 private:
     static MatchElement computeNextMatchElement(MatchElement, CSSSelector::RelationType);
-    static MatchElement computeSubSelectorMatchElement(MatchElement, const CSSSelector&);
+    static MatchElement computeSubSelectorMatchElement(MatchElement, const CSSSelector&, const CSSSelector& childSelector);
 
     struct SelectorFeatures {

trunk/Source/WebCore/style/StyleInvalidator.cpp

@@ -305 +305 @@
         break;
     }
+    case MatchElement::HasChild: {
+        if (auto* parent = element.parentElement())
+            invalidateIfNeeded(*parent, nullptr);
+        break;
+    }
+    case MatchElement::HasDescendant: {
+        Vector<Element*, 16> ancestors;
+        for (auto* parent = element.parentElement(); parent; parent = parent->parentElement())
+            ancestors.append(parent);
+
+        SelectorMatchingState selectorMatchingState;
+        for (auto* ancestor : makeReversedRange(ancestors)) {
+            invalidateIfNeeded(*ancestor, &selectorMatchingState);
+            selectorMatchingState.selectorFilter.pushParent(ancestor);
+        }
+        break;
+    }
+    case MatchElement::HasSibling: {
+        SelectorMatchingState selectorMatchingState;
+        for (auto* sibling = element.previousElementSibling(); sibling; sibling = sibling->previousElementSibling()) {
+            selectorMatchingState.selectorFilter.popParentsUntil(element.parentElement());
+            invalidateStyleForDescendants(*sibling, &selectorMatchingState);
+        }
+        break;
+    }
     case MatchElement::Host:
         invalidateInShadowTreeIfNeeded(element);