Move grid-auto-flow 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 0dd97f82806862d302297c247729277d661e6a80..4c5a5c5b116c94f7a52393d38e31c0913cdd4efb 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
@@ -52,23 +52,6 @@ enum TrackSizeRestriction { FixedSizeOnly, AllowAll };
 class CSSPropertyParser {
     STACK_ALLOCATED();
 public:
-
-    enum Units {
-        FUnknown = 0x0000,
-        FInteger = 0x0001,
-        FNumber = 0x0002, // Real Numbers
-        FPercent = 0x0004,
-        FLength = 0x0008,
-        FAngle = 0x0010,
-        FTime = 0x0020,
-        FFrequency = 0x0040,
-        FPositiveInteger = 0x0080,
-        FRelative = 0x0100,
-        FResolution = 0x0200,
-        FNonNeg = 0x0400,
-        FUnitlessQuirk = 0x0800
-    };
-
     static bool parseValue(CSSPropertyID, bool important,
         const CSSParserTokenRange&, const CSSParserContext&,
         HeapVector<CSSProperty, 256>&, StyleRule::RuleType);
@@ -90,8 +73,6 @@ private:
     bool consumeCSSWideKeyword(CSSPropertyID unresolvedProperty, bool important);
     CSSValue* parseSingleValue(CSSPropertyID);
 
-    CSSValue* legacyParseValue(CSSPropertyID);
-    bool legacyParseAndApplyValue(CSSPropertyID, bool important);
     bool legacyParseShorthand(CSSPropertyID, bool important);
 
     bool inShorthand() const { return m_inParseShorthand; }
@@ -120,10 +101,7 @@ private:
     bool consumeGridTemplateShorthand(bool important);
     bool parseGridShorthand(bool important);
     bool consumeGridAreaShorthand(bool important);
-    CSSValue* parseGridTrackSize(CSSParserValueList& inputList, TrackSizeRestriction = AllowAll);
-    CSSPrimitiveValue* parseGridBreadth(CSSParserValue*, TrackSizeRestriction = AllowAll);
     bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNamesValue* = nullptr);
-    CSSValue* parseGridAutoFlow(CSSParserValueList&);
 
     bool consumeFont(bool important);
     bool consumeSystemFont(bool important);
@@ -137,10 +115,6 @@ private:
 
     bool consumeLegacyBreakProperty(CSSPropertyID, bool important);
 
-    bool parseCalculation(CSSParserValue*, ValueRange);
-
-    CSSPrimitiveValue* createPrimitiveNumericValue(CSSParserValue*);
-
     class ShorthandScope {
         STACK_ALLOCATED();
     public:
@@ -159,23 +133,6 @@ private:
         CSSPropertyParser* m_parser;
     };
 
-    enum ReleaseParsedCalcValueCondition {
-        ReleaseParsedCalcValue,
-        DoNotReleaseParsedCalcValue
-    };
-
-    friend inline Units operator|(Units a, Units b)
-    {
-        return static_cast<Units>(static_cast<unsigned>(a) | static_cast<unsigned>(b));
-    }
-
-    bool validCalculationUnit(CSSParserValue*, Units, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue);
-
-    bool shouldAcceptUnitLessValues(CSSParserValue*, Units, CSSParserMode);
-
-    inline bool validUnit(CSSParserValue* value, Units unitflags, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue) { return validUnit(value, unitflags, m_context.mode(), releaseCalc); }
-    bool validUnit(CSSParserValue*, Units, CSSParserMode, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue);
-
 private:
     // Inputs:
     CSSParserValueList* m_valueList;
@@ -194,6 +151,8 @@ private:
 // 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&);