Rename enums/functions that collide in chromium style in core/style/

third_party/WebKit/Source/core/css/CSSProperties.in

 // This file specifies all the CSS properties we support and the necessary
 // information for our code generation. The various supported arguments
 // are described below with example usage
 
 
 // - alias_for=other-property
 // Properties specifying alias_for should be virtually identical to the
 // properties they alias. Minor parsing differences are allowed as long as
 // the CSSValues created are of the same format of the aliased property.
 
@@ skipping 77 matching lines @@
 font-size interpolable, inherited, font, name_for_methods=Size, converter=convertFontSize
 font-size-adjust runtime_flag=CSSFontSizeAdjust, interpolable, inherited, font, name_for_methods=SizeAdjust, converter=convertFontSizeAdjust
 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 interpolable, inherited, font, type_name=FontWeight, name_for_methods=Weight, converter=convertFontWeight
 font-feature-settings inherited, font, name_for_methods=FeatureSettings, converter=convertFontFeatureSettings
 -webkit-font-smoothing inherited, font, type_name=FontSmoothingMode
 -webkit-locale inherited, font, custom_value
-text-orientation inherited, custom_value
--webkit-text-orientation inherited, custom_value
-writing-mode inherited, custom_value
--webkit-writing-mode inherited, custom_value
+text-orientation inherited, custom_value, type_name=TextOrientation
+-webkit-text-orientation inherited, custom_value, type_name=TextOrientation
+writing-mode inherited, custom_value, type_name=WritingMode
+-webkit-writing-mode inherited, custom_value, type_name=WritingMode
 text-rendering inherited, font, type_name=TextRenderingMode
 zoom custom_all
 
 align-content initial=initialContentAlignment, converter=convertContentAlignmentData
 align-items initial=initialSelfAlignment, converter=convertSelfOrDefaultAlignmentData
 alignment-baseline svg
 align-self initial=initialSelfAlignment, converter=convertSelfOrDefaultAlignmentData
 animation-delay custom_all
 animation-direction custom_all
 animation-duration custom_all
@@ skipping 71 matching lines @@
 filter svg, name_for_methods=FilterResource, converter=convertFragmentIdentifier
 flex-basis interpolable, converter=convertLengthOrAuto
 flex-direction
 flex-grow interpolable, type_name=float
 flex-shrink interpolable, type_name=float
 flex-wrap
 float type_name=EFloat, name_for_methods=Floating
 flood-color interpolable, svg, converter=convertColor
 flood-opacity interpolable, svg, converter=convertNumberOrPercentage
 grid-auto-columns runtime_flag=CSSGridLayout, converter=convertGridTrackSize
-grid-auto-flow runtime_flag=CSSGridLayout, converter=convertGridAutoFlow
+grid-auto-flow runtime_flag=CSSGridLayout, converter=convertGridAutoFlow, type_name=GridAutoFlow
 grid-auto-rows runtime_flag=CSSGridLayout, converter=convertGridTrackSize
 grid-column-end runtime_flag=CSSGridLayout, converter=convertGridPosition
 grid-column-gap runtime_flag=CSSGridLayout, converter=convertLength
 grid-column-start runtime_flag=CSSGridLayout, converter=convertGridPosition
 grid-row-end runtime_flag=CSSGridLayout, converter=convertGridPosition
 grid-row-gap runtime_flag=CSSGridLayout, converter=convertLength
 grid-row-start runtime_flag=CSSGridLayout, converter=convertGridPosition
 grid-template-areas runtime_flag=CSSGridLayout, custom_all
 grid-template-columns runtime_flag=CSSGridLayout, custom_all
 grid-template-rows runtime_flag=CSSGridLayout, custom_all
@@ skipping 73 matching lines @@
 stop-opacity interpolable, svg, converter=convertNumberOrPercentage
 stroke interpolable, inherited, svg, setter=setStrokePaint, custom_all
 stroke-dasharray interpolable, inherited, svg, name_for_methods=StrokeDashArray, converter=convertStrokeDasharray
 stroke-dashoffset interpolable, inherited, svg, name_for_methods=StrokeDashOffset, converter=convertLength
 stroke-linecap svg, inherited, type_name=LineCap, name_for_methods=CapStyle
 stroke-linejoin svg, inherited, type_name=LineJoin, name_for_methods=JoinStyle
 stroke-miterlimit interpolable, inherited, svg, type_name=float, name_for_methods=StrokeMiterLimit
 stroke-opacity interpolable, inherited, svg, converter=convertNumberOrPercentage
 stroke-width interpolable, inherited, svg, converter=convertUnzoomedLength
 table-layout
-tab-size inherited, converter=convertLengthOrTabSpaces
+tab-size inherited, converter=convertLengthOrTabSpaces, type_name=TabSize
 text-align inherited, custom_value
 text-align-last inherited, type_name=TextAlignLast
 text-anchor inherited, svg
 text-combine-upright inherited, type_name=TextCombine, name_for_methods=TextCombine
 // 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 use_handlers_for=CSSPropertyTextDecorationLine, longhands=text-decoration-line;text-decoration-style;text-decoration-color, type_name=TextDecoration

[danakj, 2016/02/26 23:36:39]

For most of the changes in this file, it was lying about the type_name (the
python assume EFooBar for foo-bar. It just didn't appear in generated code so it
got away with it. So mostly this is just making things more true.

The one here is the only weird one, where it uses the -line version for
everything, but setting the type_name there does the wrong thing. So, I put the
getter there instead explicitly.

The type_name here, then, is not needed, but seems strictly more correct, so I
left it since I'd typed it. Now I've typed 3 more paragraphs about it. Such is
life.

 text-decoration-color runtime_flag=CSS3TextDecorations, interpolable, custom_all
-text-decoration-line runtime_flag=CSS3TextDecorations, name_for_methods=TextDecoration, converter=convertFlags<TextDecoration>
+text-decoration-line runtime_flag=CSS3TextDecorations, name_for_methods=TextDecoration, getter=getTextDecoration, converter=convertFlags<TextDecoration>

[pdr., 2016/02/26 23:51:16]

Why a getter instead of a type_name?

[danakj, 2016/02/26 23:52:21]

See comment above. Its because of use_handlers_for there. type_name here broke
-line-specific stuff somewhere.

[danakj, 2016/02/26 23:58:04]

Well, I lied? I went to get you the specific error but it's working, so must
have been something else. Updated the CL.

 text-decoration-style runtime_flag=CSS3TextDecorations, type_name=TextDecorationStyle
 text-indent interpolable, inherited, custom_all
 text-justify runtime_flag=CSS3Text, inherited, type_name=TextJustify
 text-overflow type_name=TextOverflow
 text-shadow interpolable, inherited, converter=convertShadow
 text-transform inherited
 text-underline-position runtime_flag=CSS3TextDecorations, inherited, type_name=TextUnderlinePosition
 top interpolable, initial=initialOffset, converter=convertLengthOrAuto
-touch-action converter=convertFlags<TouchAction>
+touch-action converter=convertFlags<TouchAction>, type_name=TouchAction
 transform interpolable, custom_value
 transform-origin interpolable, converter=convertTransformOrigin
 transform-style name_for_methods=TransformStyle3D
 translate runtime_flag=CSSIndependentTransformProperties, converter=convertTranslate, interpolable
 rotate runtime_flag=CSSIndependentTransformProperties, converter=convertRotate, interpolable
 scale runtime_flag=CSSIndependentTransformProperties, converter=convertScale, interpolable
 transition-delay custom_all
 transition-duration custom_all
 transition-property custom_all
 transition-timing-function custom_all
@@ skipping 240 matching lines @@
 -webkit-shape-margin alias_for=shape-margin
 -webkit-shape-outside alias_for=shape-outside
 -webkit-transform alias_for=transform
 -webkit-transform-origin alias_for=transform-origin
 -webkit-transform-style alias_for=transform-style
 -webkit-transition alias_for=transition
 -webkit-transition-delay alias_for=transition-delay
 -webkit-transition-duration alias_for=transition-duration
 -webkit-transition-property alias_for=transition-property
 -webkit-transition-timing-function alias_for=transition-timing-function