Revert refactoring of CSSProperty .in files

Source/core/css/CSSProperties.in

Index: Source/core/css/CSSProperties.in
diff --git a/Source/core/css/CSSProperties.in b/Source/core/css/CSSProperties.in
index 08efb2151d7a1091f979046b288494773dbe657f..139102c096b22fbb63c1ec913f6467a059c2d179 100644
--- a/Source/core/css/CSSProperties.in
+++ b/Source/core/css/CSSProperties.in
@@ -3,27 +3,10 @@
 // are described below with example usage
 
 
-// - alias_for=other-property
-// Properties specifying alias_for do not get their own enum and instead map
-// directly onto the CSSPropertyID they alias. Currently this means that the
-// UseCounter will not pick up on these (crbug.com/304855)
-
-
 // - longhands=property;other-property
 // The property is a shorthand for several other properties.
 
 
-// Flags which go into CSSPropertyMetadata:
-// - animatable
-// The animatable flag indicates whether a property can be animated by CSS
-// animations and transitions. If this flag is set, the property should also be
-// added to the switch statements in AnimatedStyleBuilder, CSSPropertyEquality,
-// and CSSAnimatableValueFactory.
-// - inherited
-// The property will inherit by default if no value is specified, typically
-// mentioned in specifications as "Inherited: yes"
-
-
 // The remaining arguments are used for the StyleBuilder and allow us to
 // succinctly describe how to apply properties. When default handlers are not
 // sufficient, we should prefer to use converter, and failing that define
@@ -76,27 +59,24 @@
 
 // High Priority and all other font properties.
 // Other properties can depend upon high priority properties (e.g. font-size / ems)
-color animatable, inherited, custom_all
-direction inherited, custom_value
+color custom_all
 // FIXME: This is a mess due to crbug.com/353932. Shorthands shouldn't have
 // any StyleBuilder handling!
 font custom_all, longhands=font-family;font-size;font-style;font-variant;font-weight;font-stretch;line-height
-font-family inherited, custom_all
-font-kerning inherited, font, type_name=FontDescription::Kerning, name_for_methods=Kerning
-font-size animatable, inherited, custom_all
-font-stretch inherited, font, type_name=FontStretch, name_for_methods=Stretch
-font-style inherited, font, type_name=FontStyle, name_for_methods=Style
-font-variant inherited, font, type_name=FontVariant, name_for_methods=Variant
-font-variant-ligatures inherited, font, name_for_methods=VariantLigatures, converter=convertFontVariantLigatures
-font-weight animatable, inherited, font, type_name=FontWeight, name_for_methods=Weight, converter=convertFontWeight
--webkit-font-feature-settings inherited, font, name_for_methods=FeatureSettings, converter=convertFontFeatureSettings
--webkit-font-smoothing inherited, font, type_name=FontSmoothingMode
--webkit-locale inherited, custom_value
--webkit-text-orientation inherited, custom_value
--webkit-writing-mode inherited, custom_value
-text-rendering inherited, font, type_name=TextRenderingMode
-zoom animatable, custom_all
-line-height animatable, inherited, getter=specifiedLineHeight, custom_value
+font-family custom_all
+font-kerning font, type_name=FontDescription::Kerning, name_for_methods=Kerning
+font-size custom_all
+font-stretch font, type_name=FontStretch, name_for_methods=Stretch
+font-style font, type_name=FontStyle, name_for_methods=Style
+font-variant font, type_name=FontVariant, name_for_methods=Variant
+font-variant-ligatures font, name_for_methods=VariantLigatures, converter=convertFontVariantLigatures
+font-weight font, type_name=FontWeight, name_for_methods=Weight, converter=convertFontWeight
+-webkit-font-feature-settings font, name_for_methods=FeatureSettings, converter=convertFontFeatureSettings
+-webkit-font-smoothing font, type_name=FontSmoothingMode
+-webkit-locale custom_value
+-webkit-text-orientation custom_value
+text-rendering font, type_name=TextRenderingMode
+zoom custom_all
 
 align-content
 align-items custom_all
@@ -106,71 +86,72 @@ backface-visibility
 background-attachment custom_all
 background-blend-mode custom_all
 background-clip custom_all
-background-color animatable, custom_all
-background-image animatable, custom_all
+background-color custom_all
+background-image custom_all
 background-origin custom_all
