[@property] Fallback that does not match syntax should make var() invalid #8116
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
EWS run on current version of this PR (hash 9edf1da)
|
webkit-ews-buildbot
added
the
merging-blocked
weinig
approved these changes
Jan 1, 2023
| return nullptr; | ||
|
|
||
| return CSSVariableData::create(resolvedTokens); | ||
| return CSSVariableData::create(*resolvedTokens); |
There was a problem hiding this comment.
Seems unfortunate we have to copy here. Can we add a CSSVariableData::create() overload that takes an r-value and move the resolved tokens in? Or does the processing done in CSSVariableData's constructor make this a meaning less optimization?
There was a problem hiding this comment.
Maybe something to do separately. I did notice it and wondered about the same things you did.
…alid https://bugs.webkit.org/show_bug.cgi?id=249981 rdar://103799338 Reviewed by Sam Weinig. The fallback value must match the syntax definition of the custom property being referenced, otherwise the declaration is invalid at computed-value time. https://drafts.css-houdini.org/css-properties-values-api/#fallbacks-in-var-references * LayoutTests/imported/w3c/web-platform-tests/css/css-properties-values-api/var-reference-registered-properties-expected.txt: * Source/WebCore/css/CSSVariableReferenceValue.cpp: (WebCore::CSSVariableReferenceValue::resolveVariableFallback const): Check the syntax of the fallback. (WebCore::CSSVariableReferenceValue::resolveVariableReference const): (WebCore::CSSVariableReferenceValue::resolveTokenRange const): (WebCore::CSSVariableReferenceValue::resolveVariableReferences const): (WebCore::CSSVariableReferenceValue::resolveVariableFallback): Deleted. (WebCore::CSSVariableReferenceValue::resolveVariableReference): Deleted. (WebCore::CSSVariableReferenceValue::resolveTokenRange): Deleted. Make these non-static (so parser context is available) and did some return value cleanup. * Source/WebCore/css/CSSVariableReferenceValue.h: * Source/WebCore/css/parser/CSSPropertyParser.cpp: (WebCore::CSSPropertyParser::isValidCustomPropertyValueForSyntax): * Source/WebCore/css/parser/CSSPropertyParser.h: Canonical link: https://commits.webkit.org/258373@main
webkit-commit-queue
force-pushed
the
prop-fallback
branch
from
9edf1da
to
6dabb8f
Compare
|
Committed 258373@main (6dabb8f): https://commits.webkit.org/258373@main Reviewed commits have been landed. Closing PR #8116 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
6dabb8f
9edf1da
🧪 api-mac🧪 gtk-wk2🧪 mac-wk1🧪 mac-wk2🧪 mac-wk2-stress