CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/parser/CSSPropertyParser.h

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 - 2010  Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 78 matching lines @@
     bool parseViewportProperty(CSSPropertyID propId, bool important);
     bool parseViewportShorthand(CSSPropertyID propId, CSSPropertyID first, CSSPropertyID second, bool important);
     bool parseFontFaceDescriptor(CSSPropertyID);
 
     KURL completeURL(const String& url) const;
 
     void addProperty(CSSPropertyID, CSSValue, bool important, bool implicit = false);
     void rollbackLastProperties(int num);
     void addExpandedPropertyForValue(CSSPropertyID propId, CSSValue, bool);
 
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, CSSParserValue*);
+    NullableCSSValue parseValidPrimitive(CSSValueID ident, CSSParserValue*);
 
     bool parseShorthand(CSSPropertyID, const StylePropertyShorthand&, bool important);
     bool parse4Values(CSSPropertyID, const CSSPropertyID* properties, bool important);
     PassRefPtrWillBeRawPtr<CSSValueList> parseContent();
     NullableCSSValue parseQuotes();
 
     NullableCSSValue parseAttr(CSSParserValueList* args);
 
     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);
+    NullableCSSValue parseFillPositionComponent(CSSParserValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillPositionParsingMode = ResolveValuesAsPercent, Units = FUnknown);
     NullableCSSValue parseFillPositionX(CSSParserValueList*);
     NullableCSSValue parseFillPositionY(CSSParserValueList*);
     void parse2ValuesFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, Units = FUnknown);
     bool isPotentialPositionValue(CSSParserValue*);
     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 parse3ValuesFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, CSSPrimitiveValue, CSSPrimitiveValue);
+    void parse4ValuesFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, CSSPrimitiveValue, CSSPrimitiveValue);
 
     void parseFillRepeat(NullableCSSValue&, NullableCSSValue&);
     NullableCSSValue parseFillSize(CSSPropertyID);
 
     bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, NullableCSSValue&, NullableCSSValue&);
     bool parseFillShorthand(CSSPropertyID, const CSSPropertyID* properties, int numProperties, bool important);
 
     void addFillValue(NullableCSSValue& lval, CSSValue rval);
 
     NullableCSSValue parseAnimationDelay();
@@ skipping 12 matching lines @@
     NullableCSSValue parseAnimationProperty(CSSPropertyID, bool useLegacyParsing);
     PassRefPtrWillBeRawPtr<CSSValueList> parseAnimationPropertyList(CSSPropertyID, bool useLegacyParsing);
     bool parseAnimationShorthand(bool useLegacyParsing, bool important);
     bool parseTransitionShorthand(bool important);
 
     NullableCSSValue parseColumnWidth();
     NullableCSSValue parseColumnCount();
     bool parseColumnsShorthand(bool important);
 
     NullableCSSValue parseGridPosition();
-    bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName);
+    bool parseIntegerOrCustomIdentFromGridPosition(NullableCSSValue& numericValue, NullableCSSValue& gridLineName);
     bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
     bool parseGridTemplateRowsAndAreas(NullableCSSValue, bool important);
     bool parseGridTemplateShorthand(bool important);
     bool parseGridShorthand(bool important);
     bool parseGridAreaShorthand(bool important);
     bool parseSingleGridAreaLonghand(NullableCSSValue&);
     NullableCSSValue parseGridTrackList();
     bool parseGridTrackRepeatFunction(CSSValueList&);
     NullableCSSValue parseGridTrackSize(CSSParserValueList& inputList);
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*);
+    NullableCSSValue parseGridBreadth(CSSParserValue*);
     bool parseGridTemplateAreasRow(NamedGridAreaMap&, const size_t, size_t&);
     NullableCSSValue parseGridTemplateAreas();
     bool parseGridLineNames(CSSParserValueList&, CSSValueList&, NullableCSSValue = nullptr);
     NullableCSSValue parseGridAutoFlow(CSSParserValueList&);
 
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseClipShape();
+    NullableCSSValue parseClipShape();
 
     bool parseLegacyPosition(CSSPropertyID, bool important);
     bool parseItemPositionOverflowPosition(CSSPropertyID, bool important);
     NullableCSSValue parseContentDistributionOverflowPosition();
 
     NullableCSSValue parseShapeProperty(CSSPropertyID propId);
     NullableCSSValue parseBasicShapeAndOrBox();
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape();
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);
+    NullableCSSValue parseBasicShape();
+    NullableCSSValue parseShapeRadius(CSSParserValue*);
 
     PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeCircle(CSSParserValueList* args);
     PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeEllipse(CSSParserValueList* args);
     PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapePolygon(CSSParserValueList* args);
     PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeInset(CSSParserValueList* args);
 
     bool parseFont(bool important);
     void parseSystemFont(bool important);
     PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();
 
     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);
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(const CSSParserValue*, bool acceptQuirkyColors = false);
+    NullableCSSValue parseColor(const CSSParserValue*, bool acceptQuirkyColors = false);
     bool parseColorFromValue(const CSSParserValue*, RGBA32&, bool acceptQuirkyColors = false);
 
     bool acceptQuirkyColors(CSSPropertyID) const;
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBackgroundColor(const CSSParserValue*);
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseTapHighlightColor(const CSSParserValue*);
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGradientStopColor(const CSSParserValue*);
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseDeprecatedGradientStopColor(const CSSParserValue*);
+    NullableCSSValue parseBackgroundColor(const CSSParserValue*);
+    NullableCSSValue parseTapHighlightColor(const CSSParserValue*);
+    NullableCSSValue parseGradientStopColor(const CSSParserValue*);
+    NullableCSSValue parseDeprecatedGradientStopColor(const CSSParserValue*);
 
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseLineHeight();
+    NullableCSSValue parseLineHeight();
     bool parseFontSize(bool important);
     bool parseFontVariant(bool important);
     bool parseFontWeight(bool important);
     PassRefPtrWillBeRawPtr<CSSValueList> parseFontFaceSrc();
     PassRefPtrWillBeRawPtr<CSSValueList> parseFontFaceUnicodeRange();
 
     bool parseSVGValue(CSSPropertyID propId, bool important);
     NullableCSSValue parseSVGStrokeDasharray();
 
     NullableCSSValue parsePaintOrder() const;
 
     // CSS3 Parsing Routines (for properties specific to CSS3)
     PassRefPtrWillBeRawPtr<CSSValueList> parseShadow(CSSParserValueList*, CSSPropertyID);
     bool parseBorderImageShorthand(CSSPropertyID, bool important);
     NullableCSSValue parseBorderImage(CSSPropertyID);
     bool parseBorderImageRepeat(NullableCSSValue&);
     bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageSliceValue>&);
