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

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

Issue 1843773003: Move the grid-template shorthand into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 4 years, 8 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 51bf905c19e88a6ef1fbd9a1c4e3e537193eaf9c..ea8dec0f5242a517efaaf3bc037a7485cc8e7892 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -3115,6 +3115,7 @@ static CSSPrimitiveValue* consumeGridBreadth(CSSParserTokenRange& range, CSSPars
return consumeLengthOrPercent(range, cssParserMode, ValueRangeNonNegative, UnitlessQuirk::Allow);
}
+// TODO(rob.buis): consider adding boolean parameter to disallow <auto-track-list> if we keep supporing grid-template.
Timothy Loh 2016/04/11 03:27:32 In any case, this is going to be used by the grid
static CSSValue* consumeGridTrackSize(CSSParserTokenRange& range, CSSParserMode cssParserMode, TrackSizeRestriction restriction = AllowAll)
{
const CSSParserToken& token = range.peek();
@@ -3139,12 +3140,14 @@ static CSSValue* consumeGridTrackSize(CSSParserTokenRange& range, CSSParserMode
return consumeGridBreadth(range, cssParserMode, restriction);
}
-static CSSGridLineNamesValue* consumeGridLineNames(CSSParserTokenRange& range)
+// Appends to the passed in CSSGridLineNamesValue if any, otherwise creates a new one.
+static CSSGridLineNamesValue* consumeGridLineNames(CSSParserTokenRange& range, CSSGridLineNamesValue* lineNames = nullptr)
{
CSSParserTokenRange rangeCopy = range;
if (rangeCopy.consumeIncludingWhitespace().type() != LeftBracketToken)
return nullptr;
- CSSGridLineNamesValue* lineNames = CSSGridLineNamesValue::create();
+ if (!lineNames)
+ lineNames = CSSGridLineNamesValue::create();
while (CSSCustomIdentValue* lineName = consumeCustomIdentForGridLine(rangeCopy))
lineNames->append(lineName);
if (rangeCopy.consumeIncludingWhitespace().type() != RightBracketToken)
@@ -4479,6 +4482,95 @@ bool CSSPropertyParser::consumeGridAreaShorthand(bool important)
return true;
}
+bool CSSPropertyParser::consumeGridTemplateRowsAndAreasAndColumns(bool important)
+{
+ NamedGridAreaMap gridAreaMap;
+ size_t rowCount = 0;
+ size_t columnCount = 0;
+ RawPtr<CSSValueList> templateRows = CSSValueList::createSpaceSeparated();
+
+ // Persists between loop iterations so we can use the same value for
+ // consecutive <line-names> values
+ CSSGridLineNamesValue* lineNames = nullptr;
+
+ do {
+ // Handle leading <custom-ident>*.
+ bool hasPreviousLineNames = lineNames;
+ lineNames = consumeGridLineNames(m_range, lineNames);
+ if (lineNames && !hasPreviousLineNames)
+ templateRows->append(lineNames);
+
+ // Handle a template-area's row.
+ if (m_range.peek().type() != StringToken || !parseGridTemplateAreasRow(m_range.consumeIncludingWhitespace().value(), gridAreaMap, rowCount, columnCount))
+ return false;
+ ++rowCount;
+
+ // Handle template-rows's track-size.
+ RawPtr<CSSValue> value = consumeGridTrackSize(m_range, m_context.mode());
+ if (!value)
+ value = cssValuePool().createIdentifierValue(CSSValueAuto);
+ templateRows->append(value.release());
+
+ // This will handle the trailing/leading <custom-ident>* in the grammar.
+ lineNames = consumeGridLineNames(m_range);
+ if (lineNames)
+ templateRows->append(lineNames);
+ } while (!m_range.atEnd() && !(m_range.peek().type() == DelimiterToken && m_range.peek().delimiter() == '/'));
+
+ RawPtr<CSSValue> columnsValue = nullptr;
+ if (!m_range.atEnd()) {
+ if (!consumeSlashIncludingWhitespace(m_range))
+ return false;
+ columnsValue = consumeGridTrackList(m_range, m_context.mode());
+ if (!columnsValue || !m_range.atEnd())
+ return false;
+ } else {
+ columnsValue = cssValuePool().createIdentifierValue(CSSValueNone);
+ }
+ addProperty(CSSPropertyGridTemplateRows, templateRows.release(), important);
+ addProperty(CSSPropertyGridTemplateColumns, columnsValue.release(), important);
+ addProperty(CSSPropertyGridTemplateAreas, CSSGridTemplateAreasValue::create(gridAreaMap, rowCount, columnCount), important);
+ return true;
+}
+
+bool CSSPropertyParser::consumeGridTemplateShorthand(bool important)
+{
+ ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
+ ASSERT(gridTemplateShorthand().length() == 3);
+
+ CSSParserTokenRange rangeCopy = m_range;
+ RawPtr<CSSValue> rowsValue = consumeIdent<CSSValueNone>(m_range);
+
+ // 1- 'none' case.
+ if (rowsValue && m_range.atEnd()) {
+ addProperty(CSSPropertyGridTemplateRows, cssValuePool().createIdentifierValue(CSSValueNone), important);
+ addProperty(CSSPropertyGridTemplateColumns, cssValuePool().createIdentifierValue(CSSValueNone), important);
+ addProperty(CSSPropertyGridTemplateAreas, cssValuePool().createIdentifierValue(CSSValueNone), important);
+ return true;
+ }
+
+ // 2- <grid-template-rows> / <grid-template-columns>
+ if (!rowsValue)
+ rowsValue = consumeGridTrackList(m_range, m_context.mode());
+
+ if (rowsValue) {
+ if (!consumeSlashIncludingWhitespace(m_range))
+ return false;
+ RawPtr<CSSValue> columnsValue = consumeGridTemplatesRowsOrColumns(m_range, m_context.mode());
+ if (!columnsValue || !m_range.atEnd())
+ return false;
+
+ addProperty(CSSPropertyGridTemplateRows, rowsValue.release(), important);
+ addProperty(CSSPropertyGridTemplateColumns, columnsValue.release(), important);
+ addProperty(CSSPropertyGridTemplateAreas, cssValuePool().createIdentifierValue(CSSValueNone), important);
+ return true;
+ }
+
+ // 3- [ <line-names>? <string> <track-size>? <line-names>? ]+ [ / <track-list> ]?
+ m_range = rangeCopy;
+ return consumeGridTemplateRowsAndAreasAndColumns(important);
+}
+
bool CSSPropertyParser::parseShorthand(CSSPropertyID unresolvedProperty, bool important)
{
CSSPropertyID property = resolveCSSPropertyID(unresolvedProperty);
@@ -4661,6 +4753,8 @@ bool CSSPropertyParser::parseShorthand(CSSPropertyID unresolvedProperty, bool im
return consumeGridItemPositionShorthand(property, important);
case CSSPropertyGridArea:
return consumeGridAreaShorthand(important);
+ case CSSPropertyGridTemplate:
+ return consumeGridTemplateShorthand(important);
default:
m_currentShorthand = oldShorthand;
CSSParserValueList valueList(m_range);

Powered by Google App Engine
This is Rietveld 408576698