| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 38e4769eb1be01c306945cf384c77124653daae5..0f40565fa290e901720b33d25945c60163da143c 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -2674,8 +2674,8 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
|
| case CSSPropertyWebkitBorderRadius:
|
| case CSSPropertyWebkitColumns:
|
| case CSSPropertyWebkitColumnRule:
|
| - case CSSPropertyWebkitFlex:
|
| - case CSSPropertyWebkitFlexFlow:
|
| + case CSSPropertyFlex:
|
| + case CSSPropertyFlexFlow:
|
| case CSSPropertyGridColumn:
|
| case CSSPropertyGridRow:
|
| case CSSPropertyGridArea:
|
| @@ -3210,16 +3210,16 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
|
| case CSSPropertyWebkitColumnRuleWidth:
|
| case CSSPropertyWebkitColumnSpan:
|
| case CSSPropertyWebkitColumnWidth:
|
| - case CSSPropertyWebkitAlignContent:
|
| - case CSSPropertyWebkitAlignItems:
|
| - case CSSPropertyWebkitAlignSelf:
|
| - case CSSPropertyWebkitFlexBasis:
|
| - case CSSPropertyWebkitFlexDirection:
|
| - case CSSPropertyWebkitFlexGrow:
|
| - case CSSPropertyWebkitFlexShrink:
|
| - case CSSPropertyWebkitFlexWrap:
|
| - case CSSPropertyWebkitJustifyContent:
|
| - case CSSPropertyWebkitOrder:
|
| + case CSSPropertyAlignContent:
|
| + case CSSPropertyAlignItems:
|
| + case CSSPropertyAlignSelf:
|
| + case CSSPropertyFlexBasis:
|
| + case CSSPropertyFlexDirection:
|
| + case CSSPropertyFlexGrow:
|
| + case CSSPropertyFlexShrink:
|
| + case CSSPropertyFlexWrap:
|
| + case CSSPropertyJustifyContent:
|
| + case CSSPropertyOrder:
|
| case CSSPropertyWebkitFlowFrom:
|
| case CSSPropertyWebkitFlowInto:
|
| case CSSPropertyWebkitFontKerning:
|
|
|