-background-position-x animatable, custom_all
-background-position-y animatable, custom_all
+background-position-x custom_all
+background-position-y custom_all
 background-repeat-x custom_all
 background-repeat-y custom_all
-background-size animatable, custom_all
-baseline-shift animatable, svg, custom_inherit, custom_value
-border-bottom-color animatable, custom_all
-border-bottom-left-radius animatable, initial=initialBorderRadius, converter=convertRadius
-border-bottom-right-radius animatable, initial=initialBorderRadius, converter=convertRadius
+background-size custom_all
+baseline-shift svg, custom_inherit, custom_value
+border-bottom-color custom_all
+border-bottom-left-radius initial=initialBorderRadius, converter=convertRadius
+border-bottom-right-radius initial=initialBorderRadius, converter=convertRadius
 border-bottom-style type_name=EBorderStyle, initial=initialBorderStyle
-border-bottom-width animatable, initial=initialBorderWidth, converter=convertLineWidth<unsigned>
-border-collapse inherited
-border-image-outset animatable, custom_all
+border-bottom-width initial=initialBorderWidth, converter=convertLineWidth<unsigned>
+border-collapse
+border-image-outset custom_all
 border-image-repeat custom_all
-border-image-slice animatable, custom_all
-border-image-source animatable, custom_value
-border-image-width animatable, custom_all
-border-left-color animatable, custom_all
+border-image-slice custom_all
+border-image-source custom_value
+border-image-width custom_all
+border-left-color custom_all
 border-left-style type_name=EBorderStyle, initial=initialBorderStyle
-border-left-width animatable, initial=initialBorderWidth, converter=convertLineWidth<unsigned>
-border-right-color animatable, custom_all
+border-left-width initial=initialBorderWidth, converter=convertLineWidth<unsigned>
+border-right-color custom_all
 border-right-style type_name=EBorderStyle, initial=initialBorderStyle
-border-right-width animatable, initial=initialBorderWidth, converter=convertLineWidth<unsigned>
-border-top-color animatable, custom_all
-border-top-left-radius animatable, initial=initialBorderRadius, converter=convertRadius
-border-top-right-radius animatable, initial=initialBorderRadius, converter=convertRadius
+border-right-width initial=initialBorderWidth, converter=convertLineWidth<unsigned>
+border-top-color custom_all
+border-top-left-radius initial=initialBorderRadius, converter=convertRadius
+border-top-right-radius initial=initialBorderRadius, converter=convertRadius
 border-top-style type_name=EBorderStyle, initial=initialBorderStyle
-border-top-width animatable, initial=initialBorderWidth, converter=convertLineWidth<unsigned>
-bottom animatable, initial=initialOffset, converter=convertLengthOrAuto
-box-shadow animatable, converter=convertShadow
+border-top-width initial=initialBorderWidth, converter=convertLineWidth<unsigned>
+bottom initial=initialOffset, converter=convertLengthOrAuto
+box-shadow converter=convertShadow
 box-sizing
 buffered-rendering svg
-caption-side inherited
+caption-side
 clear
-clip animatable, custom_all
+clip custom_all
 clip-path svg, name_for_methods=ClipperResource, converter=convertFragmentIdentifier
-clip-rule inherited, svg, type_name=WindRule
-color-interpolation inherited, svg
-color-interpolation-filters inherited, svg, type_name=EColorInterpolation
-color-rendering inherited, svg
+clip-rule svg, type_name=WindRule
+color-interpolation svg
+color-interpolation-filters svg, type_name=EColorInterpolation
+color-rendering svg
 column-fill type_name=ColumnFill
 content custom_all
 counter-increment custom_all
 counter-reset custom_all
-cursor inherited, custom_all
+cursor custom_all
+direction custom_value
 display
 dominant-baseline svg
-empty-cells inherited, type_name=EEmptyCell
-fill animatable, inherited, svg, setter=setFillPaint, custom_all
-fill-opacity animatable, inherited, svg, converter=convertNumberOrPercentage
-fill-rule inherited, svg, type_name=WindRule
+empty-cells type_name=EEmptyCell
+fill svg, setter=setFillPaint, custom_all
+fill-opacity svg, converter=convertNumberOrPercentage
+fill-rule svg, type_name=WindRule
 filter svg, name_for_methods=FilterResource, converter=convertFragmentIdentifier
