Index: Source/core/css/parser/CSSPropertyParser.h |
diff --git a/Source/core/css/parser/CSSPropertyParser.h b/Source/core/css/parser/CSSPropertyParser.h |
index 3e3dd566d9f9cadd95cddc1e5f888a3d4c008f0d..3384c8e043dd73588b9e821c55f7180f7274a3c8 100644 |
--- a/Source/core/css/parser/CSSPropertyParser.h |
+++ b/Source/core/css/parser/CSSPropertyParser.h |
@@ -92,87 +92,87 @@ private: |
KURL completeURL(const String& url) const; |
- void addProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important, bool implicit = false); |
+ void addProperty(CSSPropertyID, CSSValue, bool important, bool implicit = false); |
void rollbackLastProperties(int num); |
- void addExpandedPropertyForValue(CSSPropertyID propId, PassRefPtrWillBeRawPtr<CSSValue>, bool); |
+ void addExpandedPropertyForValue(CSSPropertyID propId, CSSValue, bool); |
PassRefPtrWillBeRawPtr<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(); |
+ NullableCSSValue parseQuotes(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseAttr(CSSParserValueList* args); |
+ NullableCSSValue parseAttr(CSSParserValueList* args); |
- bool parseFillImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&); |
+ bool parseFillImage(CSSParserValueList*, NullableCSSValue&); |
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); |
+ NullableCSSValue parseFillPositionX(CSSParserValueList*); |
+ NullableCSSValue parseFillPositionY(CSSParserValueList*); |
+ void parse2ValuesFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, 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*, NullableCSSValue&, NullableCSSValue&, Units = FUnknown); |
+ void parse3ValuesFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>); |
+ void parse4ValuesFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>); |
- void parseFillRepeat(RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&); |
- PassRefPtrWillBeRawPtr<CSSValue> parseFillSize(CSSPropertyID); |
+ void parseFillRepeat(NullableCSSValue&, NullableCSSValue&); |
+ NullableCSSValue parseFillSize(CSSPropertyID); |
- bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&); |
+ bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, NullableCSSValue&, NullableCSSValue&); |
bool parseFillShorthand(CSSPropertyID, const CSSPropertyID* properties, int numProperties, bool important); |
- void addFillValue(RefPtrWillBeRawPtr<CSSValue>& lval, PassRefPtrWillBeRawPtr<CSSValue> rval); |
+ void addFillValue(NullableCSSValue& lval, 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(); |
+ NullableCSSValue parseAnimationDelay(); |
+ NullableCSSValue parseAnimationDirection(); |
+ NullableCSSValue parseAnimationDuration(); |
+ NullableCSSValue parseAnimationFillMode(); |
+ NullableCSSValue parseAnimationIterationCount(); |
+ NullableCSSValue parseAnimationName(bool allowQuotedName); |
+ NullableCSSValue parseAnimationPlayState(); |
+ NullableCSSValue parseAnimationProperty(); |
+ NullableCSSValue parseAnimationTimingFunction(); |
bool parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, double& result); |
// Legacy parsing allows <string>s for animation-name |
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationProperty(CSSPropertyID, bool useLegacyParsing); |
+ NullableCSSValue parseAnimationProperty(CSSPropertyID, bool useLegacyParsing); |
PassRefPtrWillBeRawPtr<CSSValueList> parseAnimationPropertyList(CSSPropertyID, bool useLegacyParsing); |
bool parseAnimationShorthand(bool useLegacyParsing, bool important); |
bool parseTransitionShorthand(bool important); |
- PassRefPtrWillBeRawPtr<CSSValue> parseColumnWidth(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseColumnCount(); |
+ NullableCSSValue parseColumnWidth(); |
+ NullableCSSValue parseColumnCount(); |
bool parseColumnsShorthand(bool important); |
- PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition(); |
+ NullableCSSValue parseGridPosition(); |
bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName); |
bool parseGridItemPositionShorthand(CSSPropertyID, bool important); |
- bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool important); |
+ bool parseGridTemplateRowsAndAreas(NullableCSSValue, bool important); |
bool parseGridTemplateShorthand(bool important); |
bool parseGridShorthand(bool important); |
bool parseGridAreaShorthand(bool important); |
- bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&); |
- PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackList(); |
+ bool parseSingleGridAreaLonghand(NullableCSSValue&); |
+ NullableCSSValue parseGridTrackList(); |
bool parseGridTrackRepeatFunction(CSSValueList&); |
- PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList); |
+ NullableCSSValue parseGridTrackSize(CSSParserValueList& inputList); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*); |
bool parseGridTemplateAreasRow(NamedGridAreaMap&, const size_t, size_t&); |
- PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateAreas(); |
- bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNamesValue* = nullptr); |
- PassRefPtrWillBeRawPtr<CSSValue> parseGridAutoFlow(CSSParserValueList&); |
+ NullableCSSValue parseGridTemplateAreas(); |
+ bool parseGridLineNames(CSSParserValueList&, CSSValueList&, NullableCSSValue = nullptr); |
+ NullableCSSValue parseGridAutoFlow(CSSParserValueList&); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseClipShape(); |
bool parseLegacyPosition(CSSPropertyID, bool important); |
bool parseItemPositionOverflowPosition(CSSPropertyID, bool important); |
- PassRefPtrWillBeRawPtr<CSSValue> parseContentDistributionOverflowPosition(); |
+ NullableCSSValue parseContentDistributionOverflowPosition(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseShapeProperty(CSSPropertyID propId); |
- PassRefPtrWillBeRawPtr<CSSValue> parseBasicShapeAndOrBox(); |
+ NullableCSSValue parseShapeProperty(CSSPropertyID propId); |
+ NullableCSSValue parseBasicShapeAndOrBox(); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape(); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*); |
@@ -185,8 +185,8 @@ private: |
void parseSystemFont(bool important); |
PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseCounter(int defaultValue); |
- PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* args, bool counters); |
+ NullableCSSValue parseCounter(int defaultValue); |
+ NullableCSSValue parseCounterContent(CSSParserValueList* args, bool counters); |
bool parseColorParameters(const CSSParserValue*, int* colorValues, bool parseAlpha); |
bool parseHSLParameters(const CSSParserValue*, double* colorValues, bool parseAlpha); |
@@ -207,78 +207,78 @@ private: |
PassRefPtrWillBeRawPtr<CSSValueList> parseFontFaceUnicodeRange(); |
bool parseSVGValue(CSSPropertyID propId, bool important); |
- PassRefPtrWillBeRawPtr<CSSValue> parseSVGStrokeDasharray(); |
+ NullableCSSValue parseSVGStrokeDasharray(); |
- PassRefPtrWillBeRawPtr<CSSValue> parsePaintOrder() const; |
+ NullableCSSValue parsePaintOrder() const; |
// CSS3 Parsing Routines (for properties specific to CSS3) |
PassRefPtrWillBeRawPtr<CSSValueList> parseShadow(CSSParserValueList*, CSSPropertyID); |
bool parseBorderImageShorthand(CSSPropertyID, bool important); |
- PassRefPtrWillBeRawPtr<CSSValue> parseBorderImage(CSSPropertyID); |
- bool parseBorderImageRepeat(RefPtrWillBeRawPtr<CSSValue>&); |
+ NullableCSSValue parseBorderImage(CSSPropertyID); |
+ bool parseBorderImageRepeat(NullableCSSValue&); |
bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageSliceValue>&); |
bool parseBorderImageWidth(RefPtrWillBeRawPtr<CSSPrimitiveValue>&); |
bool parseBorderImageOutset(RefPtrWillBeRawPtr<CSSPrimitiveValue>&); |
bool parseBorderRadius(CSSPropertyID, bool important); |
- PassRefPtrWillBeRawPtr<CSSValue> parseReflect(); |
+ NullableCSSValue parseReflect(); |
bool parseFlex(CSSParserValueList* args, bool important); |
- PassRefPtrWillBeRawPtr<CSSValue> parsePosition(CSSParserValueList*); |
- PassRefPtrWillBeRawPtr<CSSValueList> parsePositionList(CSSParserValueList*); |
+ NullableCSSValue parsePosition(CSSParserValueList*); |
+ NullableCSSValue parsePositionList(CSSParserValueList*); |
// Image generators |
- bool parseCanvas(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&); |
+ bool parseCanvas(CSSParserValueList*, NullableCSSValue&); |
- 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*, NullableCSSValue&); |
+ bool parseDeprecatedLinearGradient(CSSParserValueList*, NullableCSSValue&, CSSGradientRepeat repeating); |
+ bool parseDeprecatedRadialGradient(CSSParserValueList*, NullableCSSValue&, CSSGradientRepeat repeating); |
+ bool parseLinearGradient(CSSParserValueList*, NullableCSSValue&, CSSGradientRepeat repeating); |
+ bool parseRadialGradient(CSSParserValueList*, NullableCSSValue&, CSSGradientRepeat repeating); |
bool parseGradientColorStops(CSSParserValueList*, CSSGradientValue*, bool expectComma); |
- bool parseCrossfade(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&); |
+ bool parseCrossfade(CSSParserValueList*, NullableCSSValue&); |
- PassRefPtrWillBeRawPtr<CSSValue> parseImageSet(CSSParserValueList*); |
+ NullableCSSValue parseImageSet(CSSParserValueList*); |
- PassRefPtrWillBeRawPtr<CSSValue> parseWillChange(); |
+ NullableCSSValue parseWillChange(); |
PassRefPtrWillBeRawPtr<CSSValueList> parseFilter(); |
PassRefPtrWillBeRawPtr<CSSFunctionValue> parseBuiltinFilterArguments(CSSParserValueList*, CSSValueID); |
PassRefPtrWillBeRawPtr<CSSValueList> parseTransformOrigin(); |
PassRefPtrWillBeRawPtr<CSSValueList> parseTransform(bool useLegacyParsing); |
- PassRefPtrWillBeRawPtr<CSSValue> parseTransformValue(bool useLegacyParsing, CSSParserValue*); |
+ NullableCSSValue parseTransformValue(bool useLegacyParsing, CSSParserValue*); |
- PassRefPtrWillBeRawPtr<CSSValue> parseMotionPath(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseMotionRotation(); |
+ NullableCSSValue parseMotionPath(); |
+ NullableCSSValue parseMotionRotation(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseTextEmphasisStyle(); |
+ NullableCSSValue parseTextEmphasisStyle(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseTouchAction(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollBlocksOn(); |
+ NullableCSSValue parseTouchAction(); |
+ NullableCSSValue parseScrollBlocksOn(); |
- void addTextDecorationProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important); |
+ void addTextDecorationProperty(CSSPropertyID, CSSValue, bool important); |
bool parseTextDecoration(CSSPropertyID propId, bool important); |
- PassRefPtrWillBeRawPtr<CSSValue> parseTextIndent(); |
+ NullableCSSValue parseTextIndent(); |
PassRefPtrWillBeRawPtr<CSSLineBoxContainValue> parseLineBoxContain(); |
bool parseCalculation(CSSParserValue*, ValueRange); |
bool parseFontFeatureTag(CSSValueList*); |
- PassRefPtrWillBeRawPtr<CSSValue> parseFontFeatureSettings(); |
+ NullableCSSValue parseFontFeatureSettings(); |
bool parseFontVariantLigatures(bool important); |
- bool parseGeneratedImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&); |
+ bool parseGeneratedImage(CSSParserValueList*, NullableCSSValue&); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveCustomIdentValue(CSSParserValue*); |
- PassRefPtrWillBeRawPtr<CSSValue> createCSSImageValueWithReferrer(const String& rawValue, const KURL&); |
+ CSSValue createCSSImageValueWithReferrer(const String& rawValue, const KURL&); |
PassRefPtrWillBeRawPtr<CSSBasicShape> parseInsetRoundedCorners(PassRefPtrWillBeRawPtr<CSSBasicShapeInset>, CSSParserValueList*); |
@@ -361,12 +361,12 @@ private: |
bool parseDeprecatedGradientColorStop(CSSParserValue*, CSSGradientColorStop&); |
- void commitBorderImageProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important); |
+ void commitBorderImageProperty(CSSPropertyID, NullableCSSValue, bool important); |
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapPoints(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapDestination(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapCoordinate(); |
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapPosition(); |
+ NullableCSSValue parseScrollSnapPoints(); |
+ NullableCSSValue parseScrollSnapDestination(); |
+ NullableCSSValue parseScrollSnapCoordinate(); |
+ NullableCSSValue parseScrollSnapPosition(); |
private: |
// Inputs: |