| Index: Source/core/css/StylePropertyShorthand.cpp
|
| diff --git a/Source/core/css/StylePropertyShorthand.cpp b/Source/core/css/StylePropertyShorthand.cpp
|
| index 494b2170c0514d39d7873f28ea64733f888e84da..010aa4ad5c55da3aedd1bc4e46310c6ff80daad9 100644
|
| --- a/Source/core/css/StylePropertyShorthand.cpp
|
| +++ b/Source/core/css/StylePropertyShorthand.cpp
|
| @@ -344,18 +344,18 @@ const StylePropertyShorthand& webkitColumnRuleShorthand()
|
| return webkitColumnRuleLonghands;
|
| }
|
|
|
| -const StylePropertyShorthand& webkitFlexFlowShorthand()
|
| +const StylePropertyShorthand& flexFlowShorthand()
|
| {
|
| - static const CSSPropertyID flexFlowProperties[] = { CSSPropertyWebkitFlexDirection, CSSPropertyWebkitFlexWrap };
|
| - DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitFlexFlowLonghands, (flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties)));
|
| - return webkitFlexFlowLonghands;
|
| + static const CSSPropertyID flexFlowProperties[] = { CSSPropertyFlexDirection, CSSPropertyFlexWrap };
|
| + DEFINE_STATIC_LOCAL(StylePropertyShorthand, flexFlowLonghands, (flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties)));
|
| + return flexFlowLonghands;
|
| }
|
|
|
| -const StylePropertyShorthand& webkitFlexShorthand()
|
| +const StylePropertyShorthand& flexShorthand()
|
| {
|
| - static const CSSPropertyID flexProperties[] = { CSSPropertyWebkitFlexGrow, CSSPropertyWebkitFlexShrink, CSSPropertyWebkitFlexBasis };
|
| - DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitFlexLonghands, (flexProperties, WTF_ARRAY_LENGTH(flexProperties)));
|
| - return webkitFlexLonghands;
|
| + static const CSSPropertyID flexProperties[] = { CSSPropertyFlexGrow, CSSPropertyFlexShrink, CSSPropertyFlexBasis };
|
| + DEFINE_STATIC_LOCAL(StylePropertyShorthand, flexLonghands, (flexProperties, WTF_ARRAY_LENGTH(flexProperties)));
|
| + return flexLonghands;
|
| }
|
|
|
| const StylePropertyShorthand& webkitMarginCollapseShorthand()
|
| @@ -542,10 +542,10 @@ const StylePropertyShorthand& shorthandForProperty(CSSPropertyID propertyID)
|
| return webkitColumnsShorthand();
|
| case CSSPropertyWebkitColumnRule:
|
| return webkitColumnRuleShorthand();
|
| - case CSSPropertyWebkitFlex:
|
| - return webkitFlexShorthand();
|
| - case CSSPropertyWebkitFlexFlow:
|
| - return webkitFlexFlowShorthand();
|
| + case CSSPropertyFlex:
|
| + return flexShorthand();
|
| + case CSSPropertyFlexFlow:
|
| + return flexFlowShorthand();
|
| case CSSPropertyGridColumn:
|
| return gridColumnShorthand();
|
| case CSSPropertyGridRow:
|
|
|