-flex-basis animatable, converter=convertLengthOrAuto
+flex-basis converter=convertLengthOrAuto
 flex-direction
-flex-grow animatable, type_name=float
-flex-shrink animatable, type_name=float
+flex-grow type_name=float
+flex-shrink type_name=float
 flex-wrap
 float type_name=EFloat, name_for_methods=Floating
-flood-color animatable, svg, converter=convertSVGColor
-flood-opacity animatable, svg, converter=convertNumberOrPercentage
-glyph-orientation-horizontal inherited, svg, converter=convertGlyphOrientation
-glyph-orientation-vertical inherited, svg, custom_value
+flood-color svg, converter=convertSVGColor
+flood-opacity svg, converter=convertNumberOrPercentage
+glyph-orientation-horizontal svg, converter=convertGlyphOrientation
+glyph-orientation-vertical svg, custom_value
 grid-auto-columns converter=convertGridTrackSize
 grid-auto-flow custom_value
 grid-auto-rows converter=convertGridTrackSize
@@ -181,104 +162,106 @@ grid-row-start converter=convertGridPosition
 grid-template-areas custom_all
 grid-template-columns custom_all
 grid-template-rows custom_all
-height animatable, initial=initialSize, converter=convertLengthSizing
-image-rendering inherited
+height initial=initialSize, converter=convertLengthSizing
+image-rendering
 isolation
 justify-content
 justify-items custom_all
 justify-self custom_all
-left animatable, initial=initialOffset, converter=convertLengthOrAuto
-letter-spacing animatable, inherited, initial=initialLetterWordSpacing, converter=convertSpacing
-lighting-color animatable, svg, converter=convertSVGColor
-list-style-image animatable, inherited, custom_value
-list-style-position inherited
-list-style-type inherited
-margin-bottom animatable, initial=initialMargin, converter=convertLengthOrAuto
-margin-left animatable, initial=initialMargin, converter=convertLengthOrAuto
-margin-right animatable, initial=initialMargin, converter=convertLengthOrAuto
-margin-top animatable, initial=initialMargin, converter=convertLengthOrAuto
-marker-end inherited, svg, name_for_methods=MarkerEndResource, converter=convertFragmentIdentifier
-marker-mid inherited, svg, name_for_methods=MarkerMidResource, converter=convertFragmentIdentifier
-marker-start inherited, svg, name_for_methods=MarkerStartResource, converter=convertFragmentIdentifier
+left initial=initialOffset, converter=convertLengthOrAuto
+letter-spacing initial=initialLetterWordSpacing, converter=convertSpacing
+lighting-color svg, converter=convertSVGColor
+line-height getter=specifiedLineHeight, custom_value
+list-style-image custom_value
+list-style-position
+list-style-type
+margin-bottom initial=initialMargin, converter=convertLengthOrAuto
+margin-left initial=initialMargin, converter=convertLengthOrAuto
+margin-right initial=initialMargin, converter=convertLengthOrAuto
+margin-top initial=initialMargin, converter=convertLengthOrAuto
+marker-end svg, name_for_methods=MarkerEndResource, converter=convertFragmentIdentifier
+marker-mid svg, name_for_methods=MarkerMidResource, converter=convertFragmentIdentifier
+marker-start svg, name_for_methods=MarkerStartResource, converter=convertFragmentIdentifier
 mask svg, name_for_methods=MaskerResource, converter=convertFragmentIdentifier
 mask-source-type custom_all
 mask-type svg
-max-height animatable, initial=initialMaxSize, converter=convertLengthMaxSizing
-max-width animatable, initial=initialMaxSize, converter=convertLengthMaxSizing
-min-height animatable, initial=initialMinSize, converter=convertLengthSizing
-min-width animatable, initial=initialMinSize, converter=convertLengthSizing
+max-height initial=initialMaxSize, converter=convertLengthMaxSizing
+max-width initial=initialMaxSize, converter=convertLengthMaxSizing
+min-height initial=initialMinSize, converter=convertLengthSizing
+min-width initial=initialMinSize, converter=convertLengthSizing
 mix-blend-mode type_name=blink::WebBlendMode, name_for_methods=BlendMode
 object-fit type_name=ObjectFit
