Clean up some StyleBuilder property application code

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 121 matching lines @@
 {{declare_inherit_function(property_id)}}
 {
     if (state.parentStyle()->{{auto_getter}}())
         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);
     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')}}
@@ skipping 189 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) {
         CSSValue* currValue = list->item(i);
-        if (!currValue->isPrimitiveValue())
-            continue;
-
         Pair* pair = toCSSPrimitiveValue(currValue)->getPairValue();
-        if (!pair || !pair->first() || !pair->second())
-            continue;
-
         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());
@@ skipping 96 matching lines @@
     state.style()->setGridTemplate{{type}}s(state.parentStyle()->gridTemplate{{type}}s());
     state.style()->setNamedGrid{{type}}Lines(state.parentStyle()->namedGrid{{type}}Lines());
     state.style()->setOrderedNamedGrid{{type}}Lines(state.parentStyle()->orderedNamedGrid{{type}}Lines());
 }
 
 {{declare_value_function(property_id)}}
 {
     Vector<GridTrackSize> trackSizes;
     NamedGridLinesMap namedGridLines;
     OrderedNamedGridLines orderedNamedGridLines;
-    if (!StyleBuilderConverter::convertGridTrackList(value, trackSizes, namedGridLines, orderedNamedGridLines, state))
-        return;
+    StyleBuilderConverter::convertGridTrackList(value, trackSizes, namedGridLines, orderedNamedGridLines, state);
     const NamedGridAreaMap& namedGridAreas = state.style()->namedGridArea();
     if (!namedGridAreas.isEmpty())
         StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(namedGridAreas, namedGridLines, For{{type}}s);
     state.style()->setGridTemplate{{type}}s(trackSizes);
     state.style()->setNamedGrid{{type}}Lines(namedGridLines);
     state.style()->setOrderedNamedGrid{{type}}Lines(orderedNamedGridLines);
 }
 {% endmacro %}
 {{apply_grid_template('CSSPropertyGridTemplateColumns', 'Column')}}
 {{apply_grid_template('CSSPropertyGridTemplateRows', 'Row')}}
@@ skipping 19 matching lines @@
         svgParentStyle.{{paint_type|lower_first}}Uri(),
         state.applyPropertyToRegularStyle(),
         state.applyPropertyToVisitedLinkStyle());
 }
 
 {{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* primitiveValue = toCSSPrimitiveValue(list->item(0));
-        if (!primitiveValue->isURI())
-            return;
-
-        url = primitiveValue->getStringValue();
+        ASSERT(list->length() == 2);
+        url = toCSSPrimitiveValue(list->item(0))->getStringValue();
         value = list->item(1);
     }
-    if (value->isPrimitiveValue()) {
-        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 {
-            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());
+
+    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 {
+        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