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

Unified Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.h

Issue 2382653006: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Make check-webkit-style happy Created 4 years, 3 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/CSSPropertyParserHelpers.h
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.h b/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.h
index 1fb4b3690678e91929a8889b30e5e243b6476433..d494b4906e409cc552e252b787ed63463ed392d4 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.h
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.h
@@ -6,6 +6,7 @@
#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"
@@ -51,14 +52,14 @@ CSSPrimitiveValue* consumeLengthOrPercent(
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&);
+CSSIdentifierValue* consumeIdent(CSSParserTokenRange&);
CSSCustomIdentValue* consumeCustomIdent(CSSParserTokenRange&);
CSSStringValue* consumeString(CSSParserTokenRange&);
@@ -104,12 +105,11 @@ inline bool identMatches(CSSValueID id) {
}
template <CSSValueID... names>
-CSSPrimitiveValue* consumeIdent(CSSParserTokenRange& range) {
+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

Powered by Google App Engine
This is Rietveld 408576698