-object-position animatable, converter=convertLengthPoint
-opacity animatable, type_name=float
+object-position converter=convertLengthPoint
+opacity type_name=float
 order type_name=int
-orphans animatable, inherited, type_name=short, custom_all
-outline-color animatable, custom_all
-outline-offset animatable, converter=convertComputedLength<int>
+orphans type_name=short, custom_all
+outline-color custom_all
+outline-offset converter=convertComputedLength<int>
 outline-style custom_all
-outline-width animatable, converter=convertLineWidth<unsigned short>
-overflow-wrap inherited
+outline-width converter=convertLineWidth<unsigned short>
+overflow-wrap
 overflow-x type_name=EOverflow
 overflow-y type_name=EOverflow
-padding-bottom animatable, initial=initialPadding, converter=convertLength
-padding-left animatable, initial=initialPadding, converter=convertLength
-padding-right animatable, initial=initialPadding, converter=convertLength
-padding-top animatable, initial=initialPadding, converter=convertLength
+padding-bottom initial=initialPadding, converter=convertLength
+padding-left initial=initialPadding, converter=convertLength
+padding-right initial=initialPadding, converter=convertLength
+padding-top initial=initialPadding, converter=convertLength
 page-break-after type_name=EPageBreak, initial=initialPageBreak
 page-break-before type_name=EPageBreak, initial=initialPageBreak
 page-break-inside type_name=EPageBreak, initial=initialPageBreak
-paint-order inherited, svg, converter=convertPaintOrder
-perspective animatable, custom_value
-perspective-origin animatable, custom_all
-pointer-events inherited
+paint-order svg, converter=convertPaintOrder
+perspective custom_value
+perspective-origin custom_all
+pointer-events
 position
-quotes inherited, converter=convertQuotes
-// FIXME: This shouldn't be inherited, as per css-ui
-resize inherited, custom_value
-right animatable, initial=initialOffset, converter=convertLengthOrAuto
+quotes converter=convertQuotes
+resize custom_value
+right initial=initialOffset, converter=convertLengthOrAuto
 scroll-behavior type_name=ScrollBehavior
-shape-image-threshold animatable, type_name=float
-shape-margin animatable, converter=convertLength
-shape-outside animatable, custom_value
-shape-rendering inherited, svg
+shape-image-threshold type_name=float
+shape-margin converter=convertLength
+shape-outside custom_value
+shape-rendering svg
 size custom_all
-speak inherited
-stop-color animatable, svg, converter=convertSVGColor
-stop-opacity animatable, svg, converter=convertNumberOrPercentage
-stroke animatable, inherited, svg, setter=setStrokePaint, custom_all
-stroke-dasharray animatable, inherited, svg, name_for_methods=StrokeDashArray, converter=convertStrokeDasharray
-stroke-dashoffset animatable, inherited, svg, name_for_methods=StrokeDashOffset, converter=convertSVGLength
-stroke-linecap svg, inherited, type_name=LineCap, name_for_methods=CapStyle
-stroke-linejoin svg, inherited, type_name=LineJoin, name_for_methods=JoinStyle
-stroke-miterlimit animatable, inherited, svg, type_name=float, name_for_methods=StrokeMiterLimit
-stroke-opacity animatable, inherited, svg, converter=convertNumberOrPercentage
-stroke-width animatable, inherited, svg, converter=convertSVGLength
+speak
+stop-color svg, converter=convertSVGColor
+stop-opacity svg, converter=convertNumberOrPercentage
+stroke svg, setter=setStrokePaint, custom_all
+stroke-dasharray svg, name_for_methods=StrokeDashArray, converter=convertStrokeDasharray
+stroke-dashoffset svg, name_for_methods=StrokeDashOffset, converter=convertSVGLength
+stroke-linecap svg, type_name=LineCap, name_for_methods=CapStyle
+stroke-linejoin svg, type_name=LineJoin, name_for_methods=JoinStyle
+stroke-miterlimit svg, type_name=float, name_for_methods=StrokeMiterLimit
+stroke-opacity svg, converter=convertNumberOrPercentage
+stroke-width svg, converter=convertSVGLength
 table-layout
