Split out String, URI and CustomIdent from 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"
 
 #include "CSSValueKeywords.h"
 #include "core/css/BasicShapeFunctions.h"
 #include "core/css/CSSContentDistributionValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
+#include "core/css/CSSStringValue.h"
 #include "core/css/CSSValuePair.h"
 #include "core/css/resolver/StyleResolverState.h"
 
 {% macro declare_initial_function(property_id) %}
 void StyleBuilderFunctions::applyInitial{{property_id}}(StyleResolverState& state)
 {%- endmacro %}
 {% macro declare_inherit_function(property_id) %}
 void StyleBuilderFunctions::applyInherit{{property_id}}(StyleResolverState& state)
 {%- endmacro %}
 {% macro declare_value_function(property_id) %}
@@ skipping 314 matching lines @@
         return;
     }
 
     CounterDirectiveMap& map = state.style()->accessCounterDirectives();
 
     CSSValueList* list = toCSSValueList(value);
 
     int length = list ? list->length() : 0;
     for (int i = 0; i < length; ++i) {
         const CSSValuePair* pair = toCSSValuePair(list->item(i));
-        AtomicString identifier(toCSSPrimitiveValue(pair->first())->getStringValue());
+        AtomicString identifier(toCSSStringValue(pair->first())->getStringValue());
         int value = toCSSPrimitiveValue(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());
 }
@@ skipping 136 matching lines @@
         state.applyPropertyToRegularStyle(),
         state.applyPropertyToVisitedLinkStyle());
 }
 
 {{declare_value_function(property_id)}}
 {
     String url;
     if (value->isValueList()) {
         CSSValueList* list = toCSSValueList(value);
         ASSERT(list->length() == 2);
-        url = toCSSPrimitiveValue(list->item(0))->getStringValue();
+        url = toCSSStringValue(list->item(0))->getStringValue();
         value = list->item(1);
     }
 
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     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()) {
+    if (value->isStringValue()) {
+        ASSERT(toCSSStringValue(value)->serializationType() == CSSStringValue::SerializeAsURI);
         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;
+        url = toCSSStringValue(value)->getStringValue();
     } else {
-        color = StyleBuilderConverter::convertColor(state, primitiveValue);
-        paintType = url.isEmpty() ? SVG_PAINTTYPE_RGBCOLOR : SVG_PAINTTYPE_URI_RGBCOLOR;
+        CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
+        if (primitiveValue->getValueID() == CSSValueNone) {
+            paintType = url.isEmpty() ? SVG_PAINTTYPE_NONE : SVG_PAINTTYPE_URI_NONE;
+        } else if (primitiveValue->getValueID() == CSSValueCurrentcolor) {
+            color = state.style()->color();
+            paintType = url.isEmpty() ? SVG_PAINTTYPE_CURRENTCOLOR : SVG_PAINTTYPE_URI_CURRENTCOLOR;
+        } else {
+            color = StyleBuilderConverter::convertColor(state, primitiveValue);
+            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