Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CSSPropertyParserHelpers_h
 #define CSSPropertyParserHelpers_h
 
 #include "core/css/CSSCustomIdentValue.h"
+#include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/parser/CSSParserMode.h"
 #include "core/css/parser/CSSParserTokenRange.h"
 #include "platform/Length.h" // For ValueRange
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class CSSStringValue;
 class CSSURIValue;
@@ skipping 19 matching lines @@
 CSSPrimitiveValue* consumeInteger(CSSParserTokenRange&, double minimumValue = -std::numeric_limits<double>::max());
 CSSPrimitiveValue* consumePositiveInteger(CSSParserTokenRange&);
 bool consumeNumberRaw(CSSParserTokenRange&, double& result);
 CSSPrimitiveValue* consumeNumber(CSSParserTokenRange&, ValueRange);
 CSSPrimitiveValue* consumeLength(CSSParserTokenRange&, CSSParserMode, ValueRange, UnitlessQuirk = UnitlessQuirk::Forbid);
 CSSPrimitiveValue* consumePercent(CSSParserTokenRange&, ValueRange);
 CSSPrimitiveValue* consumeLengthOrPercent(CSSParserTokenRange&, CSSParserMode, ValueRange, UnitlessQuirk = UnitlessQuirk::Forbid);
 CSSPrimitiveValue* consumeAngle(CSSParserTokenRange&);
 CSSPrimitiveValue* consumeTime(CSSParserTokenRange&, ValueRange);
 
-CSSPrimitiveValue* consumeIdent(CSSParserTokenRange&);
-CSSPrimitiveValue* consumeIdentRange(CSSParserTokenRange&, CSSValueID lower, CSSValueID upper);
+CSSIdentifierValue* consumeIdent(CSSParserTokenRange&);
+CSSIdentifierValue* consumeIdentRange(CSSParserTokenRange&, CSSValueID lower, CSSValueID upper);
 template<CSSValueID, CSSValueID...> inline bool identMatches(CSSValueID id);
-template<CSSValueID... allowedIdents> CSSPrimitiveValue* consumeIdent(CSSParserTokenRange&);
+template<CSSValueID... allowedIdents> CSSIdentifierValue* consumeIdent(CSSParserTokenRange&);
 
 CSSCustomIdentValue* consumeCustomIdent(CSSParserTokenRange&);
 CSSStringValue* consumeString(CSSParserTokenRange&);
 StringView consumeUrlAsStringView(CSSParserTokenRange&);
 CSSURIValue* consumeUrl(CSSParserTokenRange&);
 
 CSSValue* consumeColor(CSSParserTokenRange&, CSSParserMode, bool acceptQuirkyColors = false);
 
 CSSValuePair* consumePosition(CSSParserTokenRange&, CSSParserMode, UnitlessQuirk);
 bool consumePosition(CSSParserTokenRange&, CSSParserMode, UnitlessQuirk, CSSValue*& resultX, CSSValue*& resultY);
@@ skipping 10 matching lines @@
 bool isCSSWideKeyword(StringView);
 
 // Template implementations are at the bottom of the file for readability.
 
 template<typename... emptyBaseCase> inline bool identMatches(CSSValueID id) { return false; }
 template<CSSValueID head, CSSValueID... tail> inline bool identMatches(CSSValueID id)
 {
     return id == head || identMatches<tail...>(id);
 }
 
-template<CSSValueID... names> CSSPrimitiveValue* consumeIdent(CSSParserTokenRange& range)
+template<CSSValueID... names> CSSIdentifierValue* consumeIdent(CSSParserTokenRange& range)
 {
     if (range.peek().type() != IdentToken || !identMatches<names...>(range.peek().id()))
         return nullptr;
-    return CSSPrimitiveValue::createIdentifier(range.consumeIncludingWhitespace().id());
+    return CSSIdentifierValue::create(range.consumeIncludingWhitespace().id());
 }
 
 } // namespace CSSPropertyParserHelpers
 
 } // namespace blink
 
 #endif // CSSPropertyParserHelpers_h