-tab-size inherited, type_name=unsigned
-text-align inherited, custom_value
-text-align-last inherited, type_name=TextAlignLast
-text-anchor inherited, svg
+tab-size type_name=unsigned
+text-align custom_value
+text-align-last type_name=TextAlignLast
+text-anchor svg
 // FIXME: We shouldn't switch between shorthand/not shorthand based on a runtime flag
 text-decoration use_handlers_for=CSSPropertyTextDecorationLine, longhands=text-decoration-line;text-decoration-style;text-decoration-color
-text-decoration-color animatable, custom_all
+text-decoration-color custom_all
 text-decoration-line name_for_methods=TextDecoration, converter=convertFlags<TextDecoration>
 text-decoration-style type_name=TextDecorationStyle
-text-indent animatable, inherited, custom_all
-text-justify inherited, type_name=TextJustify
+text-indent custom_all
+text-justify type_name=TextJustify
 text-overflow type_name=TextOverflow
-text-shadow animatable, inherited, converter=convertShadow
-text-transform inherited
-text-underline-position inherited, type_name=TextUnderlinePosition
-top animatable, initial=initialOffset, converter=convertLengthOrAuto
+text-shadow converter=convertShadow
+text-transform
+text-underline-position type_name=TextUnderlinePosition
+top initial=initialOffset, converter=convertLengthOrAuto
 touch-action converter=convertFlags<TouchAction>
-touch-action-delay inherited, type_name=TouchActionDelay
-transform animatable, custom_value
-transform-origin animatable, custom_all
+touch-action-delay type_name=TouchActionDelay
+transform custom_value
+transform-origin custom_all
 transform-style name_for_methods=TransformStyle3D
 unicode-bidi
 vector-effect svg
-vertical-align animatable, custom_inherit, custom_value
-visibility animatable, inherited
+vertical-align custom_inherit, custom_value
+visibility
+// UAs must treat 'word-wrap' as an alternate name for the 'overflow-wrap' property. So using the same handlers.
+word-wrap name_for_methods=OverflowWrap
 -webkit-animation-delay custom_all
 -webkit-animation-direction custom_all
 -webkit-animation-duration custom_all
@@ -289,19 +272,19 @@ visibility animatable, inherited
 -webkit-animation-timing-function custom_all
 -webkit-appearance type_name=ControlPart
 -webkit-app-region custom_all
--webkit-aspect-ratio inherited, custom_all
+-webkit-aspect-ratio custom_all
 -webkit-backface-visibility use_handlers_for=CSSPropertyBackfaceVisibility
 -webkit-background-clip use_handlers_for=CSSPropertyBackgroundClip
 -webkit-background-composite custom_all
 -webkit-background-origin use_handlers_for=CSSPropertyBackgroundOrigin
--webkit-background-size animatable, use_handlers_for=CSSPropertyBackgroundSize
+-webkit-background-size use_handlers_for=CSSPropertyBackgroundSize
 -webkit-border-fit
--webkit-border-horizontal-spacing animatable, inherited, name_for_methods=HorizontalBorderSpacing, converter=convertComputedLength<short>
+-webkit-border-horizontal-spacing name_for_methods=HorizontalBorderSpacing, converter=convertComputedLength<short>
 -webkit-border-image initial=initialNinePieceImage, custom_value
--webkit-border-vertical-spacing animatable, inherited, name_for_methods=VerticalBorderSpacing, converter=convertComputedLength<short>
+-webkit-border-vertical-spacing name_for_methods=VerticalBorderSpacing, converter=convertComputedLength<short>
 -webkit-box-align type_name=EBoxAlignment
 -webkit-box-decoration-break
--webkit-box-direction inherited
+-webkit-box-direction
 -webkit-box-flex type_name=float
 -webkit-box-flex-group type_name=unsigned int
 -webkit-box-lines
@@ -309,58 +292,58 @@ visibility animatable, inherited
 -webkit-box-orient
 -webkit-box-pack
 -webkit-box-reflect converter=convertBoxReflect
--webkit-box-shadow animatable, use_handlers_for=CSSPropertyBoxShadow
--webkit-clip-path animatable, custom_value
+-webkit-box-shadow use_handlers_for=CSSPropertyBoxShadow
+-webkit-clip-path custom_value
 -webkit-column-break-after type_name=EPageBreak, initial=initialPageBreak
 -webkit-column-break-before type_name=EPageBreak, initial=initialPageBreak
 -webkit-column-break-inside type_name=EPageBreak, initial=initialPageBreak
