Move the grid shorthand into CSSPropertyParser

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h

Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
index 4c5a5c5b116c94f7a52393d38e31c0913cdd4efb..e74f77853ca63e7b9559080e9d6d5ac707f2514f 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
@@ -23,30 +23,17 @@
 #ifndef CSSPropertyParser_h
 #define CSSPropertyParser_h
 
-#include "core/css/CSSGridTemplateAreasValue.h"
 #include "core/css/StyleRule.h"
 #include "core/css/parser/CSSParserTokenRange.h"
-#include "platform/Length.h"
 
 namespace blink {
 
-class CSSCustomIdentValue;
-class CSSFunctionValue;
-class CSSGradientValue;
-class CSSGridLineNamesValue;
 struct CSSParserString;
-struct CSSParserValue;
-class CSSParserValueList;
-class CSSPrimitiveValue;
 class CSSProperty;
 class CSSValue;
-class CSSValueList;
 class StylePropertyShorthand;
 
-// TODO(rob.buis) to move to cpp file once legacy parser is removed.
-enum TrackSizeRestriction { FixedSizeOnly, AllowAll };
-
-// Inputs: PropertyID, isImportant bool, CSSParserValueList.
+// Inputs: PropertyID, isImportant bool, CSSParserTokenRange.
 // Outputs: Vector of CSSProperties
 
 class CSSPropertyParser {
@@ -73,9 +60,6 @@ private:
     bool consumeCSSWideKeyword(CSSPropertyID unresolvedProperty, bool important);
     CSSValue* parseSingleValue(CSSPropertyID);
 
-    bool legacyParseShorthand(CSSPropertyID, bool important);
-
-    bool inShorthand() const { return m_inParseShorthand; }
     bool inQuirksMode() const { return isQuirksModeBehavior(m_context.mode()); }
 
     bool parseViewportDescriptor(CSSPropertyID propId, bool important);
@@ -99,9 +83,8 @@ private:
     bool consumeGridItemPositionShorthand(CSSPropertyID, bool important);
     bool consumeGridTemplateRowsAndAreasAndColumns(bool important);
     bool consumeGridTemplateShorthand(bool important);
-    bool parseGridShorthand(bool important);
+    bool consumeGridShorthand(bool important);
     bool consumeGridAreaShorthand(bool important);
-    bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNamesValue* = nullptr);
 
     bool consumeFont(bool important);
     bool consumeSystemFont(bool important);
@@ -135,7 +118,6 @@ private:
 
 private:
     // Inputs:
-    CSSParserValueList* m_valueList;
     CSSParserTokenRange m_range;
     const CSSParserContext& m_context;
 
@@ -145,15 +127,8 @@ private:
     // Locals during parsing:
     int m_inParseShorthand;
     CSSPropertyID m_currentShorthand;
-    Member<CSSCalcValue> m_parsedCalculation;
 };
 
-// TODO(rob.buis): should move to CSSPropertyParser after conversion.
-bool allTracksAreFixedSized(CSSValueList&);
-bool parseGridTemplateAreasRow(const String&, NamedGridAreaMap&, const size_t, size_t&);
-CSSValueList* consumeGridAutoFlow(CSSParserTokenRange&);
-CSSValue* consumeGridTrackSize(CSSParserTokenRange&, CSSParserMode, TrackSizeRestriction = AllowAll);
-
 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
 CSSValueID cssValueKeywordID(const CSSParserString&);