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

Unified Diff: Source/core/css/resolver/StyleBuilderConverter.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/parser/CSSPropertyParser.cpp ('k') | Source/core/rendering/RenderGrid.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleBuilderConverter.cpp
diff --git a/Source/core/css/resolver/StyleBuilderConverter.cpp b/Source/core/css/resolver/StyleBuilderConverter.cpp
index 662322897eadd1ba51c99a4de2bcbcdc940a4386..0a5592b02b67a0aeeff3208a9c2d970310de8ac1 100644
--- a/Source/core/css/resolver/StyleBuilderConverter.cpp
+++ b/Source/core/css/resolver/StyleBuilderConverter.cpp
@@ -334,27 +334,17 @@ GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&, CSS
switch (first->getValueID()) {
case CSSValueRow:
- if (second) {
- if (second->getValueID() == CSSValueDense)
- return AutoFlowRowDense;
- return AutoFlowStackRow;
- }
+ if (second && second->getValueID() == CSSValueDense)
+ return AutoFlowRowDense;
return AutoFlowRow;
case CSSValueColumn:
- if (second) {
- if (second->getValueID() == CSSValueDense)
- return AutoFlowColumnDense;
- return AutoFlowStackColumn;
- }
+ if (second && second->getValueID() == CSSValueDense)
+ return AutoFlowColumnDense;
return AutoFlowColumn;
case CSSValueDense:
if (second && second->getValueID() == CSSValueColumn)
return AutoFlowColumnDense;
return AutoFlowRowDense;
- case CSSValueStack:
- if (second && second->getValueID() == CSSValueColumn)
- return AutoFlowStackColumn;
- return AutoFlowStackRow;
default:
ASSERT_NOT_REACHED();
return RenderStyle::initialGridAutoFlow();
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.cpp ('k') | Source/core/rendering/RenderGrid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698