--webkit-column-count animatable, type_name=unsigned short, custom_all
--webkit-column-gap animatable, type_name=float, custom_all
--webkit-column-rule-color animatable, custom_all
+-webkit-column-count type_name=unsigned short, custom_all
+-webkit-column-gap type_name=float, custom_all
+-webkit-column-rule-color custom_all
 -webkit-column-rule-style type_name=EBorderStyle, initial=initialBorderStyle
--webkit-column-rule-width animatable, converter=convertLineWidth<unsigned short>
+-webkit-column-rule-width converter=convertLineWidth<unsigned short>
 -webkit-column-span type_name=ColumnSpan
--webkit-column-width animatable, type_name=float, custom_all
--webkit-filter animatable, custom_value
--webkit-highlight inherited, converter=convertString<CSSValueNone>
--webkit-hyphenate-character inherited, name_for_methods=HyphenationString, converter=convertString<CSSValueAuto>
--webkit-line-box-contain inherited, converter=convertLineBoxContain
--webkit-line-break inherited, type_name=LineBreak
+-webkit-column-width type_name=float, custom_all
+-webkit-filter custom_value
+-webkit-highlight converter=convertString<CSSValueNone>
+-webkit-hyphenate-character name_for_methods=HyphenationString, converter=convertString<CSSValueAuto>
+-webkit-line-box-contain converter=convertLineBoxContain
+-webkit-line-break type_name=LineBreak
 -webkit-line-clamp type_name=LineClampValue
 -webkit-margin-after-collapse type_name=EMarginCollapse
 -webkit-margin-before-collapse type_name=EMarginCollapse
 -webkit-margin-bottom-collapse type_name=EMarginCollapse, name_for_methods=MarginAfterCollapse
 -webkit-margin-top-collapse type_name=EMarginCollapse, name_for_methods=MarginBeforeCollapse
--webkit-mask-box-image-outset animatable, custom_all
+-webkit-mask-box-image-outset custom_all
 -webkit-mask-box-image-repeat custom_all
--webkit-mask-box-image-slice animatable, custom_all
--webkit-mask-box-image-source animatable, custom_value
--webkit-mask-box-image-width animatable, custom_all
+-webkit-mask-box-image-slice custom_all
+-webkit-mask-box-image-source custom_value
+-webkit-mask-box-image-width custom_all
 -webkit-mask-clip custom_all
 -webkit-mask-composite custom_all
--webkit-mask-image animatable, custom_all
+-webkit-mask-image custom_all
 -webkit-mask-origin custom_all
--webkit-mask-position-x animatable, custom_all
--webkit-mask-position-y animatable, custom_all
+-webkit-mask-position-x custom_all
+-webkit-mask-position-y custom_all
 -webkit-mask-repeat-x custom_all
 -webkit-mask-repeat-y custom_all
--webkit-mask-size animatable, custom_all
+-webkit-mask-size custom_all
 -webkit-perspective custom_all
 -webkit-perspective-origin custom_all
 -webkit-perspective-origin-x converter=convertLength
 -webkit-perspective-origin-y converter=convertLength
--webkit-print-color-adjust inherited, type_name=PrintColorAdjust
--webkit-rtl-ordering inherited, type_name=Order, setter=setRTLOrdering, initial=initialRTLOrdering
--webkit-ruby-position inherited, type_name=RubyPosition
--webkit-tap-highlight-color inherited, converter=convertColor
--webkit-text-combine inherited, type_name=TextCombine
--webkit-text-emphasis-color inherited, custom_all
--webkit-text-emphasis-position inherited, type_name=TextEmphasisPosition
--webkit-text-emphasis-style inherited, custom_all
--webkit-text-fill-color inherited, custom_all
--webkit-text-security inherited
--webkit-text-stroke-color animatable, inherited, custom_all
--webkit-text-stroke-width inherited, converter=convertTextStrokeWidth
+-webkit-print-color-adjust type_name=PrintColorAdjust
+-webkit-rtl-ordering type_name=Order, setter=setRTLOrdering, initial=initialRTLOrdering
+-webkit-ruby-position type_name=RubyPosition
+-webkit-tap-highlight-color converter=convertColor
+-webkit-text-combine type_name=TextCombine
+-webkit-text-emphasis-color custom_all
+-webkit-text-emphasis-position type_name=TextEmphasisPosition
+-webkit-text-emphasis-style custom_all
+-webkit-text-fill-color custom_all
+-webkit-text-security
+-webkit-text-stroke-color custom_all
+-webkit-text-stroke-width converter=convertTextStrokeWidth
 -webkit-transform use_handlers_for=CSSPropertyTransform
 -webkit-transform-origin-x converter=convertLength
 -webkit-transform-origin-y converter=convertLength
