Changeset 293485 in webkit

Timestamp:

Apr 26, 2022 5:19:14 PM (3 months ago)

Author:

Oriol Brufau

Message:

[css-cascade] Fix cascade rollback for deferred properties
​https://bugs.webkit.org/show_bug.cgi?id=238125

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Add a test. It still has some failures due to bug 239579, bug 239669,
and bug 239670.

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

Source/WebCore:

When a deferred property was set to 'revert' or 'revert-layer', it used
to roll back to a declaration of the same exact property (or behave as
'unset' if none).

This patch lets deferred properties roll back to their related property,
e.g. '-webkit-box-shadow: revert-layer' can roll back to a 'box-shadow'
declaration in the previous layer.

This is consistent with logical and physical properties, where the
rollback happens after resolving logical properties.

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

• style/PropertyCascade.cpp:

(WebCore::Style::PropertyCascade::lastDeferredPropertyResolvingRelated const):

• style/PropertyCascade.h:
• style/StyleBuilder.cpp:

(WebCore::Style::Builder::applyProperty):

LayoutTests:

Add custom expectation for mac-wk1 since scroll-behavior is disabled
there, and thus not checked by the test.

• platform/mac-wk1/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt: Added.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-26  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-cascade] Fix cascade rollback for deferred properties
+        https://bugs.webkit.org/show_bug.cgi?id=238125
+
+        Reviewed by Antti Koivisto.
+
+        Add custom expectation for mac-wk1 since scroll-behavior is disabled
+        there, and thus not checked by the test.
+
+        * platform/mac-wk1/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt: Added.
+
 2022-04-26  Karl Rackler  <rackler@apple.com>
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-04-26  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-cascade] Fix cascade rollback for deferred properties
+        https://bugs.webkit.org/show_bug.cgi?id=238125
+
+        Reviewed by Antti Koivisto.
+
+        Add a test. It still has some failures due to bug 239579, bug 239669,
+        and bug 239670.
+
+        * web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt: Added.
+        * web-platform-tests/css/css-cascade/all-prop-revert-layer.html: Added.
+
 2022-04-26  Ziran Sun  <zsun@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-26  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-cascade] Fix cascade rollback for deferred properties
+        https://bugs.webkit.org/show_bug.cgi?id=238125
+
+        Reviewed by Antti Koivisto.
+
+        When a deferred property was set to 'revert' or 'revert-layer', it used
+        to roll back to a declaration of the same exact property (or behave as
+        'unset' if none).
+
+        This patch lets deferred properties roll back to their related property,
+        e.g. '-webkit-box-shadow: revert-layer' can roll back to a 'box-shadow'
+        declaration in the previous layer.
+
+        This is consistent with logical and physical properties, where the
+        rollback happens after resolving logical properties.
+
+        Test: imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer.html
+
+        * style/PropertyCascade.cpp:
+        (WebCore::Style::PropertyCascade::lastDeferredPropertyResolvingRelated const):
+        * style/PropertyCascade.h:
+        * style/StyleBuilder.cpp:
+        (WebCore::Style::Builder::applyProperty):
+
 2022-04-26  Elliott Williams  <emw@apple.com>
 

trunk/Source/WebCore/style/PropertyCascade.cpp

@@ -155 +155 @@
 }
 
+const PropertyCascade::Property* PropertyCascade::lastDeferredPropertyResolvingRelated(CSSPropertyID propertyID) const
+{
+    auto relatedID = getRelatedPropertyId(propertyID);
+    if (relatedID == CSSPropertyInvalid) {
+        ASSERT_NOT_REACHED();
+        return hasDeferredProperty(propertyID) ? &deferredProperty(propertyID) : nullptr;
+    }
+    auto indexForPropertyID = deferredPropertyIndex(propertyID);
+    auto indexForRelatedID = deferredPropertyIndex(relatedID);
+    if (indexForPropertyID > indexForRelatedID)
+        return &deferredProperty(propertyID);
+    if (indexForPropertyID < indexForRelatedID)
+        return &deferredProperty(relatedID);
+    ASSERT(!hasDeferredProperty(propertyID));
+    ASSERT(!hasDeferredProperty(relatedID));
+    return nullptr;
+}
 
 bool PropertyCascade::addMatch(const MatchedProperties& matchedProperties, CascadeLevel cascadeLevel, bool important)

trunk/Source/WebCore/style/PropertyCascade.h

@@ -65 +65 @@
     bool hasDeferredProperty(CSSPropertyID) const;
     const Property& deferredProperty(CSSPropertyID) const;
+    const Property* lastDeferredPropertyResolvingRelated(CSSPropertyID) const;
 
     bool hasCustomProperty(const AtomString&) const;

trunk/Source/WebCore/style/StyleBuilder.cpp

@@ -323 +323 @@
                     return;
                 }
-            } else if (rollbackCascade->hasDeferredProperty(id)) {
-                auto& property = rollbackCascade->deferredProperty(id);
-                applyRollbackCascadeProperty(property, linkMatchMask);
+            } else if (auto* property = rollbackCascade->lastDeferredPropertyResolvingRelated(id)) {
+                applyRollbackCascadeProperty(*property, linkMatchMask);
                 return;
             }