Changeset 290864 in webkit

Timestamp:

Mar 5, 2022 3:18:55 AM (5 months ago)

Author:

Oriol Brufau

Message:

[css-cascade] Let 'revert-layer' in lowest layer roll back to user styles
​https://bugs.webkit.org/show_bug.cgi?id=237486

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Add test. It still has some remaining failures due to bug 236272.

• web-platform-tests/css/css-cascade/all-prop-revert-layer-noop-expected.txt: Added.
• web-platform-tests/css/css-cascade/all-prop-revert-layer-noop.html: Added.

Source/WebCore:

When 'revert-layer' was used in the lowest @layer, then it would behave
as 'unset'. This patch fixes ensureRollbackCascadeForRevertLayer() to
not return nullptr and instead return ensureRollbackCascadeForRevert()
in that case. This imples that 'revert-layer' will behave like 'revert'
and roll back to user (or UA) styles.

Test: imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-noop.html

• style/StyleBuilder.cpp:

(WebCore::Style::Builder::ensureRollbackCascadeForRevertLayer):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-noop-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-noop.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleBuilder.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-03-05  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-cascade] Let 'revert-layer' in lowest layer roll back to user styles
+        https://bugs.webkit.org/show_bug.cgi?id=237486
+
+        Reviewed by Antti Koivisto.
+
+        Add test. It still has some remaining failures due to bug 236272.
+
+        * web-platform-tests/css/css-cascade/all-prop-revert-layer-noop-expected.txt: Added.
+        * web-platform-tests/css/css-cascade/all-prop-revert-layer-noop.html: Added.
+
 2022-03-04  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-05  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-cascade] Let 'revert-layer' in lowest layer roll back to user styles
+        https://bugs.webkit.org/show_bug.cgi?id=237486
+
+        Reviewed by Antti Koivisto.
+
+        When 'revert-layer' was used in the lowest @layer, then it would behave
+        as 'unset'. This patch fixes ensureRollbackCascadeForRevertLayer() to
+        not return nullptr and instead return ensureRollbackCascadeForRevert()
+        in that case. This imples that 'revert-layer' will behave like 'revert'
+        and roll back to user (or UA) styles.
+
+        Test: imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-noop.html
+
+        * style/StyleBuilder.cpp:
+        (WebCore::Style::Builder::ensureRollbackCascadeForRevertLayer):
+
 2022-03-04  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/style/StyleBuilder.cpp

@@ -400 +400 @@
     auto rollbackLayerPriority = property.cascadeLayerPriority;
     if (!rollbackLayerPriority)
-        return nullptr;
+        return ensureRollbackCascadeForRevert();
 
     ASSERT(property.fromStyleAttribute == FromStyleAttribute::No || property.cascadeLayerPriority == RuleSet::cascadeLayerPriorityForUnlayered);