[CSS Grid Layout] Disallow using <ident> and function names as <custom-ident>

Source/core/css/parser/BisonCSSParser-in.cpp

Index: Source/core/css/parser/BisonCSSParser-in.cpp
diff --git a/Source/core/css/parser/BisonCSSParser-in.cpp b/Source/core/css/parser/BisonCSSParser-in.cpp
index 73a5712156f54c545bdbdce012b57830ce16695a..e84bd49a08ee68862b248716903e3a090dd08a00 100644
--- a/Source/core/css/parser/BisonCSSParser-in.cpp
+++ b/Source/core/css/parser/BisonCSSParser-in.cpp
@@ -4664,19 +4664,24 @@ bool CSSPropertyParser::parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>
     return true;
 }
 
-void CSSPropertyParser::parseGridLineNames(CSSParserValueList* parserValueList, CSSValueList& valueList)
+bool CSSPropertyParser::parseGridLineNames(CSSParserValueList* parserValueList, CSSValueList& valueList)
 {
     ASSERT(parserValueList->current() && parserValueList->current()->unit == CSSParserValue::ValueList);
 
     CSSParserValueList* identList = parserValueList->current()->valueList;
     if (!identList->size()) {
         parserValueList->next();
-        return;
+        return true;
     }
 
     RefPtrWillBeRawPtr<CSSGridLineNamesValue> lineNames = CSSGridLineNamesValue::create();
     while (CSSParserValue* identValue = identList->current()) {
         ASSERT(identValue->unit == CSSPrimitiveValue::CSS_IDENT);
+        if (equalIgnoringCase(identValue->string, "auto")
+            || equalIgnoringCase(identValue->string, "minmax")
+            || equalIgnoringCase(identValue->string, "subgrid"))

[Julien - ping for review, 2014/03/01 00:42:21]

subgrid will be moved to level 2
(http://lists.w3.org/Archives/Public/www-style/2014Feb/0047.html) so I wouldn't
handle them here as the syntax could change too.

Note that this is not totally right AFAICT: <custom-ident> is supposed to match
the context in which the rule is called and <line-names> is called for several
properties with different grammars. An example is grid-template that should also
ban 'none'.

The change is not handling css-wide keywords here
(http://dev.w3.org/csswg/css-values-3/#common-keywords) such as 'initial' and
'inherit' along with 'default'.

I would have liked to have us solve this issue once and for all as this is going
to be required for other properties. Ideally we would want this generated from
the grammar (really long term goal). In the short-run, we will have to
pre-populate common keywords and then add the rule-specific keywords as we
parse.

+            return false;
+
         RefPtrWillBeRawPtr<CSSPrimitiveValue> lineName = createPrimitiveStringValue(identValue);
         lineNames->append(lineName.release());
         identList->next();
@@ -4684,6 +4689,7 @@ void CSSPropertyParser::parseGridLineNames(CSSParserValueList* parserValueList,
     valueList.append(lineNames.release());
 
     parserValueList->next();
+    return true;
 }
 
 bool CSSPropertyParser::parseGridTrackList(CSSPropertyID propId, bool important)
@@ -4702,8 +4708,10 @@ bool CSSPropertyParser::parseGridTrackList(CSSPropertyID propId, bool important)
     RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
     // Handle leading  <ident>*.
     value = m_valueList->current();
-    if (value && value->unit == CSSParserValue::ValueList)
-        parseGridLineNames(m_valueList.get(), *values);
+    if (value && value->unit == CSSParserValue::ValueList) {
+        if (!parseGridLineNames(m_valueList.get(), *values))
+            return false;
+    }
 
     bool seenTrackSizeOrRepeatFunction = false;
     while (CSSParserValue* currentValue = m_valueList->current()) {
@@ -4720,8 +4728,10 @@ bool CSSPropertyParser::parseGridTrackList(CSSPropertyID propId, bool important)
         }
         // This will handle the trailing <ident>* in the grammar.
         value = m_valueList->current();
-        if (value && value->unit == CSSParserValue::ValueList)
-            parseGridLineNames(m_valueList.get(), *values);
+        if (value && value->unit == CSSParserValue::ValueList) {
+            if (!parseGridLineNames(m_valueList.get(), *values))
+                return false;
+        }
     }
 
     // We should have found a <track-size> or else it is not a valid <track-list>
@@ -4746,8 +4756,10 @@ bool CSSPropertyParser::parseGridTrackRepeatFunction(CSSValueList& list)
 
     // Handle leading <ident>*.
     CSSParserValue* currentValue = arguments->current();
-    if (currentValue && currentValue->unit == CSSParserValue::ValueList)
-        parseGridLineNames(arguments, *repeatedValues);
+    if (currentValue && currentValue->unit == CSSParserValue::ValueList) {
+        if (!parseGridLineNames(arguments, *repeatedValues))
+            return false;
+    }
 
     while (arguments->current()) {
         RefPtrWillBeRawPtr<CSSValue> trackSize = parseGridTrackSize(*arguments);
@@ -4758,8 +4770,10 @@ bool CSSPropertyParser::parseGridTrackRepeatFunction(CSSValueList& list)
 
         // This takes care of any trailing <ident>* in the grammar.
         currentValue = arguments->current();
-        if (currentValue && currentValue->unit == CSSParserValue::ValueList)
-            parseGridLineNames(arguments, *repeatedValues);
+        if (currentValue && currentValue->unit == CSSParserValue::ValueList) {
+            if (!parseGridLineNames(arguments, *repeatedValues))
+                return false;
+        }
     }
 
     for (size_t i = 0; i < repetitions; ++i) {