Index: Source/core/css/parser/BisonCSSParser.h |
diff --git a/Source/core/css/parser/BisonCSSParser.h b/Source/core/css/parser/BisonCSSParser.h |
index 1d5d49ba5b44bc7290e3ceaaa1faef92ddf2b32f..2982ab5eec300315c1754ff07adadb449b9f0e76 100644 |
--- a/Source/core/css/parser/BisonCSSParser.h |
+++ b/Source/core/css/parser/BisonCSSParser.h |
@@ -93,7 +93,7 @@ public: |
static bool parseSystemColor(RGBA32& color, const String&, Document*); |
static PassRefPtrWillBeRawPtr<CSSValueList> parseFontFaceValue(const AtomicString&); |
static PassRefPtr<CSSValue> parseAnimationTimingFunctionValue(const String&); |
- PassRefPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, CSSParserValue*); |
+ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, CSSParserValue*); |
bool parseDeclaration(MutableStylePropertySet*, const String&, CSSParserObserver*, StyleSheetContents* contextStyleSheet); |
static PassRefPtr<ImmutableStylePropertySet> parseInlineStyleDeclaration(const String&, Element*); |
PassRefPtr<MediaQuerySet> parseMediaQueryList(const String&); |
@@ -122,14 +122,14 @@ public: |
enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 }; |
enum FillPositionParsingMode { ResolveValuesAsPercent = 0, ResolveValuesAsKeyword = 1 }; |
- PassRefPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSParserValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillPositionParsingMode = ResolveValuesAsPercent); |
+ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSParserValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillPositionParsingMode = ResolveValuesAsPercent); |
PassRefPtr<CSSValue> parseFillPositionX(CSSParserValueList*); |
PassRefPtr<CSSValue> parseFillPositionY(CSSParserValueList*); |
void parse2ValuesFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&); |
bool isPotentialPositionValue(CSSParserValue*); |
void parseFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&); |
- void parse3ValuesFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&, PassRefPtr<CSSPrimitiveValue>, PassRefPtr<CSSPrimitiveValue>); |
- void parse4ValuesFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&, PassRefPtr<CSSPrimitiveValue>, PassRefPtr<CSSPrimitiveValue>); |
+ void parse3ValuesFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>); |
+ void parse4ValuesFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>); |
void parseFillRepeat(RefPtr<CSSValue>&, RefPtr<CSSValue>&); |
PassRefPtr<CSSValue> parseFillSize(CSSPropertyID, bool &allowComma); |
@@ -162,14 +162,14 @@ public: |
bool parseColumnsShorthand(bool important); |
PassRefPtr<CSSValue> parseGridPosition(); |
- bool parseIntegerOrStringFromGridPosition(RefPtr<CSSPrimitiveValue>& numericValue, RefPtr<CSSPrimitiveValue>& gridLineName); |
+ bool parseIntegerOrStringFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName); |
bool parseGridItemPositionShorthand(CSSPropertyID, bool important); |
bool parseGridAreaShorthand(bool important); |
bool parseSingleGridAreaLonghand(RefPtr<CSSValue>&); |
bool parseGridTrackList(CSSPropertyID, bool important); |
bool parseGridTrackRepeatFunction(CSSValueList&); |
PassRefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList); |
- PassRefPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*); |
+ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*); |
PassRefPtr<CSSValue> parseGridTemplateAreas(); |
void parseGridLineNames(CSSParserValueList* inputList, CSSValueList&); |
@@ -178,8 +178,8 @@ public: |
bool parseItemPositionOverflowPosition(CSSPropertyID, bool important); |
PassRefPtr<CSSValue> parseShapeProperty(CSSPropertyID propId); |
- PassRefPtr<CSSPrimitiveValue> parseBasicShape(); |
- PassRefPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*); |
+ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape(); |
+ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*); |
PassRefPtr<CSSBasicShape> parseBasicShapeRectangle(CSSParserValueList* args); |
PassRefPtr<CSSBasicShape> parseBasicShapeCircle(CSSParserValueList* args); |
@@ -198,7 +198,7 @@ public: |
bool parseColorParameters(CSSParserValue*, int* colorValues, bool parseAlpha); |
bool parseHSLParameters(CSSParserValue*, double* colorValues, bool parseAlpha); |
- PassRefPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = 0); |
+ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = 0); |
bool parseColorFromValue(CSSParserValue*, RGBA32&); |
void parseSelector(const String&, CSSSelectorList&); |
@@ -225,8 +225,8 @@ public: |
PassRefPtr<CSSValue> parseBorderImage(CSSPropertyID); |
bool parseBorderImageRepeat(RefPtr<CSSValue>&); |
bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageSliceValue>&); |
- bool parseBorderImageWidth(RefPtr<CSSPrimitiveValue>&); |
- bool parseBorderImageOutset(RefPtr<CSSPrimitiveValue>&); |
+ bool parseBorderImageWidth(RefPtrWillBeRawPtr<CSSPrimitiveValue>&); |
+ bool parseBorderImageOutset(RefPtrWillBeRawPtr<CSSPrimitiveValue>&); |
bool parseBorderRadius(CSSPropertyID, bool important); |
bool parseAspectRatio(bool important); |
@@ -412,8 +412,8 @@ public: |
void markViewportRuleBodyEnd() { m_inViewport = false; } |
StyleRuleBase* createViewportRule(); |
- PassRefPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*); |
- PassRefPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*); |
+ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*); |
+ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*); |
CSSParserLocation currentLocation() { return m_tokenizer.currentLocation(); } |
@@ -589,7 +589,7 @@ private: |
inline bool validUnit(CSSParserValue* value, Units unitflags, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue) { return validUnit(value, unitflags, m_context.mode(), releaseCalc); } |
bool validUnit(CSSParserValue*, Units, CSSParserMode, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue); |
- bool parseBorderImageQuad(Units, RefPtr<CSSPrimitiveValue>&); |
+ bool parseBorderImageQuad(Units, RefPtrWillBeRawPtr<CSSPrimitiveValue>&); |
int colorIntFromValue(CSSParserValue*); |
double parsedDouble(CSSParserValue*, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue); |
bool isCalculation(CSSParserValue*); |