third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.h - Issue 2346193002: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

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

Issue 2346193002: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)

Patch Set: Replaced ASSERTs with DCHECKS in presubmit warnings 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

« third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('K') | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp » ('j') | third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 013863d20c38858506a07bd87b5ab704156c9ed0..162abd4580dcaa3b0de0410d0d14a0c283d5542e 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"

@@ -45,10 +46,10 @@ CSSPrimitiveValue* consumeLengthOrPercent(CSSParserTokenRange&, CSSParserMode, V

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&);

@@ -77,11 +78,11 @@ template<CSSValueID head, CSSValueID... tail> inline bool identMatches(CSSValueI

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::createIdentifier(range.consumeIncludingWhitespace().id());

}

static inline bool isCSSWideKeyword(const CSSValueID& id)