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

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

Issue 1712503002: [css-grid] Rows track sizes are optional in grid-template shorthand (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased patch Created 4 years, 10 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 | « third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
index b679a6669d6dccd8a8bc3850be9ac73e978658aa..7d9ad7f7f1e9fcdb73c6fcb2540ff89872269c03 100644
--- a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
@@ -1480,7 +1480,7 @@ bool CSSPropertyParser::parseGridTemplateRowsAndAreasAndColumns(bool important)
++rowCount;
// Handle template-rows's track-size.
- if (m_valueList->current() && !isForwardSlashOperator(m_valueList->current()) && m_valueList->current()->m_unit != CSSParserValue::String) {
+ if (m_valueList->current() && !isForwardSlashOperator(m_valueList->current()) && m_valueList->current()->m_unit != CSSParserValue::String && m_valueList->current()->m_unit != CSSParserValue::Operator) {
svillar 2016/02/19 11:48:44 As you told me in private, != Operator includes !i
Manuel Rego 2016/02/19 12:24:36 Done.
RefPtrWillBeRawPtr<CSSValue> value = parseGridTrackSize(*m_valueList);
if (!value)
return false;
@@ -1556,7 +1556,7 @@ bool CSSPropertyParser::parseGridTemplateShorthand(bool important)
return true;
}
- // 3- [<line-names>? <string> [<track-size> <line-names>]? ]+ syntax.
+ // 3- [<line-names>? <string> <track-size>? <line-names>? ]+ syntax.
// It requires to rewind parsing due to previous syntax failures.
m_valueList->setCurrentIndex(0);
return parseGridTemplateRowsAndAreasAndColumns(important);
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698