| 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 dd9a465ebe7663256e45ac43da84acb16e33359c..2785714d6b87278f1747f6f6956d8e41cac29f14 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSProperties.in
|
| +++ b/third_party/WebKit/Source/core/css/CSSProperties.in
|
| @@ -193,7 +193,7 @@ empty-cells inherited, type_name=EEmptyCells
|
| fill interpolable, inherited, svg, setter=setFillPaint, custom_all
|
| fill-opacity interpolable, inherited, svg, converter=convertNumberOrPercentage
|
| fill-rule inherited, svg, type_name=WindRule
|
| -filter svg, name_for_methods=FilterResource, converter=convertFragmentIdentifier
|
| +filter interpolable, converter=convertFilterOperations
|
| flex-basis interpolable, converter=convertLengthOrAuto
|
| flex-direction
|
| flex-grow interpolable, type_name=float
|
| @@ -357,7 +357,6 @@ 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>
|
| -webkit-line-break inherited, type_name=LineBreak
|
| @@ -552,6 +551,7 @@ columns longhands=column-width;column-count
|
| -webkit-column-span alias_for=column-span
|
| -webkit-column-width alias_for=column-width
|
| -webkit-columns alias_for=columns
|
| +-webkit-filter alias_for=filter
|
| -webkit-flex alias_for=flex
|
| -webkit-flex-basis alias_for=flex-basis
|
| -webkit-flex-direction alias_for=flex-direction
|
|
|