Split descriptors out of properties dictionary in CSSProperties.json #7832

weinig · 2022-12-18T22:01:05Z

`229a3a2`

Split descriptors out of properties dictionary in CSSProperties.json
https://bugs.webkit.org/show_bug.cgi?id=249558
rdar://103497902

Reviewed by Antti Koivisto.

Adds a new top level object to CSSProperties.json, "descriptors", which contains
mappings from CSS rule types (e.g. @font-face, @counter-style) to a map of the
descriptors that rule type supports. This allows us to remove the 'descriptor-only'
properties from the main 'properties' map, and also accurately specify the
descriptors that shared names with properties. This is important as some descriptors
share a name with a property but have different grammars.

With the new data in CSSProperties.json, we now generate parse functions for
the new rule types specified: @counter-style, @font-face, @font-palette-values.
and @property. While not too many of the descriptors can be generated right now,
the main "parse...Descriptor" functions can be, and this adds the foundation for
generating more as we add more capabilities to the parser.

To differentiate between style properties and descriptors when exporting consumer
functions, descriptors have a prefix based on their rule type added. For example,
@font-face defines a "font-display" descriptor, which is needed elsewhere, so we
export a function called `CSSPropertyParsing::consumeFontFaceFontDisplay()`.

* Source/WebCore/css/CSSProperties.json:
Move/copy descriptors to new section. Remove support for descriptor-only now
that it can be inferred.

* Source/WebCore/css/parser/CSSParserFastPaths.cpp:
(WebCore::CSSParserFastPaths::isKeywordValidForStyleProperty):
(WebCore::CSSParserFastPaths::isKeywordFastPathEligibleStyleProperty):
(WebCore::parseKeywordValue):
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue): Deleted.
(WebCore::CSSParserFastPaths::isKeywordPropertyID): Deleted.
* Source/WebCore/css/parser/CSSParserFastPaths.h:
Update for more precise names that differentiate between properties
and descriptors.

* Source/WebCore/css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::parseValue):
Remove unnecessary passing of the CSSParserContext to a member
function. It can access it via *this.

(WebCore::CSSPropertyParser::parseSingleValue):
Update for rename from parse() to parseStyleProperty().

(WebCore::CSSPropertyParser::parseCounterStyleDescriptor):
(WebCore::CSSPropertyParser::parseFontFaceDescriptor):
(WebCore::CSSPropertyParser::parseFontFaceDescriptorShorthand):
(WebCore::CSSPropertyParser::parseFontPaletteValuesDescriptor):
Call through to the new generated parsers.

(WebCore::consumeCounterStyleSystem): Deleted.
(WebCore::consumeCounterStyleSymbol): Deleted.
(WebCore::consumeCounterStyleNegative): Deleted.
(WebCore::consumeCounterStyleRangeBound): Deleted.
(WebCore::consumeCounterStyleRange): Deleted.
(WebCore::consumeCounterStylePad): Deleted.
(WebCore::consumeCounterStyleSymbols): Deleted.
(WebCore::consumeCounterStyleAdditiveSymbols): Deleted.
(WebCore::consumeCounterStyleSpeakAs): Deleted.
(WebCore::consumeBasePaletteDescriptor): Deleted.
(WebCore::consumeOverrideColorsDescriptor): Deleted.
Moved to CSSPropertyParserHelpers.cpp for consistency.

* Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::consumeBackgroundSize):
(WebCore::CSSPropertyParserHelpers::consumeFontFaceFontFamily):
(WebCore::CSSPropertyParserHelpers::consumeFontPaletteValuesOverrideColors):
(WebCore::CSSPropertyParserHelpers::consumeCounterStyleSystem):
(WebCore::CSSPropertyParserHelpers::consumeCounterStyleSymbol):
(WebCore::CSSPropertyParserHelpers::consumeCounterStyleNegative):
(WebCore::CSSPropertyParserHelpers::consumeCounterStyleRangeBound):
(WebCore::CSSPropertyParserHelpers::consumeCounterStyleRange):
(WebCore::CSSPropertyParserHelpers::consumeCounterStylePad):
(WebCore::CSSPropertyParserHelpers::consumeCounterStyleSymbols):
(WebCore::CSSPropertyParserHelpers::consumeCounterStyleAdditiveSymbols):
(WebCore::CSSPropertyParserHelpers::consumeCounterStyleSpeakAs):
(WebCore::CSSPropertyParserHelpers::consumeFontFamilyDescriptor): Deleted.
* Source/WebCore/css/parser/CSSPropertyParserHelpers.h:
Moved functions from CSSPropertyParser. Renamed consumeFontFamilyDescriptor
to consumeFontFaceFontFamily to better align with naming convention.

* Source/WebCore/css/process-css-properties.py:
Adds support for the new 'descriptors' top level object and generalizes
parser code generation to support them.

* Source/WebCore/inspector/agents/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::getSupportedCSSProperties):
Update for renames.

* Tools/Scripts/webkitpy/style/checkers/jsonchecker.py:
Add checker support for the new sections. Remove support for descriptor-only.

Canonical link: https://commits.webkit.org/258084@main

a29649e

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
✅ 🧪 webkitpy	❌ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk2
	✅ 🛠 tv-sim	~~🧪 mac-AS-debug-wk2~~
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge	✅ 🛠 watch-sim

webkit-early-warning-system · 2022-12-18T22:01:11Z

EWS run on previous version of this PR (hash 3aa5d12)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	❌ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🧪 api-mac	❌ 🧪 gtk-wk2
❌ 🧪 webkitpy	✅ 🧪 api-ios	❌ 🧪 mac-wk1	✅ 🧪 api-gtk
	✅ 🛠 tv	❌ 🧪 mac-wk2
	✅ 🛠 tv-sim	❌ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
	✅ 🛠 watch-sim

webkit-early-warning-system · 2022-12-19T02:49:21Z

EWS run on previous version of this PR (hash bd465e7)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	❌ 🛠 ios	❌ 🛠 mac	❌ 🛠 wpe	~~🛠 🧪 win~~
✅ 🧪 bindings	❌ 🛠 ios-sim	❌ 🛠 mac-AS-debug	❌ 🛠 gtk	❌ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	❌ 🧪 api-mac	❌ 🧪 gtk-wk2
	❌ 🧪 api-ios	❌ 🧪 mac-wk1	❌ 🧪 api-gtk
✅ 🛠 🧪 jsc	❌ 🛠 tv	❌ 🧪 mac-wk2	✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64	❌ 🛠 tv-sim	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 jsc-armv7-tests
	❌ 🛠 watch	❌ 🧪 mac-wk2-stress	✅ 🛠 jsc-mips
	❌ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-12-19T03:21:39Z

EWS run on previous version of this PR (hash d23b9ea)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
❌ 🧪 webkitpy	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
	✅ 🛠 watch-sim

webkit-early-warning-system · 2022-12-19T14:43:54Z

EWS run on current version of this PR (hash a29649e)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
✅ 🧪 webkitpy	❌ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk2
	✅ 🛠 tv-sim	~~🧪 mac-AS-debug-wk2~~
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge	✅ 🛠 watch-sim

weinig · 2022-12-19T14:54:39Z

Ready to rock and roll.

anttijk · 2022-12-19T18:21:58Z

Source/WebCore/css/CSSProperties.json

