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 f6f5292d95529baab1e886e20a05fcb574e5b0a1..2b08146c2fe0c72eb0111488715ca2eba9d19cef 100644 |
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h |
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h |
@@ -74,7 +74,7 @@ public: |
HeapVector<CSSProperty, 256>&, StyleRule::RuleType); |
// Parses a non-shorthand CSS property |
- static RawPtr<CSSValue> parseSingleValue(CSSPropertyID, const CSSParserTokenRange&, const CSSParserContext&); |
+ static CSSValue* parseSingleValue(CSSPropertyID, const CSSParserTokenRange&, const CSSParserContext&); |
// TODO(timloh): This doesn't seem like the right place for these |
static bool isSystemColor(CSSValueID); |
@@ -88,9 +88,9 @@ private: |
// TODO(timloh): Rename once the CSSParserValue-based parseValue is removed |
bool parseValueStart(CSSPropertyID unresolvedProperty, bool important); |
bool consumeCSSWideKeyword(CSSPropertyID unresolvedProperty, bool important); |
- RawPtr<CSSValue> parseSingleValue(CSSPropertyID); |
+ CSSValue* parseSingleValue(CSSPropertyID); |
- RawPtr<CSSValue> legacyParseValue(CSSPropertyID); |
+ CSSValue* legacyParseValue(CSSPropertyID); |
bool legacyParseAndApplyValue(CSSPropertyID, bool important); |
bool legacyParseShorthand(CSSPropertyID, bool important); |
@@ -100,8 +100,8 @@ private: |
bool parseViewportDescriptor(CSSPropertyID propId, bool important); |
bool parseFontFaceDescriptor(CSSPropertyID); |
- void addProperty(CSSPropertyID, RawPtr<CSSValue>, bool important, bool implicit = false); |
- void addExpandedPropertyForValue(CSSPropertyID propId, RawPtr<CSSValue>, bool); |
+ void addProperty(CSSPropertyID, CSSValue*, bool important, bool implicit = false); |
+ void addExpandedPropertyForValue(CSSPropertyID propId, CSSValue*, bool); |
bool consumeBorder(bool important); |
@@ -116,17 +116,17 @@ private: |
bool consumeColumns(bool important); |
bool consumeGridItemPositionShorthand(CSSPropertyID, bool important); |
- RawPtr<CSSValue> parseGridTemplateColumns(bool important); |
+ CSSValue* parseGridTemplateColumns(bool important); |
bool parseGridTemplateRowsAndAreasAndColumns(bool important); |
bool parseGridTemplateShorthand(bool important); |
bool parseGridShorthand(bool important); |
bool consumeGridAreaShorthand(bool important); |
- RawPtr<CSSValue> parseGridTrackList(); |
+ CSSValue* parseGridTrackList(); |
bool parseGridTrackRepeatFunction(CSSValueList&, bool& isAutoRepeat); |
- RawPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList, TrackSizeRestriction = AllowAll); |
- RawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*, TrackSizeRestriction = AllowAll); |
+ CSSValue* parseGridTrackSize(CSSParserValueList& inputList, TrackSizeRestriction = AllowAll); |
+ CSSPrimitiveValue* parseGridBreadth(CSSParserValue*, TrackSizeRestriction = AllowAll); |
bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNamesValue* = nullptr); |
- RawPtr<CSSValue> parseGridAutoFlow(CSSParserValueList&); |
+ CSSValue* parseGridAutoFlow(CSSParserValueList&); |
bool consumeFont(bool important); |
bool consumeSystemFont(bool important); |
@@ -142,8 +142,8 @@ private: |
bool parseCalculation(CSSParserValue*, ValueRange); |
- RawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*); |
- RawPtr<CSSCustomIdentValue> createPrimitiveCustomIdentValue(CSSParserValue*); |
+ CSSPrimitiveValue* createPrimitiveNumericValue(CSSParserValue*); |
+ CSSCustomIdentValue* createPrimitiveCustomIdentValue(CSSParserValue*); |
class ShorthandScope { |
STACK_ALLOCATED(); |