Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

Issue 1709963002: [css-align] New CSS Value 'normal' for Self Alignment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed repaint tests. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 47e3e7b36bbdef90ad76504bf7207eb87f7d7657..94654f32b98f9066886a83f36bb2f22d18db63f9 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -3175,7 +3175,7 @@ static CSSPrimitiveValue* consumeSelfPositionKeyword(CSSParserTokenRange& range)
static 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);
CSSPrimitiveValue* overflowPosition = consumeIdent<CSSValueUnsafe, CSSValueSafe>(range);
@@ -3189,6 +3189,14 @@ static CSSValue* consumeSelfPositionOverflowPosition(CSSParserTokenRange& range)
return selfPosition;
}
+static 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 CSSValue* consumeJustifyItems(CSSParserTokenRange& range)
{
CSSParserTokenRange rangeCopy = range;
@@ -3937,9 +3945,11 @@ CSSValue* CSSPropertyParser::parseSingleValue(CSSPropertyID unresolvedProperty,
case CSSPropertyWebkitMaskRepeatX:
case CSSPropertyWebkitMaskRepeatY:
return nullptr;
+ case CSSPropertyAlignItems:
+ DCHECK(RuntimeEnabledFeatures::cssGridLayoutEnabled());
+ return consumeAlignItems(m_range);
case CSSPropertyJustifySelf:
case CSSPropertyAlignSelf:
- case CSSPropertyAlignItems:
ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
return consumeSelfPositionOverflowPosition(m_range);
case CSSPropertyJustifyItems:

Powered by Google App Engine
This is Rietveld 408576698