Split out Color from CSSPrimitiveValue

third_party/WebKit/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 497 matching lines @@
         ASSERT(list->length() == 2);
         url = toCSSURIValue(list->item(0))->value();
         value = list->item(1);
     }
 
     Color color;
     SVGPaintType paintType = SVG_PAINTTYPE_RGBCOLOR;
     if (value->isURIValue()) {
         paintType = SVG_PAINTTYPE_URI;
         url = toCSSURIValue(value)->value();
+    } else if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone) {
+        paintType = url.isEmpty() ? SVG_PAINTTYPE_NONE : SVG_PAINTTYPE_URI_NONE;
+    } else if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueCurrentcolor) {

[alancutter (OOO until 2018), 2015/10/07 06:34:25]

The old code wasn't checking isPrimitiveValue() so we shouldn't add it here.

[sashab, 2015/10/12 23:04:50]

Unfortunately I have to write it this way, otherwise
toCSSPrimitiveValue(value)->getValueID() will assert fail.

+        color = state.style()->color();
+        paintType = url.isEmpty() ? SVG_PAINTTYPE_CURRENTCOLOR : SVG_PAINTTYPE_URI_CURRENTCOLOR;
     } else {
-        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;
-        }
+        color = StyleBuilderConverter::convertColor(state, value);
+        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