Index: Source/core/css/parser/BisonCSSParser-in.cpp |
diff --git a/Source/core/css/parser/BisonCSSParser-in.cpp b/Source/core/css/parser/BisonCSSParser-in.cpp |
index 5810581ab5446b5bfcb21a7115ceac545fb091be..254a09a2918dea97d2e9fb53331b8a90d0e20bf0 100644 |
--- a/Source/core/css/parser/BisonCSSParser-in.cpp |
+++ b/Source/core/css/parser/BisonCSSParser-in.cpp |
@@ -902,8 +902,6 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId) |
case CSSPropertyColumnFill: |
case CSSPropertyWebkitColumnRuleStyle: |
case CSSPropertyAlignContent: |
- case CSSPropertyAlignItems: |
- case CSSPropertyAlignSelf: |
case CSSPropertyFlexDirection: |
case CSSPropertyFlexWrap: |
case CSSPropertyJustifyContent: |
@@ -940,6 +938,9 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId) |
case CSSPropertyWordBreak: |
case CSSPropertyWordWrap: |
return true; |
+ case CSSPropertyAlignItems: |
+ case CSSPropertyAlignSelf: |
+ return !RuntimeEnabledFeatures::cssGridLayoutEnabled(); |
default: |
return false; |
} |
@@ -2734,6 +2735,14 @@ bool BisonCSSParser::parseValue(CSSPropertyID propId, bool important) |
// auto | none | [pan-x || pan-y] |
return parseTouchAction(important); |
+ case CSSPropertyAlignSelf: |
+ ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); |
ojan
2014/01/15 01:16:51
I'm confused, don't align-self and align-items als
Julien - ping for review
2014/01/15 19:10:23
You are totally right. This patch forks the parsin
|
+ return parseItemPositionOverflowPosition(propId, important); |
+ |
+ case CSSPropertyAlignItems: |
+ ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); |
+ return parseItemPositionOverflowPosition(propId, important); |
+ |
case CSSPropertyBorderBottomStyle: |
case CSSPropertyBorderCollapse: |
case CSSPropertyBorderLeftStyle: |
@@ -2797,8 +2806,6 @@ bool BisonCSSParser::parseValue(CSSPropertyID propId, bool important) |
case CSSPropertyColumnFill: |
case CSSPropertyWebkitColumnRuleStyle: |
case CSSPropertyAlignContent: |
- case CSSPropertyAlignItems: |
- case CSSPropertyAlignSelf: |
case CSSPropertyFlexDirection: |
case CSSPropertyFlexWrap: |
case CSSPropertyJustifyContent: |