| Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
|
| diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
|
| index d815869ab52a1310b2c7684933cc999c7dffa96f..0b8560390a4c702559f27b08664554b3524fd0b0 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
|
| @@ -92,6 +92,14 @@ public:
|
| static bool isColorKeyword(CSSValueID);
|
| static bool isValidNumericValue(double);
|
|
|
| + // TODO(rwlbuis): move to CSSPropertyParser.cpp once CSSParserToken conversion is done.
|
| + static PassRefPtrWillBeRawPtr<CSSValue> createCSSImageValueWithReferrer(const AtomicString& rawValue, const CSSParserContext& context)
|
| + {
|
| + RefPtrWillBeRawPtr<CSSValue> imageValue = CSSImageValue::create(rawValue, context.completeURL(rawValue));
|
| + toCSSImageValue(imageValue.get())->setReferrer(context.referrer());
|
| + return imageValue;
|
| + }
|
| +
|
| private:
|
| CSSPropertyParser(const CSSParserTokenRange&, const CSSParserContext&,
|
| WillBeHeapVector<CSSProperty, 256>&);
|
| @@ -109,8 +117,6 @@ private:
|
| bool parseViewportDescriptor(CSSPropertyID propId, bool important);
|
| bool parseFontFaceDescriptor(CSSPropertyID);
|
|
|
| - KURL completeURL(const String& url) const;
|
| -
|
| void addProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important, bool implicit = false);
|
| void rollbackLastProperties(int num);
|
| void addExpandedPropertyForValue(CSSPropertyID propId, PassRefPtrWillBeRawPtr<CSSValue>, bool);
|
| @@ -155,8 +161,6 @@ private:
|
|
|
| bool consumeColumns(bool important);
|
|
|
| - PassRefPtrWillBeRawPtr<CSSValue> consumeCursor(CSSParserTokenRange&);
|
| -
|
| PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();
|
| bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSCustomIdentValue>& gridLineName);
|
| bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
|
| @@ -230,7 +234,6 @@ private:
|
| bool parseCrossfade(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
|
|
|
| PassRefPtrWillBeRawPtr<CSSValue> parseImageSet(CSSParserValueList*);
|
| - PassRefPtrWillBeRawPtr<CSSValue> consumeImageSet(CSSParserTokenRange&);
|
|
|
| PassRefPtrWillBeRawPtr<CSSValueList> parseFilter();
|
| PassRefPtrWillBeRawPtr<CSSFunctionValue> parseBuiltinFilterArguments(CSSParserValueList*, CSSValueID);
|
| @@ -243,14 +246,6 @@ private:
|
| PassRefPtrWillBeRawPtr<CSSStringValue> createPrimitiveStringValue(CSSParserValue*);
|
| PassRefPtrWillBeRawPtr<CSSCustomIdentValue> createPrimitiveCustomIdentValue(CSSParserValue*);
|
|
|
| - // TODO(rwlbuis): move to CSSPropertyParser.cpp once CSSParserToken conversion is done.
|
| - inline PassRefPtrWillBeRawPtr<CSSValue> createCSSImageValueWithReferrer(const AtomicString& rawValue, const KURL& url)
|
| - {
|
| - RefPtrWillBeRawPtr<CSSValue> imageValue = CSSImageValue::create(rawValue, url);
|
| - toCSSImageValue(imageValue.get())->setReferrer(m_context.referrer());
|
| - return imageValue;
|
| - }
|
| -
|
| PassRefPtrWillBeRawPtr<CSSBasicShapeInsetValue> parseInsetRoundedCorners(PassRefPtrWillBeRawPtr<CSSBasicShapeInsetValue>, CSSParserValueList*);
|
|
|
| PassRefPtrWillBeRawPtr<CSSValue> consumeFontFaceSrcURI();
|
|
|