| Index: Source/core/css/StylePropertySerializer.cpp
|
| diff --git a/Source/core/css/StylePropertySerializer.cpp b/Source/core/css/StylePropertySerializer.cpp
|
| index d987e9ed9918cf9bd59b2c4e7f117f8f89567f07..3e2135c1d09ba66dc3c581e2a37c57e6786527c1 100644
|
| --- a/Source/core/css/StylePropertySerializer.cpp
|
| +++ b/Source/core/css/StylePropertySerializer.cpp
|
| @@ -174,14 +174,14 @@ String StylePropertySerializer::asText() const
|
| case CSSPropertyWebkitAnimationFillMode:
|
| shorthandPropertyID = CSSPropertyWebkitAnimation;
|
| break;
|
| - case CSSPropertyWebkitFlexDirection:
|
| - case CSSPropertyWebkitFlexWrap:
|
| - shorthandPropertyID = CSSPropertyWebkitFlexFlow;
|
| + case CSSPropertyFlexDirection:
|
| + case CSSPropertyFlexWrap:
|
| + shorthandPropertyID = CSSPropertyFlexFlow;
|
| break;
|
| - case CSSPropertyWebkitFlexBasis:
|
| - case CSSPropertyWebkitFlexGrow:
|
| - case CSSPropertyWebkitFlexShrink:
|
| - shorthandPropertyID = CSSPropertyWebkitFlex;
|
| + case CSSPropertyFlexBasis:
|
| + case CSSPropertyFlexGrow:
|
| + case CSSPropertyFlexShrink:
|
| + shorthandPropertyID = CSSPropertyFlex;
|
| break;
|
| case CSSPropertyWebkitMaskPositionX:
|
| case CSSPropertyWebkitMaskPositionY:
|
| @@ -342,10 +342,10 @@ String StylePropertySerializer::getPropertyValue(CSSPropertyID propertyID) const
|
| return getShorthandValue(webkitColumnRuleShorthand());
|
| case CSSPropertyWebkitColumns:
|
| return getShorthandValue(webkitColumnsShorthand());
|
| - case CSSPropertyWebkitFlex:
|
| - return getShorthandValue(webkitFlexShorthand());
|
| - case CSSPropertyWebkitFlexFlow:
|
| - return getShorthandValue(webkitFlexFlowShorthand());
|
| + case CSSPropertyFlex:
|
| + return getShorthandValue(flexShorthand());
|
| + case CSSPropertyFlexFlow:
|
| + return getShorthandValue(flexFlowShorthand());
|
| case CSSPropertyGridColumn:
|
| return getShorthandValue(gridColumnShorthand());
|
| case CSSPropertyGridRow:
|
|
|