Changeset 292635 in webkit

Timestamp:

Apr 8, 2022 2:35:00 PM (3 months ago)

Author:

Antti Koivisto

Message:

[CSS Container Queries] Search query containers for ::slotted and and ::part rules in their scope
​https://bugs.webkit.org/show_bug.cgi?id=238997

Reviewed by Sam Weinig.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom-expected.txt:

Source/WebCore:

"For selectors with pseudo elements, query containers can be established by the shadow-including inclusive ancestors of
the ultimate originating element."

​https://drafts.csswg.org/css-contain-3/#container-queries

• style/ContainerQueryEvaluator.cpp:

(WebCore::Style::ContainerQueryEvaluator::ContainerQueryEvaluator):
(WebCore::Style::ContainerQueryEvaluator::selectContainer const):
(WebCore::Style::ContainerQueryEvaluator::selectContainer):

For rules coming from a non-local scope, search query container starting from the originating element in that scope.

• style/ContainerQueryEvaluator.h:
• style/ElementRuleCollector.cpp:

(WebCore::Style::ElementRuleCollector::collectMatchingRulesForList):
(WebCore::Style::ElementRuleCollector::containerQueriesMatch):

Pass rule's style scope ordinal so we can find the right scope.

• style/ElementRuleCollector.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/ContainerQueryEvaluator.cpp (modified) (5 diffs)
• Source/WebCore/style/ContainerQueryEvaluator.h (modified) (3 diffs)
• Source/WebCore/style/ElementRuleCollector.cpp (modified) (2 diffs)
• Source/WebCore/style/ElementRuleCollector.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-04-08  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Search query containers for ::slotted and and ::part rules in their scope
+        https://bugs.webkit.org/show_bug.cgi?id=238997
+
+        Reviewed by Sam Weinig.
+
+        * web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom-expected.txt:
+
 2022-04-08  Alan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom-expected.txt

@@ -2 +2 @@
 PASS Match container in outer tree
 PASS Match container in same tree, not walking flat tree ancestors
-FAIL Match container in ::slotted selector's originating element tree assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
+PASS Match container in ::slotted selector's originating element tree
 PASS Match container in outer tree for :host
-FAIL Match container in ::part selector's originating element tree assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
-FAIL Match container for ::before in ::slotted selector's originating element tree assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
+PASS Match container in ::part selector's originating element tree
+PASS Match container for ::before in ::slotted selector's originating element tree
 PASS Match container in outer tree for :host::before
-FAIL Match container for ::before in ::part selector's originating element tree assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
-FAIL Match container for ::part selector's originating element tree for exportparts assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
+PASS Match container for ::before in ::part selector's originating element tree
+PASS Match container for ::part selector's originating element tree for exportparts
 PASS Match container for slot light tree child fallback
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-08  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Search query containers for ::slotted and and ::part rules in their scope
+        https://bugs.webkit.org/show_bug.cgi?id=238997
+
+        Reviewed by Sam Weinig.
+
+        "For selectors with pseudo elements, query containers can be established by the shadow-including inclusive ancestors of
+        the ultimate originating element."
+
+        https://drafts.csswg.org/css-contain-3/#container-queries
+
+        * style/ContainerQueryEvaluator.cpp:
+        (WebCore::Style::ContainerQueryEvaluator::ContainerQueryEvaluator):
+        (WebCore::Style::ContainerQueryEvaluator::selectContainer const):
+        (WebCore::Style::ContainerQueryEvaluator::selectContainer):
+
+        For rules coming from a non-local scope, search query container starting from the originating element in that scope.
+
+        * style/ContainerQueryEvaluator.h:
+        * style/ElementRuleCollector.cpp:
+        (WebCore::Style::ElementRuleCollector::collectMatchingRulesForList):
+        (WebCore::Style::ElementRuleCollector::containerQueriesMatch):
+
+        Pass rule's style scope ordinal so we can find the right scope.
+
+        * style/ElementRuleCollector.h:
+
 2022-04-08  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/style/ContainerQueryEvaluator.cpp

@@ -36 +36 @@
 #include "RenderView.h"
 #include "StyleRule.h"
+#include "StyleScope.h"
 
 namespace WebCore::Style {
@@ -44 +45 @@
 };
 
-ContainerQueryEvaluator::ContainerQueryEvaluator(const Element& element, PseudoId pseudoId, SelectorMatchingState* selectorMatchingState)
+ContainerQueryEvaluator::ContainerQueryEvaluator(const Element& element, PseudoId pseudoId, ScopeOrdinal scopeOrdinal, SelectorMatchingState* selectorMatchingState)
     : m_element(element)
     , m_pseudoId(pseudoId)
+    , m_scopeOrdinal(scopeOrdinal)
     , m_selectorMatchingState(selectorMatchingState)
 {
@@ -81 +83 @@
     auto* cachedQueryContainers = m_selectorMatchingState ? &m_selectorMatchingState->queryContainers : nullptr;
 
-    auto* container = selectContainer(filteredContainerQuery.axisFilter, filteredContainerQuery.nameFilter, m_element.get(), cachedQueryContainers, m_pseudoId);
+    auto* container = selectContainer(filteredContainerQuery.axisFilter, filteredContainerQuery.nameFilter, m_element.get(), cachedQueryContainers, m_pseudoId, m_scopeOrdinal);
     if (!container)
         return { };
@@ -88 +90 @@
 }
 
