Changeset 291594 in webkit

Timestamp:

Mar 21, 2022 6:35:47 PM (4 months ago)

Author:

Oriol Brufau

Message:

[css-cascade] Let revert-layer roll back to preshints
​https://bugs.webkit.org/show_bug.cgi?id=237532

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

Add test.

• web-platform-tests/css/css-cascade/presentational-hints-rollback-expected.txt: Added.
• web-platform-tests/css/css-cascade/presentational-hints-rollback.html: Added.

Source/WebCore:

The patch makes presentational hints use a cascade layer priority of 0.
The priority of the lowest layer is then increased to 1.
This allows 'revert-layer' in author origin revert to the presentational
hints origin, which is between user origin and author origin.

Test: imported/w3c/web-platform-tests/css/css-cascade/presentational-hints-rollback.html

• style/ElementRuleCollector.cpp:

(WebCore::Style::ElementRuleCollector::addElementStyleProperties):
(WebCore::Style::ElementRuleCollector::matchAllRules):
(WebCore::Style::ElementRuleCollector::addElementInlineStyleProperties):

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

(WebCore::Style::RuleSetBuilder::updateCascadeLayerPriorities):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/presentational-hints-rollback-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/presentational-hints-rollback.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/ElementRuleCollector.cpp (modified) (4 diffs)
• Source/WebCore/style/ElementRuleCollector.h (modified) (1 diff)
• Source/WebCore/style/RuleSet.h (modified) (1 diff)
• Source/WebCore/style/RuleSetBuilder.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-03-21  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-cascade] Let revert-layer roll back to preshints
+        https://bugs.webkit.org/show_bug.cgi?id=237532
+
+        Reviewed by Darin Adler.
+
+        Add test.
+
+        * web-platform-tests/css/css-cascade/presentational-hints-rollback-expected.txt: Added.
+        * web-platform-tests/css/css-cascade/presentational-hints-rollback.html: Added.
+
 2022-03-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-21  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-cascade] Let revert-layer roll back to preshints
+        https://bugs.webkit.org/show_bug.cgi?id=237532
+
+        Reviewed by Darin Adler.
+
+        The patch makes presentational hints use a cascade layer priority of 0.
+        The priority of the lowest layer is then increased to 1.
+        This allows 'revert-layer' in author origin revert to the presentational
+        hints origin, which is between user origin and author origin.
+
+        Test: imported/w3c/web-platform-tests/css/css-cascade/presentational-hints-rollback.html
+
+        * style/ElementRuleCollector.cpp:
+        (WebCore::Style::ElementRuleCollector::addElementStyleProperties):
+        (WebCore::Style::ElementRuleCollector::matchAllRules):
+        (WebCore::Style::ElementRuleCollector::addElementInlineStyleProperties):
+        * style/ElementRuleCollector.h:
+        * style/RuleSetBuilder.cpp:
+        (WebCore::Style::RuleSetBuilder::updateCascadeLayerPriorities):
+
 2022-03-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/style/ElementRuleCollector.cpp

@@ -127 +127 @@
 }
 
-inline void ElementRuleCollector::addElementStyleProperties(const StyleProperties* propertySet, bool isCacheable, FromStyleAttribute fromStyleAttribute)
+inline void ElementRuleCollector::addElementStyleProperties(const StyleProperties* propertySet, CascadeLayerPriority priority, bool isCacheable, FromStyleAttribute fromStyleAttribute)
 {
     if (!propertySet || propertySet->isEmpty())
@@ -136 +136 @@
 
     auto matchedProperty = MatchedProperties { propertySet };
+    matchedProperty.cascadeLayerPriority = priority;
     matchedProperty.fromStyleAttribute = fromStyleAttribute;
     addMatchedProperties(WTFMove(matchedProperty), DeclarationOrigin::Author);
@@ -550 +551 @@
         auto& styledElement = downcast<StyledElement>(element());
         // https://html.spec.whatwg.org/#presentational-hints
-        addElementStyleProperties(styledElement.presentationalHintStyle());
+        addElementStyleProperties(styledElement.presentationalHintStyle(), RuleSet::cascadeLayerPriorityForPresentationalHints);
 
         // Tables and table cells share an additional presentation style that must be applied
         // after all attributes, since their style depends on the values of multiple attributes.
-        addElementStyleProperties(styledElement.additionalPresentationalHintStyle());
+        addElementStyleProperties(styledElement.additionalPresentationalHintStyle(), RuleSet::cascadeLayerPriorityForPresentationalHints);
 
         if (is<HTMLElement>(styledElement)) {
@@ -589 +590 @@
         // FIXME: Media control shadow trees seem to have problems with caching.
         bool isInlineStyleCacheable = !inlineStyle->isMutable() && !element().isInShadowTree();
-        addElementStyleProperties(inlineStyle, isInlineStyleCacheable, FromStyleAttribute::Yes);
+        addElementStyleProperties(inlineStyle, RuleSet::cascadeLayerPriorityForUnlayered, isInlineStyleCacheable, FromStyleAttribute::Yes);
     }
 
     if (includeSMILProperties && is<SVGElement>(element()))
-        addElementStyleProperties(downcast<SVGElement>(element()).animatedSMILStyleProperties(), false /* isCacheable */);
+        addElementStyleProperties(downcast<SVGElement>(element()).animatedSMILStyleProperties(), RuleSet::cascadeLayerPriorityForUnlayered, false /* isCacheable */);
 }
 

trunk/Source/WebCore/style/ElementRuleCollector.h

@@ -97 +97 @@
 
 private:
-    void addElementStyleProperties(const StyleProperties*, bool isCacheable = true, FromStyleAttribute = FromStyleAttribute::No);
+    void addElementStyleProperties(const StyleProperties*, CascadeLayerPriority, bool isCacheable = true, FromStyleAttribute = FromStyleAttribute::No);
 
     void matchUARules(const RuleSet&);

trunk/Source/WebCore/style/RuleSet.h

@@ -106 +106 @@
     bool hasHostPseudoClassRulesMatchingInShadowTree() const { return m_hasHostPseudoClassRulesMatchingInShadowTree; }
 
+    static constexpr auto cascadeLayerPriorityForPresentationalHints = std::numeric_limits<CascadeLayerPriority>::min();
     static constexpr auto cascadeLayerPriorityForUnlayered = std::numeric_limits<CascadeLayerPriority>::max();
 

trunk/Source/WebCore/style/RuleSetBuilder.cpp

@@ -290 +290 @@
     std::sort(layersInPriorityOrder.begin(), layersInPriorityOrder.end(), compare);
 
+    // Priorities matter only relative to each other, so assign them enforcing these constraints:
+    // - Layers must get a priority greater than RuleSet::cascadeLayerPriorityForPresentationalHints.
+    // - Layers must get a priority smaller than RuleSet::cascadeLayerPriorityForUnlayered.
+    // - A layer must get at least the same priority as the previous one.
+    // - A layer should get more priority than the previous one, but this may be impossible if there are too many layers.
+    //   In that case, the last layers will get the maximum priority for layers, RuleSet::cascadeLayerPriorityForUnlayered - 1.
     for (unsigned i = 0; i < layerCount; ++i) {
-        auto priority = std::min<unsigned>(i, RuleSet::cascadeLayerPriorityForUnlayered - 1);
+        auto priority = std::min<unsigned>(i + RuleSet::cascadeLayerPriorityForPresentationalHints + 1, RuleSet::cascadeLayerPriorityForUnlayered - 1);
         m_ruleSet->cascadeLayerForIdentifier(layersInPriorityOrder[i]).priority = priority;
     }