CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/resolver/StyleBuilderCustom.cpp

Index: Source/core/css/resolver/StyleBuilderCustom.cpp
diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp
index 45e3585ef0f3047c149125ab133e42373aed3349..bb17fbe351c89929b7cc32a1bab60dcca761a2cd 100644
--- a/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -152,7 +152,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyColor(StyleResolverState& sta
 
 void StyleBuilderFunctions::applyValueCSSPropertyColor(StyleResolverState& state, CSSValue value)
 {
-    CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
     // As per the spec, 'color: currentColor' is treated as 'color: inherit'
     if (primitiveValue.getValueID() == CSSValueCurrentcolor) {
         applyInheritCSSPropertyColor(state);
@@ -271,14 +271,14 @@ void StyleBuilderFunctions::applyInheritCSSPropertyOutlineStyle(StyleResolverSta
 
 void StyleBuilderFunctions::applyValueCSSPropertyOutlineStyle(StyleResolverState& state, CSSValue value)
 {
-    CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
     state.style()->setOutlineStyleIsAuto(primitiveValue);
     state.style()->setOutlineStyle(primitiveValue);
 }
 
 void StyleBuilderFunctions::applyValueCSSPropertyResize(StyleResolverState& state, CSSValue value)
 {
-    CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
 
     EResize r = RESIZE_NONE;
     if (primitiveValue.getValueID() == CSSValueAuto) {
@@ -292,7 +292,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyResize(StyleResolverState& stat
 
 static float mmToPx(float mm) { return mm * cssPixelsPerMillimeter; }
 static float inchToPx(float inch) { return inch * cssPixelsPerInch; }
-static FloatSize getPageSizeFromName(CSSPrimitiveValue& pageSizeName)
+static FloatSize getPageSizeFromName(CSSPrimitiveValue pageSizeName)
 {
     switch (pageSizeName.getValueID()) {
     case CSSValueA5:
@@ -327,8 +327,8 @@ void StyleBuilderFunctions::applyValueCSSPropertySize(StyleResolverState& state,
     CSSValueList& list = toCSSValueList(value);
     if (list.length() == 2) {
         // <length>{2} | <page-size> <orientation>
-        CSSPrimitiveValue& first = toCSSPrimitiveValue(list.item(0));
-        CSSPrimitiveValue& second = toCSSPrimitiveValue(list.item(1));
+        CSSPrimitiveValue first = toCSSPrimitiveValue(list.item(0));
+        CSSPrimitiveValue second = toCSSPrimitiveValue(list.item(1));
         if (first.isLength()) {
             // <length>{2}
             size = FloatSize(first.computeLength<float>(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0)),
@@ -345,7 +345,7 @@ void StyleBuilderFunctions::applyValueCSSPropertySize(StyleResolverState& state,
     } else {
         ASSERT(list.length() == 1);
         // <length> | auto | <page-size> | [ portrait | landscape]
-        CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(list.item(0));
+        CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(list.item(0));
         if (primitiveValue.isLength()) {
             // <length>
             pageSizeType = PAGE_SIZE_RESOLVED;
@@ -375,7 +375,7 @@ void StyleBuilderFunctions::applyValueCSSPropertySize(StyleResolverState& state,
 
 void StyleBuilderFunctions::applyValueCSSPropertyTextAlign(StyleResolverState& state, CSSValue value)
 {
-    CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
     if (primitiveValue.isValueID() && primitiveValue.getValueID() != CSSValueWebkitMatchParent)
         state.style()->setTextAlign(primitiveValue);
     else if (state.parentStyle()->textAlign() == TASTART)
@@ -407,7 +407,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyTextIndent(StyleResolverState&
     TextIndentType textIndentTypeValue = ComputedStyle::initialTextIndentType();
 
     for (auto& listValue : toCSSValueList(value)) {
-        CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(listValue);
+        CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(listValue);
         if (!primitiveValue.getValueID())
             lengthOrPercentageValue = primitiveValue.convertToLength(state.cssToLengthConversionData());
         else if (primitiveValue.getValueID() == CSSValueEachLine)
@@ -479,7 +479,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyMotionRotation(StyleResolverSta
     for (int i = 0; i < len; i++) {
         CSSValue item = list.item(i);
         ASSERT(item.isPrimitiveValue());
-        CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(item);
+        CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(item);
         if (primitiveValue.getValueID() == CSSValueAuto) {
             rotationType = MotionRotationAuto;
         } else if (primitiveValue.getValueID() == CSSValueReverse) {
@@ -504,7 +504,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyVerticalAlign(StyleResolverSt
 
 void StyleBuilderFunctions::applyValueCSSPropertyVerticalAlign(StyleResolverState& state, CSSValue value)
 {
-    CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
 
     if (primitiveValue.getValueID())
         state.style()->setVerticalAlign(primitiveValue);
@@ -533,7 +533,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyZoom(StyleResolverState& stat
 void StyleBuilderFunctions::applyValueCSSPropertyZoom(StyleResolverState& state, CSSValue value)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(value.isPrimitiveValue());
-    CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
 
     if (primitiveValue.getValueID() == CSSValueNormal) {
         resetEffectiveZoom(state);
@@ -566,7 +566,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitBorderImage(StyleResolver
 void StyleBuilderFunctions::applyValueCSSPropertyWebkitClipPath(StyleResolverState& state, CSSValue value)
 {
     if (value.isPrimitiveValue()) {
-        CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+        CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
         if (primitiveValue.getValueID() == CSSValueNone) {
             state.style()->setClipPath(nullptr);
         } else if (primitiveValue.isShape()) {
@@ -607,7 +607,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextEmphasisStyle(StyleRe
         CSSValueList& list = toCSSValueList(value);
         ASSERT(list.length() == 2);
         for (unsigned i = 0; i < 2; ++i) {
-            CSSPrimitiveValue& value = toCSSPrimitiveValue(list.item(i));
+            CSSPrimitiveValue value = toCSSPrimitiveValue(list.item(i));
             if (value.getValueID() == CSSValueFilled || value.getValueID() == CSSValueOpen)
                 state.style()->setTextEmphasisFill(value);
             else
@@ -617,7 +617,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextEmphasisStyle(StyleRe
         return;
     }
 
-    CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
 
     if (primitiveValue.isString()) {
         state.style()->setTextEmphasisFill(TextEmphasisFillFilled);
@@ -661,7 +661,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWillChange(StyleResolverState&
     Vector<CSSPropertyID> willChangeProperties;
 
     for (auto& willChangeValue : toCSSValueList(value)) {
-        CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(willChangeValue);
+        CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(willChangeValue);
         if (CSSPropertyID propertyID = primitiveValue.getPropertyID())
             willChangeProperties.append(propertyID);
         else if (primitiveValue.getValueID() == CSSValueContents)
@@ -711,7 +711,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& sta
         if (!item.isPrimitiveValue())
             continue;
 
-        CSSPrimitiveValue& contentValue = toCSSPrimitiveValue(item);
+        CSSPrimitiveValue contentValue = toCSSPrimitiveValue(item);
 
         if (contentValue.isString()) {
             state.style()->setContent(contentValue.getStringValue().impl(), didSet);
@@ -765,7 +765,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& sta
 
 void StyleBuilderFunctions::applyValueCSSPropertyWebkitLocale(StyleResolverState& state, CSSValue value)
 {
-    const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    const CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
     if (primitiveValue.getValueID() == CSSValueAuto)
         state.style()->setLocale(nullAtom);
     else
@@ -783,7 +783,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyWebkitAppRegion(StyleResolver
 
 void StyleBuilderFunctions::applyValueCSSPropertyWebkitAppRegion(StyleResolverState& state, CSSValue value)
 {
-    const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    const CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
     state.style()->setDraggableRegionMode(primitiveValue.getValueID() == CSSValueDrag ? DraggableRegionDrag : DraggableRegionNoDrag);
     state.document().setHasAnnotatedRegions(true);
 }
@@ -811,7 +811,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyBaselineShift(StyleResolverSt
 void StyleBuilderFunctions::applyValueCSSPropertyBaselineShift(StyleResolverState& state, CSSValue value)
 {
     SVGComputedStyle& svgStyle = state.style()->accessSVGStyle();
-    CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
     if (!primitiveValue.isValueID()) {
         svgStyle.setBaselineShift(BS_LENGTH);
         svgStyle.setBaselineShiftValue(StyleBuilderConverter::convertLength(state, value));