Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: cdf824701b8c4d6c2047d7318deb2a9da0e0fbd2
https://github.com/WebKit/WebKit/commit/cdf824701b8c4d6c2047d7318deb2a9da0e0fbd2
Author: Antti Koivisto <[email protected]>
Date: 2026-03-05 (Thu, 05 Mar 2026)
Changed paths:
M
LayoutTests/imported/w3c/web-platform-tests/css/css-animations/revert-rule-keyframes-dynamic-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-animations/revert-rule-keyframes-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-basic-expected.txt
A
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-custom-property-expected.txt
A
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-custom-property.html
M
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-important-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-layer-expected.txt
A
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-revert-layer-expected.txt
A
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-revert-layer.html
M
LayoutTests/imported/w3c/web-platform-tests/css/css-conditional/container-queries/custom-property-style-queries-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-env/env-revert-rule-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-nesting/nesting-revert-rule.tentative-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-values/if-function-revert-rule-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-variables/revert-rule-in-fallback-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-variables/revert-rule-to-var-expected.txt
M Source/WebCore/css/CSSValueKeywords.in
M Source/WebCore/css/CSSWideKeyword.h
M Source/WebCore/css/parser/CSSParserFastPaths.cpp
M Source/WebCore/style/PropertyCascade.cpp
M Source/WebCore/style/PropertyCascade.h
M Source/WebCore/style/StyleBuilder.cpp
M Source/WebCore/style/StyleBuilder.h
M Source/WebCore/style/StyleBuilderState.h
Log Message:
-----------
[css-cascade] Implement revert-rule CSS keyword
https://bugs.webkit.org/show_bug.cgi?id=308604
rdar://171132753
Reviewed by Sam Weinig.
https://drafts.csswg.org/css-cascade-5/#revert-rule-keyword
The revert-rule CSS-wide keyword rolls back the cascade similar to revert and
revert-layer,
except it works by style rule rather than cascade origin or cascade layer.
Tests:
imported/w3c/web-platform-tests/css/css-cascade/revert-rule-custom-property.html
imported/w3c/web-platform-tests/css/css-cascade/revert-rule-revert-layer.html
*
LayoutTests/imported/w3c/web-platform-tests/css/css-animations/revert-rule-keyframes-dynamic-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-animations/revert-rule-keyframes-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-basic-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-custom-property-expected.txt:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-custom-property.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-important-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-layer-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-revert-layer-expected.txt:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-revert-layer.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-conditional/container-queries/custom-property-style-queries-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-env/env-revert-rule-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-nesting/nesting-revert-rule.tentative-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-values/if-function-revert-rule-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-variables/revert-rule-in-fallback-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-variables/revert-rule-to-var-expected.txt:
* Source/WebCore/css/CSSValueKeywords.in:
* Source/WebCore/css/CSSWideKeyword.h:
(WebCore::isCSSWideKeyword):
(WebCore::parseCSSWideKeyword):
(WebCore::toValueID):
* Source/WebCore/css/parser/CSSParserFastPaths.cpp:
(WebCore::isUniversalKeyword):
* Source/WebCore/style/PropertyCascade.cpp:
(WebCore::Style::PropertyCascade::PropertyCascade):
Add a constructor for revert-rule cascade.
This rolls backs every property by one or more rules.
(WebCore::Style::PropertyCascade::buildCascade):
(WebCore::Style::PropertyCascade::set):
(WebCore::Style::PropertyCascade::setDelayingForRuleRollback):
Instead of setting the value add it to a per-property vector.
Only set the values after this vector reaches the desired rollback depth.
(WebCore::Style::PropertyCascade::addMatch):
* Source/WebCore/style/PropertyCascade.h:
* Source/WebCore/style/StyleBuilder.cpp:
(WebCore::Style::Builder::applyProperty):
(WebCore::Style::Builder::applyCustomProperty):
(WebCore::Style::Builder::resolveCustomPropertyForContainerQueries):
(WebCore::Style::Builder::ensureRollbackCascadeForRevert):
(WebCore::Style::Builder::ensureRollbackCascadeForRevertLayer):
(WebCore::Style::Builder::ensureRollbackCascadeForRevertRule):
(WebCore::Style::Builder::parentCascadeForRollback):
(WebCore::Style::Builder::makeRollbackCascadeKey):
Include the parent cascade to the rollback key.
(WebCore::Style::Builder::makeRollbackCascadeKeyForRevertRule):
Construct the revert-rule rollback cascade.
* Source/WebCore/style/StyleBuilder.h:
* Source/WebCore/style/StyleBuilderState.h:
Test:
imported/w3c/web-platform-tests/css/css-cascade/revert-rule-revert-layer.html
*
LayoutTests/imported/w3c/web-platform-tests/css/css-animations/revert-rule-keyframes-dynamic-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-animations/revert-rule-keyframes-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-basic-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-important-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-layer-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-revert-layer-expected.txt:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-rule-revert-layer.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-conditional/container-queries/custom-property-style-queries-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-env/env-revert-rule-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-nesting/nesting-revert-rule.tentative-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-values/if-function-revert-rule-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-variables/revert-rule-in-fallback-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-variables/revert-rule-to-var-expected.txt:
* Source/WebCore/css/CSSValueKeywords.in:
* Source/WebCore/css/CSSWideKeyword.h:
(WebCore::isCSSWideKeyword):
(WebCore::parseCSSWideKeyword):
(WebCore::toValueID):
* Source/WebCore/css/parser/CSSParserFastPaths.cpp:
(WebCore::isUniversalKeyword):
* Source/WebCore/style/PropertyCascade.cpp:
(WebCore::Style::PropertyCascade::PropertyCascade):
Add a constructor for revert-rule cascade.
This simply rolls back every property as if they had `revert-rule` value,
without considering the actual value.
(WebCore::Style::PropertyCascade::propertyIfExist const):
Add a helper.
(WebCore::Style::PropertyCascade::addMatch):
Skip property values equal to the cascade we are rolling back from, effectively
falling back to whatever value
there would have if that rule did not exist.
* Source/WebCore/style/PropertyCascade.h:
* Source/WebCore/style/StyleBuilder.cpp:
(WebCore::Style::Builder::applyProperty):
(WebCore::Style::Builder::applyCustomProperty):
Track the current rollback cascade.
Handle t
(WebCore::Style::Builder::resolveCustomPropertyForContainerQueries):
(WebCore::Style::Builder::ensureRollbackCascadeForRevert):
(WebCore::Style::Builder::ensureRollbackCascadeForRevertLayer):
(WebCore::Style::Builder::ensureRollbackCascadeForRevertRule):
Add revert rule rollback cascade.
(WebCore::Style::Builder::parentCascadeForRollback):
(WebCore::Style::Builder::makeRollbackCascadeKey):
Include the parent cascade to the rollback key.
(WebCore::Style::Builder::makeRollbackCascadeKeyForRevertRule):
* Source/WebCore/style/StyleBuilder.h:
* Source/WebCore/style/StyleBuilderState.h:
Canonical link: https://commits.webkit.org/308733@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
