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 3cb357bcb11b4f6a91f9e6da84b826c33373cfc4..1e236971826278ecca18506038d4e8e0592e23f3 100644 |
--- a/third_party/WebKit/Source/core/css/CSSProperties.in |
+++ b/third_party/WebKit/Source/core/css/CSSProperties.in |
@@ -337,13 +337,13 @@ y interpolable, svg, converter=convertLength |
-webkit-box-pack |
-webkit-box-reflect converter=convertBoxReflect |
-webkit-clip-path interpolable, custom_value |
--webkit-column-count interpolable, type_name=unsigned short, custom_all |
--webkit-column-gap interpolable, converter=convertComputedLength<float>, custom_all |
--webkit-column-rule-color interpolable, custom_all |
--webkit-column-rule-style type_name=EBorderStyle, initial=initialBorderStyle |
--webkit-column-rule-width interpolable, converter=convertLineWidth<unsigned short> |
--webkit-column-span type_name=ColumnSpan |
--webkit-column-width interpolable, converter=convertComputedLength<float>, custom_all |
+column-count interpolable, type_name=unsigned short, custom_all |
+column-gap interpolable, converter=convertComputedLength<float>, custom_all |
+column-rule-color interpolable, custom_all |
+column-rule-style type_name=EBorderStyle, initial=initialBorderStyle |
+column-rule-width interpolable, converter=convertLineWidth<unsigned short> |
+column-span type_name=ColumnSpan |
+column-width interpolable, converter=convertComputedLength<float>, custom_all |
-webkit-filter interpolable, converter=convertFilterOperations |
-webkit-highlight inherited, converter=convertString<CSSValueNone> |
-webkit-hyphenate-character inherited, name_for_methods=HyphenationString, converter=convertString<CSSValueAuto> |
@@ -485,8 +485,8 @@ transition longhands=transition-property;transition-duration;transition-timing-f |
-webkit-column-break-after longhands=break-after |
-webkit-column-break-before longhands=break-before |
-webkit-column-break-inside longhands=break-inside |
--webkit-column-rule longhands=-webkit-column-rule-width;-webkit-column-rule-style;-webkit-column-rule-color |
--webkit-columns longhands=-webkit-column-width;-webkit-column-count |
+column-rule longhands=column-rule-width;column-rule-style;column-rule-color |
+columns longhands=column-width;column-count |
-webkit-margin-collapse longhands=-webkit-margin-before-collapse;-webkit-margin-after-collapse |
-webkit-mask longhands=-webkit-mask-image;-webkit-mask-position-x;-webkit-mask-position-y;-webkit-mask-size;-webkit-mask-repeat-x;-webkit-mask-repeat-y;-webkit-mask-origin;-webkit-mask-clip |
-webkit-mask-box-image longhands=-webkit-mask-box-image-source;-webkit-mask-box-image-slice;-webkit-mask-box-image-width;-webkit-mask-box-image-outset;-webkit-mask-box-image-repeat |
@@ -529,6 +529,15 @@ transition longhands=transition-property;transition-duration;transition-timing-f |
-webkit-border-top-right-radius alias_for=border-top-right-radius |
-webkit-box-shadow alias_for=box-shadow |
-webkit-box-sizing alias_for=box-sizing |
+-webkit-column-count alias_for=column-count |
+-webkit-column-gap alias_for=column-gap |
+-webkit-column-rule alias_for=column-rule |
+-webkit-column-rule-color alias_for=column-rule-color |
+-webkit-column-rule-style alias_for=column-rule-style |
+-webkit-column-rule-width alias_for=column-rule-width |
+-webkit-column-span alias_for=column-span |
+-webkit-column-width alias_for=column-width |
+-webkit-columns alias_for=columns |
-webkit-flex alias_for=flex |
-webkit-flex-basis alias_for=flex-basis |
-webkit-flex-direction alias_for=flex-direction |