CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/parser/CSSPropertyParser.h

Index: Source/core/css/parser/CSSPropertyParser.h
diff --git a/Source/core/css/parser/CSSPropertyParser.h b/Source/core/css/parser/CSSPropertyParser.h
index 3384c8e043dd73588b9e821c55f7180f7274a3c8..11d42e32612f18e2fa6c3caa8de9ca0fb2672c9c 100644
--- a/Source/core/css/parser/CSSPropertyParser.h
+++ b/Source/core/css/parser/CSSPropertyParser.h
@@ -96,7 +96,7 @@ private:
     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);
@@ -109,14 +109,14 @@ private:
 
     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);
@@ -149,7 +149,7 @@ private:
     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);
@@ -159,13 +159,13 @@ private:
     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);
@@ -173,8 +173,8 @@ private:
 
     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);
@@ -190,16 +190,16 @@ private:
 
     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);
@@ -217,8 +217,8 @@ private:
     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();
@@ -274,9 +274,9 @@ private:
 
     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&);
 
@@ -290,7 +290,7 @@ private:
         Orientation,
     };
 
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parsePage();
+    NullableCSSValue parsePage();
     PassRefPtrWillBeRawPtr<CSSValueList> parseSize();
     SizeParameterType parseSizeParameter(CSSValueList* parsedValues, CSSParserValue*, SizeParameterType prevParamType);
 
@@ -353,7 +353,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, RefPtrWillBeRawPtr<CSSPrimitiveValue>&);
+    bool parseBorderImageQuad(Units, NullableCSSValue&);
     int colorIntFromValue(CSSParserValue*);
     bool isCalculation(CSSParserValue*);