Changeset 290257 in webkit

Timestamp:

Feb 21, 2022 11:48:07 AM (5 months ago)

Author:

Antti Koivisto

Message:

[CSS Container Queries] Support nested container queries
​https://bugs.webkit.org/show_bug.cgi?id=236963

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-contain/container-queries/container-nested-expected.txt: Added.
• web-platform-tests/css/css-contain/container-queries/container-nested.html: Added.

Source/WebCore:

"Style rules defined on an element inside multiple nested container queries apply when all of the wrapping container queries are true for that element."

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

Test: imported/w3c/web-platform-tests/css/css-contain/container-queries/container-nested.html

• style/ElementRuleCollector.cpp:

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

All nested queries need to match.

(WebCore::Style::ElementRuleCollector::containerQueryMatches): Deleted.

• style/ElementRuleCollector.h:
• style/RuleSet.h:

(WebCore::Style::RuleSet::hasContainerQueries const):
(WebCore::Style:: const):
(WebCore::Style::RuleSet::containerQueryFor const): Deleted.

Return all nested queries.
Don't unnecessarily copy FilteredContainerQuery, refer to the StyleRuleContainer instead.

• style/RuleSetBuilder.cpp:

(WebCore::Style::RuleSetBuilder::addChildRules):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-nested-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-nested.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/ElementRuleCollector.cpp (modified) (2 diffs)
• Source/WebCore/style/ElementRuleCollector.h (modified) (1 diff)
• Source/WebCore/style/RuleSet.h (modified) (3 diffs)
• Source/WebCore/style/RuleSetBuilder.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-21  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Support nested container queries
+        https://bugs.webkit.org/show_bug.cgi?id=236963
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-contain/container-queries/container-nested-expected.txt: Added.
+        * web-platform-tests/css/css-contain/container-queries/container-nested.html: Added.
+
 2022-02-21  Noam Rosenthal  <noam@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-21  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Support nested container queries
+        https://bugs.webkit.org/show_bug.cgi?id=236963
+
+        Reviewed by Simon Fraser.
+
+        "Style rules defined on an element inside multiple nested container queries apply when all of the wrapping container queries are true for that element."
+
+        https://drafts.csswg.org/css-contain-3/#container-rule
+
+        Test: imported/w3c/web-platform-tests/css/css-contain/container-queries/container-nested.html
+
+        * style/ElementRuleCollector.cpp:
+        (WebCore::Style::ElementRuleCollector::collectMatchingRulesForList):
+        (WebCore::Style::ElementRuleCollector::containerQueriesMatch):
+
+        All nested queries need to match.
+
+        (WebCore::Style::ElementRuleCollector::containerQueryMatches): Deleted.
+        * style/ElementRuleCollector.h:
+        * style/RuleSet.h:
+        (WebCore::Style::RuleSet::hasContainerQueries const):
+        (WebCore::Style:: const):
+        (WebCore::Style::RuleSet::containerQueryFor const): Deleted.
+
+        Return all nested queries.
+        Don't unnecessarily copy FilteredContainerQuery, refer to the StyleRuleContainer instead.
+
+        * style/RuleSetBuilder.cpp:
+        (WebCore::Style::RuleSetBuilder::addChildRules):
+
 2022-02-21  Nikolas Zimmermann  <nzimmermann@igalia.com>
 

trunk/Source/WebCore/style/ElementRuleCollector.cpp

@@ -486 +486 @@
             continue;
 
-        if (auto* containerQuery = matchRequest.ruleSet.containerQueryFor(ruleData)) {
-            if (!containerQueryMatches(*containerQuery))
-                continue;
-        }
+        if (matchRequest.ruleSet.hasContainerQueries() && !containerQueriesMatch(matchRequest.ruleSet.containerQueriesFor(ruleData)))
+            continue;
 
         auto& rule = ruleData.styleRule();
@@ -506 +504 @@
 }
 
-bool ElementRuleCollector::containerQueryMatches(const FilteredContainerQuery& query)
-{
-    ContainerQueryEvaluator evaluator(element(), m_pseudoElementRequest.pseudoId , m_selectorMatchingState);
-    return evaluator.evaluate(query);
+bool ElementRuleCollector::containerQueriesMatch(const Vector<const FilteredContainerQuery*>& queries)
+{
+    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);
+    for (auto* query : queries) {
+        if (!evaluator.evaluate(*query))
+            return false;
+    }
+    return true;
 }
 

trunk/Source/WebCore/style/ElementRuleCollector.h

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

trunk/Source/WebCore/style/RuleSet.h

@@ -109 +109 @@
 
     CascadeLayerPriority cascadeLayerPriorityFor(const RuleData&) const;
-    const FilteredContainerQuery* containerQueryFor(const RuleData&) const;
+
+    bool hasContainerQueries() const { return !m_containerQueries.isEmpty(); }
+    Vector<const FilteredContainerQuery*> containerQueriesFor(const RuleData&) const;
 
 private:
@@ -145 +147 @@
 
     struct ContainerQueryAndParent {
-        FilteredContainerQuery query;
+        Ref<StyleRuleContainer> containerRule;
         ContainerQueryIdentifier parent;
     };
@@ -222 +224 @@
 }
 
-inline const FilteredContainerQuery* RuleSet::containerQueryFor(const RuleData& ruleData) const
+inline Vector<const FilteredContainerQuery*> RuleSet::containerQueriesFor(const RuleData& ruleData) const
 {
     if (m_containerQueryIdentifierForRulePosition.size() <= ruleData.position())
-        return nullptr;
+        return { };
+
+    Vector<const FilteredContainerQuery*> queries;
 
     auto identifier = m_containerQueryIdentifierForRulePosition[ruleData.position()];
-    if (!identifier)
-        return nullptr;
-
-    return &m_containerQueries[identifier - 1].query;
+    while (identifier) {
+        auto& query = m_containerQueries[identifier - 1];
+        queries.append(&query.containerRule->filteredQuery());
+        identifier = query.parent;
+    };
+
+    return queries;
 }
 

trunk/Source/WebCore/style/RuleSetBuilder.cpp

@@ -114 +114 @@
             auto previousContainerQueryIdentifier = m_currentContainerQueryIdentifier;
             if (m_ruleSet) {
-                m_ruleSet->m_containerQueries.append({ containerRule.filteredQuery(), previousContainerQueryIdentifier });
+                m_ruleSet->m_containerQueries.append({ containerRule, previousContainerQueryIdentifier });
                 m_currentContainerQueryIdentifier = m_ruleSet->m_containerQueries.size();
             }