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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1305383006: Oilpan: Unship CSSValues and AnimatableValues Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/css/parser/CSSParserImpl.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSPropertyParser.h
diff --git a/Source/core/css/parser/CSSPropertyParser.h b/Source/core/css/parser/CSSPropertyParser.h
index 37d567d9dd67e2f4721ab6f02421c18ec2b8e0cd..428263dfb3eb0c4eab31774cac49b63b6721f9f6 100644
--- a/Source/core/css/parser/CSSPropertyParser.h
+++ b/Source/core/css/parser/CSSPropertyParser.h
@@ -72,14 +72,14 @@ public:
static bool parseValue(CSSPropertyID, bool important,
CSSParserValueList*, const CSSParserContext&,
- WillBeHeapVector<CSSProperty, 256>&, StyleRule::Type);
+ Vector<CSSProperty, 256>&, StyleRule::Type);
static bool isSystemColor(CSSValueID);
static bool isColorKeyword(CSSValueID);
private:
CSSPropertyParser(CSSParserValueList*, const CSSParserContext&,
- WillBeHeapVector<CSSProperty, 256>&, StyleRule::Type);
+ Vector<CSSProperty, 256>&, StyleRule::Type);
bool parseValue(CSSPropertyID, bool important);
@@ -92,189 +92,189 @@ private:
KURL completeURL(const String& url) const;
- void addProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important, bool implicit = false);
+ void addProperty(CSSPropertyID, PassRefPtr<CSSValue>, bool important, bool implicit = false);
void rollbackLastProperties(int num);
- void addExpandedPropertyForValue(CSSPropertyID propId, PassRefPtrWillBeRawPtr<CSSValue>, bool);
+ void addExpandedPropertyForValue(CSSPropertyID propId, PassRefPtr<CSSValue>, bool);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, CSSParserValue*);
+ PassRefPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, CSSParserValue*);
bool parseShorthand(CSSPropertyID, const StylePropertyShorthand&, bool important);
bool parse4Values(CSSPropertyID, const CSSPropertyID* properties, bool important);
- PassRefPtrWillBeRawPtr<CSSValueList> parseContent();
- PassRefPtrWillBeRawPtr<CSSValue> parseQuotes();
+ PassRefPtr<CSSValueList> parseContent();
+ PassRefPtr<CSSValue> parseQuotes();
- PassRefPtrWillBeRawPtr<CSSValue> parseAttr(CSSParserValueList* args);
+ PassRefPtr<CSSValue> parseAttr(CSSParserValueList* args);
- bool parseFillImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseFillImage(CSSParserValueList*, RefPtr<CSSValue>&);
enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 };
enum FillPositionParsingMode { ResolveValuesAsPercent = 0, ResolveValuesAsKeyword = 1 };
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSParserValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillPositionParsingMode = ResolveValuesAsPercent, Units = FUnknown);
- PassRefPtrWillBeRawPtr<CSSValue> parseFillPositionX(CSSParserValueList*);
- PassRefPtrWillBeRawPtr<CSSValue> parseFillPositionY(CSSParserValueList*);
- void parse2ValuesFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&, Units = FUnknown);
+ PassRefPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSParserValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillPositionParsingMode = ResolveValuesAsPercent, Units = FUnknown);
+ PassRefPtr<CSSValue> parseFillPositionX(CSSParserValueList*);
+ PassRefPtr<CSSValue> parseFillPositionY(CSSParserValueList*);
+ void parse2ValuesFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&, Units = FUnknown);
bool isPotentialPositionValue(CSSParserValue*);
- void parseFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&, Units = FUnknown);
- void parse3ValuesFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>);
- void parse4ValuesFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>);
+ void parseFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&, Units = FUnknown);
+ void parse3ValuesFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&, PassRefPtr<CSSPrimitiveValue>, PassRefPtr<CSSPrimitiveValue>);
+ void parse4ValuesFillPosition(CSSParserValueList*, RefPtr<CSSValue>&, RefPtr<CSSValue>&, PassRefPtr<CSSPrimitiveValue>, PassRefPtr<CSSPrimitiveValue>);
- void parseFillRepeat(RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&);
- PassRefPtrWillBeRawPtr<CSSValue> parseFillSize(CSSPropertyID);
+ void parseFillRepeat(RefPtr<CSSValue>&, RefPtr<CSSValue>&);
+ PassRefPtr<CSSValue> parseFillSize(CSSPropertyID);
- bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
bool parseFillShorthand(CSSPropertyID, const CSSPropertyID* properties, int numProperties, bool important);
- void addFillValue(RefPtrWillBeRawPtr<CSSValue>& lval, PassRefPtrWillBeRawPtr<CSSValue> rval);
+ void addFillValue(RefPtr<CSSValue>& lval, PassRefPtr<CSSValue> rval);
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationDelay();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationDirection();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationDuration();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationFillMode();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationIterationCount();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationName(bool allowQuotedName);
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationPlayState();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationProperty();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationTimingFunction();
+ PassRefPtr<CSSValue> parseAnimationDelay();
+ PassRefPtr<CSSValue> parseAnimationDirection();
+ PassRefPtr<CSSValue> parseAnimationDuration();
+ PassRefPtr<CSSValue> parseAnimationFillMode();
+ PassRefPtr<CSSValue> parseAnimationIterationCount();
+ PassRefPtr<CSSValue> parseAnimationName(bool allowQuotedName);
+ PassRefPtr<CSSValue> parseAnimationPlayState();
+ PassRefPtr<CSSValue> parseAnimationProperty();
+ PassRefPtr<CSSValue> parseAnimationTimingFunction();
bool parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, double& result);
// Legacy parsing allows <string>s for animation-name
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationProperty(CSSPropertyID, bool useLegacyParsing);
- PassRefPtrWillBeRawPtr<CSSValueList> parseAnimationPropertyList(CSSPropertyID, bool useLegacyParsing);
+ PassRefPtr<CSSValue> parseAnimationProperty(CSSPropertyID, bool useLegacyParsing);
+ PassRefPtr<CSSValueList> parseAnimationPropertyList(CSSPropertyID, bool useLegacyParsing);
bool parseAnimationShorthand(bool useLegacyParsing, bool important);
bool parseTransitionShorthand(bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseColumnWidth();
- PassRefPtrWillBeRawPtr<CSSValue> parseColumnCount();
+ PassRefPtr<CSSValue> parseColumnWidth();
+ PassRefPtr<CSSValue> parseColumnCount();
bool parseColumnsShorthand(bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();
- bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName);
+ PassRefPtr<CSSValue> parseGridPosition();
+ bool parseIntegerOrCustomIdentFromGridPosition(RefPtr<CSSPrimitiveValue>& numericValue, RefPtr<CSSPrimitiveValue>& gridLineName);
bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
- bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool important);
+ bool parseGridTemplateRowsAndAreas(PassRefPtr<CSSValue>, bool important);
bool parseGridTemplateShorthand(bool important);
bool parseGridShorthand(bool important);
bool parseGridAreaShorthand(bool important);
- bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackList();
+ bool parseSingleGridAreaLonghand(RefPtr<CSSValue>&);
+ PassRefPtr<CSSValue> parseGridTrackList();
bool parseGridTrackRepeatFunction(CSSValueList&);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*);
+ PassRefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList);
+ PassRefPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*);
bool parseGridTemplateAreasRow(NamedGridAreaMap&, const size_t, size_t&);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateAreas();
+ PassRefPtr<CSSValue> parseGridTemplateAreas();
bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNamesValue* = nullptr);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridAutoFlow(CSSParserValueList&);
+ PassRefPtr<CSSValue> parseGridAutoFlow(CSSParserValueList&);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseClipShape();
+ PassRefPtr<CSSPrimitiveValue> parseClipShape();
bool parseLegacyPosition(CSSPropertyID, bool important);
bool parseItemPositionOverflowPosition(CSSPropertyID, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseContentDistributionOverflowPosition();
+ PassRefPtr<CSSValue> parseContentDistributionOverflowPosition();
- PassRefPtrWillBeRawPtr<CSSValue> parseShapeProperty(CSSPropertyID propId);
- PassRefPtrWillBeRawPtr<CSSValue> parseBasicShapeAndOrBox();
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape();
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);
+ PassRefPtr<CSSValue> parseShapeProperty(CSSPropertyID propId);
+ PassRefPtr<CSSValue> parseBasicShapeAndOrBox();
+ PassRefPtr<CSSPrimitiveValue> parseBasicShape();
+ PassRefPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeCircle(CSSParserValueList* args);
- PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeEllipse(CSSParserValueList* args);
- PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapePolygon(CSSParserValueList* args);
- PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeInset(CSSParserValueList* args);
+ PassRefPtr<CSSBasicShape> parseBasicShapeCircle(CSSParserValueList* args);
+ PassRefPtr<CSSBasicShape> parseBasicShapeEllipse(CSSParserValueList* args);
+ PassRefPtr<CSSBasicShape> parseBasicShapePolygon(CSSParserValueList* args);
+ PassRefPtr<CSSBasicShape> parseBasicShapeInset(CSSParserValueList* args);
bool parseFont(bool important);
bool parseSystemFont(bool important);
- PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();
+ PassRefPtr<CSSValueList> parseFontFamily();
- PassRefPtrWillBeRawPtr<CSSValue> parseCounter(int defaultValue);
- PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* args, bool counters);
+ PassRefPtr<CSSValue> parseCounter(int defaultValue);
+ PassRefPtr<CSSValue> parseCounterContent(CSSParserValueList* args, bool counters);
bool parseColorParameters(const CSSParserValue*, int* colorValues, bool parseAlpha);
bool parseHSLParameters(const CSSParserValue*, double* colorValues, bool parseAlpha);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(const CSSParserValue*, bool acceptQuirkyColors = false);
+ PassRefPtr<CSSPrimitiveValue> parseColor(const CSSParserValue*, bool acceptQuirkyColors = false);
bool parseColorFromValue(const CSSParserValue*, RGBA32&, bool acceptQuirkyColors = false);
bool acceptQuirkyColors(CSSPropertyID) const;
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseLineHeight();
+ PassRefPtr<CSSPrimitiveValue> parseLineHeight();
bool parseFontSize(bool important);
bool parseFontVariant(bool important);
bool parseFontWeight(bool important);
- PassRefPtrWillBeRawPtr<CSSValueList> parseFontFaceSrc();
- PassRefPtrWillBeRawPtr<CSSValueList> parseFontFaceUnicodeRange();
+ PassRefPtr<CSSValueList> parseFontFaceSrc();
+ PassRefPtr<CSSValueList> parseFontFaceUnicodeRange();
bool parseSVGValue(CSSPropertyID propId, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseSVGStrokeDasharray();
+ PassRefPtr<CSSValue> parseSVGStrokeDasharray();
- PassRefPtrWillBeRawPtr<CSSValue> parsePaintOrder() const;
+ PassRefPtr<CSSValue> parsePaintOrder() const;
// CSS3 Parsing Routines (for properties specific to CSS3)
- PassRefPtrWillBeRawPtr<CSSValueList> parseShadow(CSSParserValueList*, CSSPropertyID);
+ PassRefPtr<CSSValueList> parseShadow(CSSParserValueList*, CSSPropertyID);
bool parseBorderImageShorthand(CSSPropertyID, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseBorderImage(CSSPropertyID);
- bool parseBorderImageRepeat(RefPtrWillBeRawPtr<CSSValue>&);
- bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageSliceValue>&);
- bool parseBorderImageWidth(RefPtrWillBeRawPtr<CSSPrimitiveValue>&);
- bool parseBorderImageOutset(RefPtrWillBeRawPtr<CSSPrimitiveValue>&);
+ PassRefPtr<CSSValue> parseBorderImage(CSSPropertyID);
+ bool parseBorderImageRepeat(RefPtr<CSSValue>&);
+ bool parseBorderImageSlice(CSSPropertyID, RefPtr<CSSBorderImageSliceValue>&);
+ bool parseBorderImageWidth(RefPtr<CSSPrimitiveValue>&);
+ bool parseBorderImageOutset(RefPtr<CSSPrimitiveValue>&);
bool parseBorderRadius(CSSPropertyID, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseReflect();
+ PassRefPtr<CSSValue> parseReflect();
bool parseFlex(CSSParserValueList* args, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parsePosition(CSSParserValueList*);
- PassRefPtrWillBeRawPtr<CSSValueList> parsePositionList(CSSParserValueList*);
+ PassRefPtr<CSSValue> parsePosition(CSSParserValueList*);
+ PassRefPtr<CSSValueList> parsePositionList(CSSParserValueList*);
// Image generators
- bool parseCanvas(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseCanvas(CSSParserValueList*, RefPtr<CSSValue>&);
- bool parseDeprecatedGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
- bool parseDeprecatedLinearGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseDeprecatedRadialGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseLinearGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseRadialGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, CSSGradientRepeat repeating);
+ bool parseDeprecatedGradient(CSSParserValueList*, RefPtr<CSSValue>&);
+ bool parseDeprecatedLinearGradient(CSSParserValueList*, RefPtr<CSSValue>&, CSSGradientRepeat repeating);
+ bool parseDeprecatedRadialGradient(CSSParserValueList*, RefPtr<CSSValue>&, CSSGradientRepeat repeating);
+ bool parseLinearGradient(CSSParserValueList*, RefPtr<CSSValue>&, CSSGradientRepeat repeating);
+ bool parseRadialGradient(CSSParserValueList*, RefPtr<CSSValue>&, CSSGradientRepeat repeating);
bool parseGradientColorStops(CSSParserValueList*, CSSGradientValue*, bool expectComma);
- bool parseCrossfade(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseCrossfade(CSSParserValueList*, RefPtr<CSSValue>&);
- PassRefPtrWillBeRawPtr<CSSValue> parseImageSet(CSSParserValueList*);
+ PassRefPtr<CSSValue> parseImageSet(CSSParserValueList*);
- PassRefPtrWillBeRawPtr<CSSValue> parseWillChange();
+ PassRefPtr<CSSValue> parseWillChange();
- PassRefPtrWillBeRawPtr<CSSValueList> parseFilter();
- PassRefPtrWillBeRawPtr<CSSFunctionValue> parseBuiltinFilterArguments(CSSParserValueList*, CSSValueID);
+ PassRefPtr<CSSValueList> parseFilter();
+ PassRefPtr<CSSFunctionValue> parseBuiltinFilterArguments(CSSParserValueList*, CSSValueID);
- PassRefPtrWillBeRawPtr<CSSValueList> parseTransformOrigin();
- PassRefPtrWillBeRawPtr<CSSValueList> parseTransform(bool useLegacyParsing);
- PassRefPtrWillBeRawPtr<CSSValue> parseTransformValue(bool useLegacyParsing, CSSParserValue*);
+ PassRefPtr<CSSValueList> parseTransformOrigin();
+ PassRefPtr<CSSValueList> parseTransform(bool useLegacyParsing);
+ PassRefPtr<CSSValue> parseTransformValue(bool useLegacyParsing, CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSValue> parseMotionPath();
- PassRefPtrWillBeRawPtr<CSSValue> parseMotionRotation();
+ PassRefPtr<CSSValue> parseMotionPath();
+ PassRefPtr<CSSValue> parseMotionRotation();
- PassRefPtrWillBeRawPtr<CSSValue> parseTextEmphasisStyle();
+ PassRefPtr<CSSValue> parseTextEmphasisStyle();
- PassRefPtrWillBeRawPtr<CSSValue> parseTouchAction();
+ PassRefPtr<CSSValue> parseTouchAction();
- PassRefPtrWillBeRawPtr<CSSValue> parseTextDecoration();
+ PassRefPtr<CSSValue> parseTextDecoration();
- PassRefPtrWillBeRawPtr<CSSValue> parseTextIndent();
+ PassRefPtr<CSSValue> parseTextIndent();
- PassRefPtrWillBeRawPtr<CSSLineBoxContainValue> parseLineBoxContain();
+ PassRefPtr<CSSLineBoxContainValue> parseLineBoxContain();
bool parseCalculation(CSSParserValue*, ValueRange);
bool parseFontFeatureTag(CSSValueList*);
- PassRefPtrWillBeRawPtr<CSSValue> parseFontFeatureSettings();
+ PassRefPtr<CSSValue> parseFontFeatureSettings();
bool parseFontVariantLigatures(bool important);
- bool parseGeneratedImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseGeneratedImage(CSSParserValueList*, RefPtr<CSSValue>&);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveCustomIdentValue(CSSParserValue*);
+ PassRefPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*);
+ PassRefPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*);
+ PassRefPtr<CSSPrimitiveValue> createPrimitiveCustomIdentValue(CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSValue> createCSSImageValueWithReferrer(const String& rawValue, const KURL&);
+ PassRefPtr<CSSValue> createCSSImageValueWithReferrer(const String& rawValue, const KURL&);
- PassRefPtrWillBeRawPtr<CSSBasicShape> parseInsetRoundedCorners(PassRefPtrWillBeRawPtr<CSSBasicShapeInset>, CSSParserValueList*);
+ PassRefPtr<CSSBasicShape> parseInsetRoundedCorners(PassRefPtr<CSSBasicShapeInset>, CSSParserValueList*);
enum SizeParameterType {
None,
@@ -284,8 +284,8 @@ private:
Orientation,
};
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parsePage();
- PassRefPtrWillBeRawPtr<CSSValueList> parseSize();
+ PassRefPtr<CSSPrimitiveValue> parsePage();
+ PassRefPtr<CSSValueList> parseSize();
SizeParameterType parseSizeParameter(CSSValueList* parsedValues, CSSParserValue*, SizeParameterType prevParamType);
bool parseFontFaceSrcURI(CSSValueList*);
@@ -347,20 +347,20 @@ 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, RefPtrWillBeRawPtr<CSSPrimitiveValue>&);
+ bool parseBorderImageQuad(Units, RefPtr<CSSPrimitiveValue>&);
int colorIntFromValue(CSSParserValue*);
bool buildBorderImageParseContext(CSSPropertyID, BorderImageParseContext&);
bool parseDeprecatedGradientColorStop(CSSParserValue*, CSSGradientColorStop&);
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseDeprecatedGradientStopColor(const CSSParserValue*);
+ PassRefPtr<CSSPrimitiveValue> parseDeprecatedGradientStopColor(const CSSParserValue*);
- void commitBorderImageProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important);
+ void commitBorderImageProperty(CSSPropertyID, PassRefPtr<CSSValue>, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapPoints();
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapDestination();
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapCoordinate();
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapPosition();
+ PassRefPtr<CSSValue> parseScrollSnapPoints();
+ PassRefPtr<CSSValue> parseScrollSnapDestination();
+ PassRefPtr<CSSValue> parseScrollSnapCoordinate();
+ PassRefPtr<CSSValue> parseScrollSnapPosition();
private:
// Inputs:
@@ -368,14 +368,14 @@ private:
const CSSParserContext& m_context;
// Outputs:
- WillBeHeapVector<CSSProperty, 256>& m_parsedProperties;
+ Vector<CSSProperty, 256>& m_parsedProperties;
StyleRule::Type m_ruleType;
// Locals during parsing:
int m_inParseShorthand;
CSSPropertyID m_currentShorthand;
bool m_implicitShorthand;
- RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;
+ RefPtr<CSSCalcValue> m_parsedCalculation;
};
CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
« no previous file with comments | « Source/core/css/parser/CSSParserImpl.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698