Unify handling of <color> for SVG/non-SVG properties

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 502 matching lines @@
 {{declare_value_function(property_id)}}
 {
     String url;
     if (value->isValueList()) {
         CSSValueList* list = toCSSValueList(value);
         ASSERT(list->length() > 1);
 
         if (!list->item(0)->isPrimitiveValue())
             return;
 
-        CSSPrimitiveValue* pValue = toCSSPrimitiveValue(list->item(0));
-        if (!pValue->isURI())
+        CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(list->item(0));
+        if (!primitiveValue->isURI())
             return;
 
-        url = pValue->getStringValue();
+        url = primitiveValue->getStringValue();
         value = list->item(1);
     }
     if (value->isPrimitiveValue()) {
-        CSSPrimitiveValue* pValue = toCSSPrimitiveValue(value);
-        Color c;
-        SVGPaintType ptype = SVG_PAINTTYPE_RGBCOLOR;
-        if (pValue->isRGBColor()) {
-            c = pValue->getRGBA32Value();
-            ptype = url.isEmpty() ? SVG_PAINTTYPE_RGBCOLOR : SVG_PAINTTYPE_URI_RGBCOLOR;
-        } else if (pValue->getValueID() == CSSValueCurrentcolor) {
-            c = state.style()->color();
-            ptype = url.isEmpty() ? SVG_PAINTTYPE_CURRENTCOLOR : SVG_PAINTTYPE_URI_CURRENTCOLOR;
-        } else if (pValue->getValueID() == CSSValueNone) {
-            ptype = url.isEmpty() ? SVG_PAINTTYPE_NONE : SVG_PAINTTYPE_URI_NONE;
-        } else if (pValue->isURI()) {
-            ptype = SVG_PAINTTYPE_URI;
-            url = pValue->getStringValue();
+        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()) {
+            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 {
-            return;
+            color = StyleBuilderConverter::convertColor(state, primitiveValue);
+            paintType = url.isEmpty() ? SVG_PAINTTYPE_RGBCOLOR : SVG_PAINTTYPE_URI_RGBCOLOR;
         }
-        {{set_value(property)}}(ptype, c, url,
+        {{set_value(property)}}(paintType, color, url,
             state.applyPropertyToRegularStyle(),
             state.applyPropertyToVisitedLinkStyle());
     }
 }
 {% endmacro %}
 {{apply_svg_paint('CSSPropertyFill', 'FillPaint')}}
 {{apply_svg_paint('CSSPropertyStroke', 'StrokePaint')}}
 } // namespace blink