Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

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 "StyleBuilderFunctions.h"
 
@@ skipping 21 matching lines @@
 state.style()->accessSVGStyle().{{property.setter}}
 {%- elif property.font %}
 state.fontBuilder().{{property.setter}}
 {%- else %}
 state.style()->{{property.setter}}
 {%- endif %}
 {% endmacro %}
 {% macro convert_and_set_value(property) %}
 {% if property.converter %}
 {{set_value(property)}}(StyleBuilderConverter::{{property.converter}}(state, value));
+{# TODO(sashab): Remove this list from this file. #}
+{% elif property.type_name in ['short', 'unsigned short', 'int', 'unsigned int', 'unsigned', 'float', 'LineClampValue'] %}
+{{set_value(property)}}(toCSSPrimitiveValue(value).convertTo<{{property.type_name}}>());
 {%- else %}
-{{set_value(property)}}(toCSSPrimitiveValue(value).convertTo<{{property.type_name}}>());
+{{set_value(property)}}(toCSSIdentifierValue(value).convertTo<{{property.type_name}}>());
 {%- endif %}
 {% endmacro %}
 {% macro set_is_inherited(property) %}
 state.style()->{{property.is_inherited_setter}}
 {% endmacro %}
 
 namespace blink {
 
 {% for property_id, property in properties.items() if property.should_declare_functions %}
 {% set apply_type = property.apply_type %}
@@ skipping 92 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() && toCSSPrimitiveValue(value).getValueID() == {{auto_identity}})
+    if (value.isIdentifierValue() && toCSSIdentifierValue(value).getValueID() == {{auto_identity}})
         state.style()->{{auto_setter}}();
     else
         {{convert_and_set_value(property)}}
 }
 {% endmacro %}
 {{apply_auto('CSSPropertyClip')}}
 {{apply_auto('CSSPropertyColumnCount')}}
 {{apply_auto('CSSPropertyColumnGap', auto_getter='hasNormalColumnGap', auto_setter='setHasNormalColumnGap', auto_identity='CSSValueNormal')}}
 {{apply_auto('CSSPropertyColumnWidth')}}
 {{apply_auto('CSSPropertyZIndex')}}
@@ skipping 174 matching lines @@
         CounterDirectives& directives = map.add(it->key, CounterDirectives()).storedValue->value;
         directives.inherit{{action}}(it->value);
     }
 }
 
 {{declare_value_function(property_id)}}
 {
     state.style()->clear{{action}}Directives();
 
     if (!value.isValueList()) {
-        DCHECK(value.isPrimitiveValue());
-        DCHECK_EQ(toCSSPrimitiveValue(value).getValueID(), CSSValueNone);
+        DCHECK(value.isIdentifierValue());
+        DCHECK_EQ(toCSSIdentifierValue(value).getValueID(), CSSValueNone);
         return;
     }
 
     CounterDirectiveMap& map = state.style()->accessCounterDirectives();
 
     const CSSValueList& list = toCSSValueList(value);
 
     for (size_t i = 0; i < list.length(); ++i) {
         const CSSValuePair& pair = toCSSValuePair(list.item(i));
         AtomicString identifier(toCSSCustomIdentValue(pair.first()).value());
@@ skipping 165 matching lines @@
         DCHECK_EQ(list.length(), 2U);
         url = toCSSURIValue(list.item(0)).value();
         localValue = &list.item(1);
     }
 
     Color color;
     SVGPaintType paintType = SVG_PAINTTYPE_RGBCOLOR;
     if (localValue->isURIValue()) {
         paintType = SVG_PAINTTYPE_URI;
         url = toCSSURIValue(localValue)->value();
-    } else if (localValue->isPrimitiveValue() && toCSSPrimitiveValue(localValue)->getValueID() == CSSValueNone) {
+    } else if (localValue->isIdentifierValue() && toCSSIdentifierValue(localValue)->getValueID() == CSSValueNone) {
         paintType = url.isEmpty() ? SVG_PAINTTYPE_NONE : SVG_PAINTTYPE_URI_NONE;
-    } else if (localValue->isPrimitiveValue() && toCSSPrimitiveValue(localValue)->getValueID() == CSSValueCurrentcolor) {
+    } else if (localValue->isIdentifierValue() && toCSSIdentifierValue(localValue)->getValueID() == CSSValueCurrentcolor) {
         color = state.style()->color();
         paintType = url.isEmpty() ? SVG_PAINTTYPE_CURRENTCOLOR : SVG_PAINTTYPE_URI_CURRENTCOLOR;
     } else {
         color = StyleBuilderConverter::convertColor(state, *localValue);
         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