-    bool parseBorderImageWidth(RefPtrWillBeRawPtr<CSSPrimitiveValue>&);
-    bool parseBorderImageOutset(RefPtrWillBeRawPtr<CSSPrimitiveValue>&);
+    bool parseBorderImageWidth(NullableCSSValue&);
+    bool parseBorderImageOutset(NullableCSSValue&);
     bool parseBorderRadius(CSSPropertyID, bool important);
 
     NullableCSSValue parseReflect();
 
     bool parseFlex(CSSParserValueList* args, bool important);
 
     NullableCSSValue parsePosition(CSSParserValueList*);
     NullableCSSValue parsePositionList(CSSParserValueList*);
 
     // Image generators
@@ skipping 35 matching lines @@
     PassRefPtrWillBeRawPtr<CSSLineBoxContainValue> parseLineBoxContain();
     bool parseCalculation(CSSParserValue*, ValueRange);
 
     bool parseFontFeatureTag(CSSValueList*);
     NullableCSSValue parseFontFeatureSettings();
 
     bool parseFontVariantLigatures(bool important);
 
     bool parseGeneratedImage(CSSParserValueList*, NullableCSSValue&);
 
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*);
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*);
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveCustomIdentValue(CSSParserValue*);
+    CSSPrimitiveValue createPrimitiveNumericValue(CSSParserValue*);
+    CSSPrimitiveValue createPrimitiveStringValue(CSSParserValue*);
+    CSSPrimitiveValue createPrimitiveCustomIdentValue(CSSParserValue*);
 
     CSSValue createCSSImageValueWithReferrer(const String& rawValue, const KURL&);
 
     PassRefPtrWillBeRawPtr<CSSBasicShape> parseInsetRoundedCorners(PassRefPtrWillBeRawPtr<CSSBasicShapeInset>, CSSParserValueList*);
 
     enum SizeParameterType {
         None,
         Auto,
         Length,
         PageSize,
         Orientation,
     };
 
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parsePage();
+    NullableCSSValue parsePage();
     PassRefPtrWillBeRawPtr<CSSValueList> parseSize();
     SizeParameterType parseSizeParameter(CSSValueList* parsedValues, CSSParserValue*, SizeParameterType prevParamType);
 
     bool parseFontFaceSrcURI(CSSValueList*);
     bool parseFontFaceSrcLocal(CSSValueList*);
 
     class ImplicitScope {
         STACK_ALLOCATED();
         WTF_MAKE_NONCOPYABLE(ImplicitScope);
     public:
@@ skipping 42 matching lines @@
 
     bool validWidthOrHeight(CSSParserValue*, Units);
 
     bool validCalculationUnit(CSSParserValue*, Units, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue);
 
     bool shouldAcceptUnitLessValues(CSSParserValue*, Units, CSSParserMode);
 
     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, NullableCSSValue&);
     int colorIntFromValue(CSSParserValue*);
     bool isCalculation(CSSParserValue*);
 
     bool buildBorderImageParseContext(CSSPropertyID, BorderImageParseContext&);
 
     bool parseDeprecatedGradientColorStop(CSSParserValue*, CSSGradientColorStop&);
 
     void commitBorderImageProperty(CSSPropertyID, NullableCSSValue, bool important);
 
     NullableCSSValue parseScrollSnapPoints();
@@ skipping 16 matching lines @@
     bool m_implicitShorthand;
     RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;
 };
 
 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
 CSSValueID cssValueKeywordID(const CSSParserString&);
 
 } // namespace blink
 
 #endif // CSSPropertyParser_h