+            "inherits": {
+                "codegen-properties": {
+                    "settings-flag": "cssCustomPropertiesAndValuesEnabled",
+                    "parser-grammar": "true | false"


@font-face

https://bugs.webkit.org/show_bug.cgi?id=249558 rdar://103497902 Reviewed by Antti Koivisto. Adds a new top level object to CSSProperties.json, "descriptors", which contains mappings from CSS rule types (e.g. @font-face, @counter-style) to a map of the descriptors that rule type supports. This allows us to remove the 'descriptor-only' properties from the main 'properties' map, and also accurately specify the descriptors that shared names with properties. This is important as some descriptors share a name with a property but have different grammars. With the new data in CSSProperties.json, we now generate parse functions for the new rule types specified: @counter-style, @font-face, @font-palette-values. and @Property. While not too many of the descriptors can be generated right now, the main "parse...Descriptor" functions can be, and this adds the foundation for generating more as we add more capabilities to the parser. To differentiate between style properties and descriptors when exporting consumer functions, descriptors have a prefix based on their rule type added. For example, @font-face defines a "font-display" descriptor, which is needed elsewhere, so we export a function called `CSSPropertyParsing::consumeFontFaceFontDisplay()`. * Source/WebCore/css/CSSProperties.json: Move/copy descriptors to new section. Remove support for descriptor-only now that it can be inferred. * Source/WebCore/css/parser/CSSParserFastPaths.cpp: (WebCore::CSSParserFastPaths::isKeywordValidForStyleProperty): (WebCore::CSSParserFastPaths::isKeywordFastPathEligibleStyleProperty): (WebCore::parseKeywordValue): (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue): Deleted. (WebCore::CSSParserFastPaths::isKeywordPropertyID): Deleted. * Source/WebCore/css/parser/CSSParserFastPaths.h: Update for more precise names that differentiate between properties and descriptors. * Source/WebCore/css/parser/CSSPropertyParser.cpp: (WebCore::CSSPropertyParser::parseValue): Remove unnecessary passing of the CSSParserContext to a member function. It can access it via *this. (WebCore::CSSPropertyParser::parseSingleValue): Update for rename from parse() to parseStyleProperty(). (WebCore::CSSPropertyParser::parseCounterStyleDescriptor): (WebCore::CSSPropertyParser::parseFontFaceDescriptor): (WebCore::CSSPropertyParser::parseFontFaceDescriptorShorthand): (WebCore::CSSPropertyParser::parseFontPaletteValuesDescriptor): Call through to the new generated parsers. (WebCore::consumeCounterStyleSystem): Deleted. (WebCore::consumeCounterStyleSymbol): Deleted. (WebCore::consumeCounterStyleNegative): Deleted. (WebCore::consumeCounterStyleRangeBound): Deleted. (WebCore::consumeCounterStyleRange): Deleted. (WebCore::consumeCounterStylePad): Deleted. (WebCore::consumeCounterStyleSymbols): Deleted. (WebCore::consumeCounterStyleAdditiveSymbols): Deleted. (WebCore::consumeCounterStyleSpeakAs): Deleted. (WebCore::consumeBasePaletteDescriptor): Deleted. (WebCore::consumeOverrideColorsDescriptor): Deleted. Moved to CSSPropertyParserHelpers.cpp for consistency. * Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp: (WebCore::CSSPropertyParserHelpers::consumeBackgroundSize): (WebCore::CSSPropertyParserHelpers::consumeFontFaceFontFamily): (WebCore::CSSPropertyParserHelpers::consumeFontPaletteValuesOverrideColors): (WebCore::CSSPropertyParserHelpers::consumeCounterStyleSystem): (WebCore::CSSPropertyParserHelpers::consumeCounterStyleSymbol): (WebCore::CSSPropertyParserHelpers::consumeCounterStyleNegative): (WebCore::CSSPropertyParserHelpers::consumeCounterStyleRangeBound): (WebCore::CSSPropertyParserHelpers::consumeCounterStyleRange): (WebCore::CSSPropertyParserHelpers::consumeCounterStylePad): (WebCore::CSSPropertyParserHelpers::consumeCounterStyleSymbols): (WebCore::CSSPropertyParserHelpers::consumeCounterStyleAdditiveSymbols): (WebCore::CSSPropertyParserHelpers::consumeCounterStyleSpeakAs): (WebCore::CSSPropertyParserHelpers::consumeFontFamilyDescriptor): Deleted. * Source/WebCore/css/parser/CSSPropertyParserHelpers.h: Moved functions from CSSPropertyParser. Renamed consumeFontFamilyDescriptor to consumeFontFaceFontFamily to better align with naming convention. * Source/WebCore/css/process-css-properties.py: Adds support for the new 'descriptors' top level object and generalizes parser code generation to support them. * Source/WebCore/inspector/agents/InspectorCSSAgent.cpp: (WebCore::InspectorCSSAgent::getSupportedCSSProperties): Update for renames. * Tools/Scripts/webkitpy/style/checkers/jsonchecker.py: Add checker support for the new sections. Remove support for descriptor-only. Canonical link: https://commits.webkit.org/258084@main

webkit-commit-queue · 2022-12-19T19:31:41Z

Committed 258084@main (229a3a2): https://commits.webkit.org/258084@main

Reviewed commits have been landed. Closing PR #7832 and removing active labels.

weinig requested review from patrickangle and JonWBedard as code owners December 18, 2022 22:01

weinig self-assigned this Dec 18, 2022

weinig added the CSS Cascading Style Sheets implementation label Dec 18, 2022

weinig requested a review from anttijk December 18, 2022 22:01

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 18, 2022

weinig removed the merging-blocked Applied to prevent a change from being merged label Dec 19, 2022

weinig force-pushed the eng/Split-descriptors-out-of-properties-dictionary-in-CSSProperties-json branch from 3aa5d12 to bd465e7 Compare December 19, 2022 02:45

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 19, 2022

weinig removed the merging-blocked Applied to prevent a change from being merged label Dec 19, 2022

weinig force-pushed the eng/Split-descriptors-out-of-properties-dictionary-in-CSSProperties-json branch from bd465e7 to d23b9ea Compare December 19, 2022 03:18

weinig force-pushed the eng/Split-descriptors-out-of-properties-dictionary-in-CSSProperties-json branch from d23b9ea to a29649e Compare December 19, 2022 14:37

weinig requested review from darinadler and cdumez December 19, 2022 14:54

anttijk approved these changes Dec 19, 2022

View reviewed changes

anttijk reviewed Dec 19, 2022

View reviewed changes

weinig added the merge-queue Applied to send a pull request to merge-queue label Dec 19, 2022

webkit-early-warning-system force-pushed the eng/Split-descriptors-out-of-properties-dictionary-in-CSSProperties-json branch from a29649e to 229a3a2 Compare December 19, 2022 19:31

webkit-early-warning-system merged commit 229a3a2 into WebKit:main Dec 19, 2022

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Dec 19, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split descriptors out of properties dictionary in CSSProperties.json #7832

Split descriptors out of properties dictionary in CSSProperties.json #7832

weinig commented Dec 18, 2022 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Dec 18, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited

weinig commented Dec 19, 2022

anttijk Dec 19, 2022

webkit-commit-queue commented Dec 19, 2022

Split descriptors out of properties dictionary in CSSProperties.json #7832

Split descriptors out of properties dictionary in CSSProperties.json #7832

Conversation

weinig commented Dec 18, 2022 • edited by webkit-early-warning-system

229a3a2

webkit-early-warning-system commented Dec 18, 2022 • edited

webkit-early-warning-system commented Dec 19, 2022 • edited

webkit-early-warning-system commented Dec 19, 2022 • edited

webkit-early-warning-system commented Dec 19, 2022 • edited

weinig commented Dec 19, 2022

anttijk Dec 19, 2022

Choose a reason for hiding this comment

webkit-commit-queue commented Dec 19, 2022

weinig commented Dec 18, 2022 •

edited by webkit-early-warning-system

`229a3a2`

webkit-early-warning-system commented Dec 18, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited