CSSValue Immediates: Add move operators to CSSPrimitiveValue

Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

 {% from 'macros.tmpl' import license %}
 {#
     This file is for property handlers which use the templating engine to
     reduce (handwritten) code duplication.
 
     The `properties' dict can be used to access a property's parameters in
     jinja2 templates (i.e. setter, getter, initial, type_name)
 #}
 #include "config.h"
 #include "StyleBuilderFunctions.h"
@@ skipping 124 matching lines @@
         state.style()->{{auto_setter}}();
     else
         {{set_value(property)}}(state.parentStyle()->{{property.getter}}());
 }
 
 {{declare_value_function(property_id)}}
 {
     if (!value.isPrimitiveValue())
         return;
 
-    CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+    const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
     if (primitiveValue.getValueID() == {{auto_identity}})
         state.style()->{{auto_setter}}();
     else
         {{convert_and_set_value(property)}}
 }
 {% endmacro %}
 {{apply_auto('CSSPropertyClip')}}
 {{apply_auto('CSSPropertyOrphans')}}
 {{apply_auto('CSSPropertyWebkitColumnCount')}}
 {{apply_auto('CSSPropertyWebkitColumnGap', auto_getter='hasNormalColumnGap', auto_setter='setHasNormalColumnGap', auto_identity='CSSValueNormal')}}
@@ skipping 187 matching lines @@
         ASSERT(value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() == CSSValueNone);
         return;
     }
 
     CounterDirectiveMap& map = state.style()->accessCounterDirectives();
 
     CSSValueList& list = toCSSValueList(value);
 
     int length = list.length();
     for (int i = 0; i < length; ++i) {
-        CSSValue currValue = list.item(i);
+        const CSSValue& currValue = list.item(i);
         if (!currValue.isPrimitiveValue())
             continue;
 
         Pair* pair = toCSSPrimitiveValue(currValue).getPairValue();
-        if (!pair || !pair->first() || !pair->second())
+        if (!pair)
             continue;
 
-        AtomicString identifier(pair->first()->getStringValue());
-        int value = pair->second()->getIntValue();
+        AtomicString identifier(pair->first().getStringValue());
+        int value = pair->second().getIntValue();
         CounterDirectives& directives = map.add(identifier, CounterDirectives()).storedValue->value;
         {% if action == 'Reset' %}
         directives.setResetValue(value);
         {% else %}
         directives.addIncrementValue(value);
         {% endif %}
     }
     ASSERT(!map.isEmpty());
 }
 {% endmacro %}
@@ skipping 133 matching lines @@
         svgParentStyle.{{paint_type|lower_first}}Type(),
         svgParentStyle.{{paint_type|lower_first}}Color(),
         svgParentStyle.{{paint_type|lower_first}}Uri(),
         state.applyPropertyToRegularStyle(),
         state.applyPropertyToVisitedLinkStyle());
 }
 
 {{declare_value_function(property_id)}}
 {
     String url;
-    CSSValue valueToUse = value;
-    if (valueToUse.isValueList()) {
-        CSSValueList& list = toCSSValueList(valueToUse);
+    CSSValue realValue = value;
+    if (realValue.isValueList()) {
+        const CSSValueList& list = toCSSValueList(realValue);
         ASSERT(list.length() > 1);
 
         if (!list.item(0).isPrimitiveValue())
             return;
 
-        CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(list.item(0));
+        const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(list.item(0));
         if (!primitiveValue.isURI())
             return;
 
         url = primitiveValue.getStringValue();
-        valueToUse = list.item(1);
+        realValue = list.item(1);
     }
-    if (valueToUse.isPrimitiveValue()) {
-        CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(valueToUse);
+    if (realValue.isPrimitiveValue()) {
+        const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(realValue);
         Color color;
         SVGPaintType paintType = SVG_PAINTTYPE_RGBCOLOR;
         if (primitiveValue.getValueID() == CSSValueNone) {
             paintType = url.isEmpty() ? SVG_PAINTTYPE_NONE : SVG_PAINTTYPE_URI_NONE;
         } else if (primitiveValue.isURI()) {
             paintType = SVG_PAINTTYPE_URI;
             url = primitiveValue.getStringValue();
         } else if (primitiveValue.getValueID() == CSSValueCurrentcolor) {
             color = state.style()->color();
             paintType = url.isEmpty() ? SVG_PAINTTYPE_CURRENTCOLOR : SVG_PAINTTYPE_URI_CURRENTCOLOR;
         } else {
-            color = StyleBuilderConverter::convertColor(state, valueToUse);
+            color = StyleBuilderConverter::convertColor(state, realValue);
             paintType = url.isEmpty() ? SVG_PAINTTYPE_RGBCOLOR : SVG_PAINTTYPE_URI_RGBCOLOR;
         }
         {{set_value(property)}}(paintType, color, url,
             state.applyPropertyToRegularStyle(),
             state.applyPropertyToVisitedLinkStyle());
     }
 }
 {% endmacro %}
 {{apply_svg_paint('CSSPropertyFill', 'FillPaint')}}
 {{apply_svg_paint('CSSPropertyStroke', 'StrokePaint')}}
 } // namespace blink