8000 Factor out shorthand serialization into its own class · WebKit/WebKit@66b2832 · GitHub
[go: up one dir, main page]
Skip to content

Commit 66b2832

Browse files
darinadlerdarinadler
committed
Factor out shorthand serialization into its own class
https://bugs.webkit.org/show_bug.cgi?id=250953 rdar://problem/104517006 Reviewed by Oriol Brufau. Factoring out shorthand serialization into a separate class and breaking it out of StyleProperties has a few benefits: - Moves details of shorthand serialization out of StyleProperties.h; these are no longer private members of StyleProperties class. - Reorganizes shorthand serialization so longhand property values are gathered during the common checks. This means we won't repeatedly search style properties for the same properties. - Prepares for moving shorthand serialization into a separate file, making StyleProperties.cpp a more manageable size. - Prepares for sharing shorthand serialization with computed style. We don't need to repeat all this logic twice the way we do today. However, computed style has a WebKit-only feature where it will produce CSS values for shorthands; we have to decide whether to remove that entirely or at least remove if for most shorthand properties. Shorthands don't need to be expressible as CSS values; they are a parsing and serialization format and don't have a specified object model. Also made a small number of other minor improvements to StyleProperties. * Source/WebCore/css/CSSProperties.json: Reordered the longhands in border, border-block, and border-inline so they are in serialization order: width, style, color. The new serialization code depends on this, and it's also a logical order. * Source/WebCore/css/StyleProperties.cpp: Updated the maxShorthandLength constant, which was incorrect. It's still a good idea to generate it and we should do that in a future change. (WebCore::isCSSWideValueKeyword): Deleted. (WebCore::isValueIDIncludingList): Removed an unused overload. (WebCore::serializeLonghandValue): Renamed from textExpandingInitialValuePlaceholder and moved the special logic for opacity properties in here. Also added an overload that takes a pointer. (WebCore::ShorthandSerializer::commonSerializationChecks): Renamed from SyleProperties::commonShorthandChecks. Assert length is not zero since ShorthandSerializer must only be used for shorthands. Use a boolean return value instead of using empty string and null string to express the two different outcomes. Store all the values in m_longhandValues as we check them. Also added the m_gridTemplateAreasWasSetFromShorthand logic. (WebCore::StyleProperties::serializeLonghandValue const): Added. Uses serializeLonghandValue and getPropertyCSSValue. (WebCore::StyleProperties::serializeShorthandValue const): Added. Uses ShorthandSerializer. (WebCore::StyleProperties::getPropertyValue const): Use serializeLonghandValue and serializeShorthandValue. (WebCore::ShorthandSerializer::ShorthandSerializer): Added. (WebCore::ShorthandSerializer::longhandProperty const): Added. (WebCore::ShorthandSerializer::longhandValue const): Added. (WebCore::ShorthandSerializer::serializeValue): Added. (WebCore::ShorthandSerializer::isInitialValue): Added. (WebCore::ShorthandSerializer::longhandIndex const): Added. (WebCore::ShorthandSerializer::longhandValueID const): Added. (WebCore::ShorthandSerializer::serializeLonghandValue const): Added. (WebCore::ShorthandSerializer::serialize): Added. Moved the large switch statment from StyleProperties::getPropertyValue in here. Besides name changes, changed serialization specifics: for "all", don't try to find a common value, since the only ones are the CSS-wide keywords already handled by the common serialization checks. For border, border-block, and border-inline, pass in the size of each section of the shorthand, allowing us to simplify the shared code. For container, use serializeLonghandsOmittingTrailingInitialValue. For flex and perspective-origin, use serializeLonghands. for transform-origin, use serializeLonghandsOmittingTrailingInitialValue. (WebCore::StyleProperties::propertyAsColor const): Use serializeLonghandValue. (WebCore::ShorthandSerializer::serializeFont const): Get longhand values by index. Use makeString. (WebCore::ShorthandSerializer::serializeOffset const): Ditto. (WebCore::ShorthandSerializer::serializeFontVariant const): Use serializeLonghandsOmittingInitialValues after doing some additional needed checks. (WebCore::ShorthandSerializer::serializeFontSynthesis const): Get longhand values by index. Use ASCII literals instead of StringBuilder. (WebCore::ShorthandSerializer::serializePair const): Get longhand values by index. (WebCore::ShorthandSerializer::serializeQuad const): Ditto. (WebCore::LayerValues::serialize const): Use serializeLonghandValue. (WebCore::ShorthandSerializer::serializeLayered const): Get longhand values by index. (WebCore::ShorthandSerializer::serializeGridTemplate const): Ditto. (WebCore::gridAutoFlowContains): Argument type is now CSSValue&. (WebCore::ShorthandSerializer::serializeGrid const): Get longhand values by index. Use makeString. (WebCore::ShorthandSerializer::serializeGridRowColumn const): Use serializeLonghands. (WebCore::ShorthandSerializer::serializeGridArea const): Ditto. (WebCore::ShorthandSerializer::serializeLonghands const): Added. This is like StyleProperties::getShorthandValue was, but does not omit initial values and is more versatile since it can be used to serialize only some properties up to a limit. Also use makeString for common short lengths. (WebCore::ShorthandSerializer::serializeLonghandsOmittingInitialValues const): This is the new name for StyleProperties::getShorthandValue. (WebCore::ShorthandSerializer::serializeLonghandsOmittingTrailingInitialValue const): Added. Convenient for cases where the last value is optional, but other values are not. (WebCore::ShorthandSerializer::serializeCommonValue const): Removed unneeded code to handle missing longhands; that's checked by commonSerializationChecks. Refactored into two functions, so this can be used on a subset of the shorthand or the whole thing. (WebCore::ShorthandSerializer::serializeBorderImage const): Get longhand values by index. (WebCore::ShorthandSerializer::serializeBorderRadius const): Ditto. (WebCore::ShorthandSerializer::serializeBorder const): Use a new approach where we serialize these border-related shorthands by section. Get longhand values by index. Use serializeCommonValue and subsequentLonghandsHaveInitialValues. (WebCore::ShorthandSerializer::serializeBreakInside const): Use longhandValueID. (WebCore::ShorthandSerializer::serializePageBreak const): Ditto. (WebCore::ShorthandSerializer::serializeColumnBreak const): Ditto. (WebCore::ShorthandSerializer::subsequentLonghandsHaveInitialValues const): Replaces hasAllInitialValues. (WebCore::MutableStyleProperties::removeShorthandProperty): Added a returnText argument so we can implement the return value for shorthands here. Still using a FIXME for this for now, we'll make that change separately. (WebCore::MutableStyleProp 10BC0 erties::removePropertyAtIndex): Added. Helps factor out common code and give us slightly better efficiency. Also use null string to mean no result rather than empty string. (WebCore::MutableStyleProperties::removeLonghandProperty): Added. Calls findPropertyIndex and removePropertyAtIndex. (WebCore::MutableStyleProperties::removeProperty): Call removeShorthandProperty and removeLonghandProperty. (WebCore::MutableStyleProperties::removeCustomProperty): Call removePropertyAtIndex. (WebCore::MutableStyleProperties::setProperty): Removed the unneeded overload for the case where the property's value is a property ID. Removed the unneeded call to removeShorthandProperty in the overload that takes a CSSProperty that is never called for shorthands, adding an assertion to check that invariant. (WebCore::StyleProperties::asTextInternal const): Use serializeShorthandValue and serializeLonghandValue. (WebCore::MutableStyleProperties::removePropertiesInSet): Use the HashSet::add function that takes iterators. (WebCore::ImmutableStyleProperties::findCustomPropertyIndex const): Take a StringView instead of a const String&. (WebCore::MutableStyleProperties::findCustomPropertyIndex const): Ditto. (WebCore::MutableStyleProperties::findCSSPropertyWithID): Use nullptr. (WebCore::MutableStyleProperties::findCustomCSSPropertyWithName): Ditto. (WebCore::StyleProperties::PropertyReference::cssText const): Use serializeLonghandValue. * Source/WebCore/css/StyleProperties.h: Made findPropertyIndex and findCustomPropertyIndex public in StyleProperties. There are other functions that work based on the index in the interface. Doing this allows ShorthandSerializer to work using only public functions. Initialize m_arraySize to 0. Removed unneeded default constructor, most private functions, and friend relationship with PropertySetCSSStyleDeclaration. Updated MutableStyleProperties functions for changes above. * Source/WebCore/css/StylePropertyShorthand.h: Removed unneeded fontShorthandSubpropertiesResetToInitialValues; we now base this on CSSProperties.json. Added functions mentioned above. * Source/WebCore/css/parser/CSSPropertyParser.cpp: (WebCore::CSSPropertyParser::consumeFont): Set to initial values intead of explicitly allocating CSSValueNormal. This may be slightly more efficient and it's consistent with other property parsing. Set all properties in a loop, takes care of the properties reset to initial values without fontShorthandSubpropertiesResetToInitialValues. Canonical link: https://commits.webkit.org/259211@main
1 parent d6b9bab commit 66b2832

