| Index: Source/core/css/parser/CSSPropertyParser.h
|
| diff --git a/Source/core/css/parser/CSSPropertyParser.h b/Source/core/css/parser/CSSPropertyParser.h
|
| index c4ec195c72c03647d77b8f36418d0f4d3c63cf4c..1e459e4dde75a7085732c03b6ddd9910421caabb 100644
|
| --- a/Source/core/css/parser/CSSPropertyParser.h
|
| +++ b/Source/core/css/parser/CSSPropertyParser.h
|
| @@ -26,6 +26,7 @@
|
| #include "core/css/CSSGradientValue.h"
|
| #include "core/css/CSSGridTemplateAreasValue.h"
|
| #include "core/css/CSSPropertySourceData.h"
|
| +#include "core/css/CSSStringValue.h"
|
| #include "platform/Length.h"
|
|
|
| namespace blink {
|
| @@ -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<CSSIdentValue>& 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<CSSIdentValue> 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);
|
|
|
|
|