Changeset 286972 in webkit

Timestamp:

Dec 13, 2021 12:38:56 PM (7 months ago)

Author:

Antti Koivisto

Message:

[CSS Cascade Layers] Layers specified in import rules can not be reordered on media query evaluation
​https://bugs.webkit.org/show_bug.cgi?id=234158

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-cascade/layer-media-query-expected.txt:

Source/WebCore:

• style/RuleSetBuilder.cpp:

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

@import rules can introduce new layers so need to alse be considered for reordering by media queries
(which requires static evaluation).

(WebCore::Style::RuleSetBuilder::disallowDynamicMediaQueryEvaluationIfNeeded):

Factor into a function.

• style/RuleSetBuilder.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/layer-media-query-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/RuleSetBuilder.cpp (modified) (4 diffs)
• Source/WebCore/style/RuleSetBuilder.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-12-13  Antti Koivisto  <antti@apple.com>
+
+        [CSS Cascade Layers] Layers specified in import rules can not be reordered on media query evaluation
+        https://bugs.webkit.org/show_bug.cgi?id=234158
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-cascade/layer-media-query-expected.txt:
+
 2021-12-13  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/layer-media-query-expected.txt

@@ -8 +8 @@
 PASS C2 Reordering
 PASS C3 Reordering
-FAIL C4 Reordering assert_equals: C4 Reordering expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
+PASS C4 Reordering
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-13  Antti Koivisto  <antti@apple.com>
+
+        [CSS Cascade Layers] Layers specified in import rules can not be reordered on media query evaluation
+        https://bugs.webkit.org/show_bug.cgi?id=234158
+
+        Reviewed by Simon Fraser.
+
+        * style/RuleSetBuilder.cpp:
+        (WebCore::Style::RuleSetBuilder::addChildRules):
+        (WebCore::Style::RuleSetBuilder::addRulesFromSheetContents):
+
+        @import rules can introduce new layers so need to alse be considered for reordering by media queries
+        (which requires static evaluation).
+
+        (WebCore::Style::RuleSetBuilder::disallowDynamicMediaQueryEvaluationIfNeeded):
+
+        Factor into a function.
+
+        * style/RuleSetBuilder.h:
+
 2021-12-13  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/style/RuleSetBuilder.cpp

@@ -111 +111 @@
         }
         if (is<StyleRuleLayer>(*rule)) {
-            if (!m_ruleSet && !m_mediaQueryCollector.dynamicContextStack.isEmpty())
-                requiresStaticMediaQueryEvaluation = true;
+            disallowDynamicMediaQueryEvaluationIfNeeded();
 
             auto& layerRule = downcast<StyleRuleLayer>(*rule);
@@ -127 +126 @@
         }
         if (is<StyleRuleFontFace>(*rule) || is<StyleRuleFontPaletteValues>(*rule) || is<StyleRuleKeyframes>(*rule)) {
-            if (!m_ruleSet && !m_mediaQueryCollector.dynamicContextStack.isEmpty())
-                requiresStaticMediaQueryEvaluation = true;
+            disallowDynamicMediaQueryEvaluationIfNeeded();
 
             if (m_resolver)
@@ -152 +150 @@
         if (m_mediaQueryCollector.pushAndEvaluate(rule->mediaQueries())) {
             auto& cascadeLayerName = rule->cascadeLayerName();
-            if (cascadeLayerName)
+            if (cascadeLayerName) {
+                disallowDynamicMediaQueryEvaluationIfNeeded();
                 pushCascadeLayer(*cascadeLayerName);
+            }
 
             addRulesFromSheetContents(*rule->styleSheet());
@@ -180 +180 @@
         ++selectorListIndex;
     }
+}
+
+void RuleSetBuilder::disallowDynamicMediaQueryEvaluationIfNeeded()
+{
+    bool isScanningForDynamicEvaluation = !m_ruleSet;
+    if (isScanningForDynamicEvaluation && !m_mediaQueryCollector.dynamicContextStack.isEmpty())
+        requiresStaticMediaQueryEvaluation = true;
 }
 

trunk/Source/WebCore/style/RuleSetBuilder.h

@@ -41 +41 @@
     void addChildRules(const Vector<RefPtr<StyleRuleBase>>&);
     void addStyleRule(const StyleRule&);
+    void disallowDynamicMediaQueryEvaluationIfNeeded();
 
     void registerLayers(const Vector<CascadeLayerName>&);