Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
index 8fff7333f39042da9fd0b18aee1d0ab9270304e1..a7e0b65bb12cf2b521d14d36ad0664a09a80516f 100644 |
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
@@ -3255,7 +3255,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeSelfPositionKeyword(CSSP |
static PassRefPtrWillBeRawPtr<CSSValue> consumeSelfPositionOverflowPosition(CSSParserTokenRange& range) |
{ |
- if (identMatches<CSSValueAuto, CSSValueStretch, CSSValueBaseline, CSSValueLastBaseline>(range.peek().id())) |
+ if (identMatches<CSSValueAuto, CSSValueNormal, CSSValueStretch, CSSValueBaseline, CSSValueLastBaseline>(range.peek().id())) |
return consumeIdent(range); |
RefPtrWillBeRawPtr<CSSPrimitiveValue> overflowPosition = consumeIdent<CSSValueUnsafe, CSSValueSafe>(range); |
@@ -3269,6 +3269,14 @@ static PassRefPtrWillBeRawPtr<CSSValue> consumeSelfPositionOverflowPosition(CSSP |
return selfPosition.release(); |
} |
+static PassRefPtrWillBeRawPtr<CSSValue> consumeAlignItems(CSSParserTokenRange& range) |
+{ |
+ // align-items property does not allow the 'auto' value. |
+ if (identMatches<CSSValueAuto>(range.peek().id())) |
+ return nullptr; |
+ return consumeSelfPositionOverflowPosition(range); |
+} |
+ |
static PassRefPtrWillBeRawPtr<CSSValue> consumeJustifyItems(CSSParserTokenRange& range) |
{ |
CSSParserTokenRange rangeCopy = range; |
@@ -3637,9 +3645,11 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSProperty |
case CSSPropertyWebkitMaskRepeatX: |
case CSSPropertyWebkitMaskRepeatY: |
return nullptr; |
+ case CSSPropertyAlignItems: |
+ ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); |
+ return consumeAlignItems(m_range); |
case CSSPropertyJustifySelf: |
case CSSPropertyAlignSelf: |
- case CSSPropertyAlignItems: |
ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); |
return consumeSelfPositionOverflowPosition(m_range); |
case CSSPropertyJustifyItems: |