@@ -371,18 +354,17 @@ visibility animatable, inherited
 -webkit-transition-property custom_all
 -webkit-transition-timing-function custom_all
 -webkit-user-drag
--webkit-user-modify inherited
--webkit-user-select inherited
-white-space inherited
-widows animatable, inherited, type_name=short, custom_all
-width animatable, initial=initialSize, converter=convertLengthSizing
+-webkit-user-modify
+-webkit-user-select
+-webkit-writing-mode custom_value
+white-space
+widows type_name=short, custom_all
+width initial=initialSize, converter=convertLengthSizing
 will-change custom_all
-word-break inherited
-word-spacing animatable, inherited, initial=initialLetterWordSpacing, converter=convertSpacing
-// UAs must treat 'word-wrap' as an alternate name for the 'overflow-wrap' property. So using the same handlers.
-word-wrap inherited, name_for_methods=OverflowWrap
-writing-mode inherited, svg, type_name=SVGWritingMode
-z-index animatable, type_name=int, custom_all
+word-break
+word-spacing initial=initialLetterWordSpacing, converter=convertSpacing
+writing-mode svg, type_name=SVGWritingMode
+z-index type_name=int, custom_all
 
 // Internal properties
 
@@ -448,7 +430,7 @@ transition-timing-function builder_skip
 unicode-range builder_skip
 user-zoom builder_skip
 -webkit-font-size-delta builder_skip
--webkit-text-decorations-in-effect inherited, builder_skip
+-webkit-text-decorations-in-effect builder_skip
 
 // Shorthands
 
@@ -499,36 +481,3 @@ transition longhands=transition-property;transition-duration;transition-timing-f
 -webkit-text-stroke longhands=-webkit-text-stroke-width;-webkit-text-stroke-color
 -webkit-transform-origin longhands=-webkit-transform-origin-x;-webkit-transform-origin-y;-webkit-transform-origin-z
 -webkit-transition longhands=-webkit-transition-property;-webkit-transition-duration;-webkit-transition-timing-function;-webkit-transition-delay
-
-// Aliases; these map to the same CSSPropertyID
-
--epub-caption-side alias_for=caption-side
--epub-text-combine alias_for=-webkit-text-combine
--epub-text-emphasis alias_for=-webkit-text-emphasis
--epub-text-emphasis-color alias_for=-webkit-text-emphasis-color
--epub-text-emphasis-style alias_for=-webkit-text-emphasis-style
--epub-text-orientation alias_for=-webkit-text-orientation
--epub-text-transform alias_for=text-transform
--epub-word-break alias_for=word-break
--epub-writing-mode alias_for=-webkit-writing-mode
--webkit-align-content alias_for=align-content
--webkit-align-items alias_for=align-items
--webkit-align-self alias_for=align-self
--webkit-border-bottom-left-radius alias_for=border-bottom-left-radius
--webkit-border-bottom-right-radius alias_for=border-bottom-right-radius
--webkit-border-top-left-radius alias_for=border-top-left-radius
--webkit-border-top-right-radius alias_for=border-top-right-radius
--webkit-box-sizing alias_for=box-sizing
--webkit-flex alias_for=flex
--webkit-flex-basis alias_for=flex-basis
--webkit-flex-direction alias_for=flex-direction
--webkit-flex-flow alias_for=flex-flow
--webkit-flex-grow alias_for=flex-grow
--webkit-flex-shrink alias_for=flex-shrink
--webkit-flex-wrap alias_for=flex-wrap
--webkit-justify-content alias_for=justify-content
--webkit-opacity alias_for=opacity
--webkit-order alias_for=order
--webkit-shape-image-threshold alias_for=shape-image-threshold
--webkit-shape-margin alias_for=shape-margin
--webkit-shape-outside alias_for=shape-outside