-const Element* ContainerQueryEvaluator::selectContainer(OptionSet<CQ::Axis> axes, const String& name, const Element& element, const CachedQueryContainers* cachedQueryContainers, PseudoId pseudoId)
+const Element* ContainerQueryEvaluator::selectContainer(OptionSet<CQ::Axis> axes, const String& name, const Element& element, const CachedQueryContainers* cachedQueryContainers, PseudoId pseudoId, ScopeOrdinal scopeOrdinal)
 {
     // "For each element, the query container to be queried is selected from among the element’s
@@ -124 +126 @@
     };
 
+    auto findOriginatingElement = [&]() -> const Element* {
+        // ::part() selectors can query its originating host, but not internal query containers inside the shadow tree.
+        if (scopeOrdinal <= ScopeOrdinal::ContainingHost)
+            return hostForScopeOrdinal(element, scopeOrdinal);
+        // ::slotted() selectors can query containers inside the shadow tree, including the slot itself.
+        if (scopeOrdinal >= ScopeOrdinal::FirstSlot && scopeOrdinal <= ScopeOrdinal::SlotLimit)
+            return assignedSlotForScopeOrdinal(element, scopeOrdinal);
+        return nullptr;
+    };
+
+    if (auto* originatingElement = findOriginatingElement()) {
+        // For selectors with pseudo elements, query containers can be established by the shadow-including inclusive ancestors of the ultimate originating element.
+        for (auto* ancestor = originatingElement; ancestor; ancestor = ancestor->parentOrShadowHostElement()) {
+            if (isContainerForQuery(*ancestor))
+                return ancestor;
+        }
+        return nullptr;
+    }
+
     if (cachedQueryContainers) {
         for (auto& container : makeReversedRange(*cachedQueryContainers)) {

trunk/Source/WebCore/style/ContainerQueryEvaluator.h

@@ -27 +27 @@
 #include "ContainerQuery.h"
 #include "SelectorMatchingState.h"
+#include "StyleScopeOrdinal.h"
 #include <wtf/Ref.h>
 
@@ -39 +40 @@
 class ContainerQueryEvaluator {
 public:
-    ContainerQueryEvaluator(const Element&, PseudoId, SelectorMatchingState*);
+    ContainerQueryEvaluator(const Element&, PseudoId, ScopeOrdinal, SelectorMatchingState*);
 
     bool evaluate(const FilteredContainerQuery&) const;
 
-    static const Element* selectContainer(OptionSet<CQ::Axis>, const String& name, const Element&, const CachedQueryContainers*, PseudoId = PseudoId::None);
+    static const Element* selectContainer(OptionSet<CQ::Axis>, const String& name, const Element&, const CachedQueryContainers*, PseudoId = PseudoId::None, ScopeOrdinal = ScopeOrdinal::Element);
 
 private:
@@ -55 +56 @@
     const Ref<const Element> m_element;
     const PseudoId m_pseudoId;
+    ScopeOrdinal m_scopeOrdinal;
     SelectorMatchingState* m_selectorMatchingState;
 };

trunk/Source/WebCore/style/ElementRuleCollector.cpp

@@ -488 +488 @@
             continue;
 
-        if (matchRequest.ruleSet.hasContainerQueries() && !containerQueriesMatch(matchRequest.ruleSet.containerQueriesFor(ruleData)))
+        if (matchRequest.ruleSet.hasContainerQueries() && !containerQueriesMatch(ruleData, matchRequest))
             continue;
 
@@ -506 +506 @@
 }
 
-bool ElementRuleCollector::containerQueriesMatch(const Vector<const FilteredContainerQuery*>& queries)
-{
+bool ElementRuleCollector::containerQueriesMatch(const RuleData& ruleData, const MatchRequest& matchRequest)
+{
+    auto queries = matchRequest.ruleSet.containerQueriesFor(ruleData);
+
     if (queries.isEmpty())
         return true;
 
     // "Style rules defined on an element inside multiple nested container queries apply when all of the wrapping container queries are true for that element."
-    ContainerQueryEvaluator evaluator(element(), m_pseudoElementRequest.pseudoId, m_selectorMatchingState);
+    ContainerQueryEvaluator evaluator(element(), m_pseudoElementRequest.pseudoId, matchRequest.styleScopeOrdinal, m_selectorMatchingState);
     for (auto* query : queries) {
         if (!evaluator.evaluate(*query))

trunk/Source/WebCore/style/ElementRuleCollector.h

@@ -115 +115 @@
     void collectMatchingRulesForList(const RuleSet::RuleDataVector*, const MatchRequest&);
     bool ruleMatches(const RuleData&, unsigned& specificity, ScopeOrdinal);
-    bool containerQueriesMatch(const Vector<const FilteredContainerQuery*>&);
+    bool containerQueriesMatch(const RuleData&, const MatchRequest&);
 
     void sortMatchedRules();