Chromium Code Reviews| Index: Source/core/css/CSSParser-in.cpp |
| diff --git a/Source/core/css/CSSParser-in.cpp b/Source/core/css/CSSParser-in.cpp |
| index 1b84bdac8a4396efd0e84ec9a1eca63928cb5eaf..77fc6cf00c10465e5cc4fcb4f85b97098df13824 100644 |
| --- a/Source/core/css/CSSParser-in.cpp |
| +++ b/Source/core/css/CSSParser-in.cpp |
| @@ -708,6 +708,12 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int |
| && ((valueID >= CSSValueLeft && valueID <= CSSValueJustify) || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueAuto)) |
| return true; |
| break; |
| + case CSSPropertyTextJustify: |
| + // auto | none | inter-word | distribute |
| + if (RuntimeEnabledFeatures::css3TextEnabled() |
| + && (valueID == CSSValueInterWord || valueID == CSSValueDistribute || valueID == CSSValueAuto || valueID == CSSValueNone)) |
| + return true; |
|
yosin_UTC9
2013/10/15 01:28:41
nit: Please put brace when conditional expression
|
| + break; |
| case CSSPropertyTextLineThroughMode: |
| case CSSPropertyTextOverlineMode: |
| case CSSPropertyTextUnderlineMode: |
| @@ -950,8 +956,6 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId) |
| case CSSPropertyMixBlendMode: |
| case CSSPropertyIsolation: |
| return RuntimeEnabledFeatures::cssCompositingEnabled(); |
| - case CSSPropertyTextAlignLast: |
| - return RuntimeEnabledFeatures::css3TextEnabled(); |
| case CSSPropertyBorderBottomStyle: |
| case CSSPropertyBorderCollapse: |
| case CSSPropertyBorderLeftStyle: |
| @@ -981,6 +985,8 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId) |
| case CSSPropertyResize: |
| case CSSPropertySpeak: |
| case CSSPropertyTableLayout: |
| + case CSSPropertyTextAlignLast: |
| + case CSSPropertyTextJustify: |
| case CSSPropertyTextLineThroughMode: |
| case CSSPropertyTextLineThroughStyle: |
| case CSSPropertyTextOverflow: |
| @@ -2829,6 +2835,7 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important) |
| case CSSPropertySpeak: |
| case CSSPropertyTableLayout: |
| case CSSPropertyTextAlignLast: |
| + case CSSPropertyTextJustify: |
| case CSSPropertyTextLineThroughMode: |
| case CSSPropertyTextLineThroughStyle: |
| case CSSPropertyTextOverflow: |