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

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

Issue 826893002: [CSS Grid Layout] Remove stack from grid-auto-flow syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased patch Created 5 years, 11 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
« no previous file with comments | « Source/core/css/RenderStyleCSSValueMapping.cpp ('k') | Source/core/css/resolver/StyleBuilderConverter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp
index bb8b2f305688b6199b297a04340a040a3e74a3fa..79e17ffa0942fd4fee3444c8c231af8f2eaf2e77 100644
--- a/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/Source/core/css/parser/CSSPropertyParser.cpp
@@ -3816,7 +3816,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseGridTemplateAreas()
PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseGridAutoFlow(CSSParserValueList& list)
{
- // [ row | column ] && dense? | stack && [ row | column ]?
+ // [ row | column ] || dense
ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
CSSParserValue* value = list.current();
@@ -3827,24 +3827,20 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseGridAutoFlow(CSSParserV
// First parameter.
CSSValueID firstId = value->id;
- if (firstId != CSSValueRow && firstId != CSSValueColumn && firstId != CSSValueDense && firstId != CSSValueStack)
+ if (firstId != CSSValueRow && firstId != CSSValueColumn && firstId != CSSValueDense)
return nullptr;
parsedValues->append(cssValuePool().createIdentifierValue(firstId));
// Second parameter, if any.
value = list.next();
- if (!value && firstId == CSSValueDense)
- return nullptr;
-
if (value) {
switch (firstId) {
case CSSValueRow:
case CSSValueColumn:
- if (value->id != CSSValueDense && value->id != CSSValueStack)
+ if (value->id != CSSValueDense)
return parsedValues;
break;
case CSSValueDense:
- case CSSValueStack:
if (value->id != CSSValueRow && value->id != CSSValueColumn)
return parsedValues;
break;
« no previous file with comments | « Source/core/css/RenderStyleCSSValueMapping.cpp ('k') | Source/core/css/resolver/StyleBuilderConverter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698