File tree

5 files changed

+688
-646
lines changed

5 files changed

+688
-646
lines changed

‎Source/WebCore/css/CSSProperties.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,18 +1720,18 @@
17201720
"border": {
17211721
"codegen-properties": {
17221722
"longhands": [
1723-
"border-top-color",
1724-
"border-top-style",
17251723
"border-top-width",
1726-
"border-right-color",
1727-
"border-right-style",
17281724
"border-right-width",
1729-
"border-bottom-color",
1730-
"border-bottom-style",
17311725
"border-bottom-width",
1732-
"border-left-color",
1733-
"border-left-style",
17341726
"border-left-width",
1727+
"border-top-style",
1728+
"border-right-style",
1729+
"border-bottom-style",
1730+
"border-left-style",
1731+
"border-top-color",
1732+
"border-right-color",
1733+
"border-bottom-color",
1734+
"border-left-color",
17351735
"border-image-source",
17361736
"border-image-slice",
17371737
"border-image-width",
@@ -1747,12 +1747,12 @@
17471747
"border-block": {
17481748
"codegen-properties": {
17491749
"longhands": [
1750-
"border-block-start-color",
1751-
"border-block-start-style",
17521750
"border-block-start-width",
1753-
"border-block-end-color",
1751+
"border-block-end-width",
1752+
"border-block-start-style",
17541753
"border-block-end-style",
1755-
"border-block-end-width"
1754+
"border-block-start-color",
1755+
"border-block-end-color"
17561756
]
17571757
},
17581758
"specification": {
@@ -2247,12 +2247,12 @@
22472247
"border-inline": {
22482248
"codegen-properties": {
22492249
"longhands": [
2250-
"border-inline-start-color",
2251-
"border-inline-start-style",
22522250
"border-inline-start-width",
2253-
"border-inline-end-color",
2251+
"border-inline-end-width",
2252+
"border-inline-start-style",
22542253
"border-inline-end-style",
2255-
"border-inline-end-width"
2254+
"border-inline-start-color",
2255+
"border-inline-end-color"
22562256
]
22572257
},
22582258
"specification": {

0 commit comments

Comments
 (0)
0