third_party/WebKit/Source/core/css/CSSProperties.in - Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/

Unified Diff: third_party/WebKit/Source/core/css/CSSProperties.in

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8

Patch Set: get-names-9: type_name Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp ('k') | third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/Source/core/css/CSSProperties.in b/third_party/WebKit/Source/core/css/CSSProperties.in

index 1e4e23968cae639a7e35df0514b807f1194b4d7f..5e27bc899fdf461a3afd4062e791625ad7080cf0 100644

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

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

@@ -95,10 +95,10 @@ font-weight interpolable, inherited, font, type_name=FontWeight, name_for_method

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

@@ -190,7 +190,7 @@ 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

@@ -284,7 +284,7 @@ stroke-miterlimit interpolable, inherited, svg, type_name=float, name_for_method

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

@@ -292,7 +292,7 @@ text-combine-upright inherited, type_name=TextCombine, name_for_methods=TextComb

// 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 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, type_name=TextDecoration, converter=convertFlags<TextDecoration>

danakj 2016/02/26 23:59:33 OIC, if I remove the name_for_methods, then it bre

text-decoration-style runtime_flag=CSS3TextDecorations, type_name=TextDecorationStyle

text-indent interpolable, inherited, custom_all

text-justify runtime_flag=CSS3Text, inherited, type_name=TextJustify

@@ -301,7 +301,7 @@ 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