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

Unified Diff: Source/core/css/parser/CSSPropertyParser.h

Issue 1306823004: Split out String, URI and CustomIdent from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_out_attr_values
Patch Set: Rebase Created 5 years, 4 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: Source/core/css/parser/CSSPropertyParser.h
diff --git a/Source/core/css/parser/CSSPropertyParser.h b/Source/core/css/parser/CSSPropertyParser.h
index 4f199bb0754e1cc97e8fbe871cdbc1374f578949..c65cc080a2b2dbdb76836f026cecb79fd9a62a1c 100644
--- a/Source/core/css/parser/CSSPropertyParser.h
+++ b/Source/core/css/parser/CSSPropertyParser.h
@@ -44,6 +44,7 @@ class CSSParserValueList;
class CSSPrimitiveValue;
class CSSProperty;
class CSSQuadValue;
+class CSSStringValue;
class CSSValue;
class CSSValueList;
class StylePropertyShorthand;
@@ -150,7 +151,7 @@ private:
bool parseColumnsShorthand(bool important);
PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();
- bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName);
+ bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSStringValue>& gridLineName);
bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool important);
bool parseGridTemplateShorthand(bool important);
@@ -270,8 +271,8 @@ private:
bool parseGeneratedImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveCustomIdentValue(CSSParserValue*);
+ PassRefPtrWillBeRawPtr<CSSStringValue> createPrimitiveStringValue(CSSParserValue*);
+ PassRefPtrWillBeRawPtr<CSSStringValue> createPrimitiveCustomIdentValue(CSSParserValue*);
PassRefPtrWillBeRawPtr<CSSValue> createCSSImageValueWithReferrer(const String& rawValue, const KURL&);
@@ -285,7 +286,7 @@ private:
Orientation,
};
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parsePage();
+ PassRefPtrWillBeRawPtr<CSSValue> parsePage();
PassRefPtrWillBeRawPtr<CSSValueList> parseSize();
SizeParameterType parseSizeParameter(CSSValueList* parsedValues, CSSParserValue*, SizeParameterType prevParamType);

Powered by Google App Engine
This is Rietveld 408576698