Use common converter for -webkit-column-[gap, width].

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 15 matching lines @@
 {%- endmacro %}
 {% macro set_value(property) %}
 {% if property.svg %}
 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));
+{%- else %}
+{{set_value(property)}}(static_cast<{{property.type_name}}>(*toCSSPrimitiveValue(value)));
+{%- endif %}
+{% endmacro %}
 
 namespace blink {
 
 {% for property_id, property in properties.items() if property.should_declare_functions %}
 {% set apply_type = property.apply_type %}
 {% if not property.custom_initial %}
 {{declare_initial_function(property_id)}}
 {
     {% if property.svg %}
     {{set_value(property)}}(SVGRenderStyle::{{property.initial}}());
@@ skipping 14 matching lines @@
     {{set_value(property)}}(state.parentFontDescription().{{property.getter}}());
     {% else %}
     {{set_value(property)}}(state.parentStyle()->{{property.getter}}());
     {% endif %}
 }
 
 {% endif %}
 {% if not property.custom_value %}
 {{declare_value_function(property_id)}}
 {
-    {% if property.converter %}
-    {{set_value(property)}}(StyleBuilderConverter::{{property.converter}}(state, value));
-    {% else %}
-    {{set_value(property)}}(static_cast<{{property.type_name}}>(*toCSSPrimitiveValue(value)));
-    {% endif %}
+    {{convert_and_set_value(property)}}
 }
 
 {% endif %}
 {% endfor %}
 
 {% macro apply_animation(property_id, attribute, animation) %}
 {% set vector = attribute|lower_first + "List()" %}
 {{declare_initial_function(property_id)}}
 {
     CSS{{animation}}Data& data = state.style()->access{{animation}}s();
@@ skipping 24 matching lines @@
 {{apply_animation('CSSPropertyWebkitAnimationFillMode', 'FillMode', 'Animation')}}
 {{apply_animation('CSSPropertyWebkitAnimationIterationCount', 'IterationCount', 'Animation')}}
 {{apply_animation('CSSPropertyWebkitAnimationName', 'Name', 'Animation')}}
 {{apply_animation('CSSPropertyWebkitAnimationPlayState', 'PlayState', 'Animation')}}
 {{apply_animation('CSSPropertyWebkitAnimationTimingFunction', 'TimingFunction', 'Animation')}}
 {{apply_animation('CSSPropertyWebkitTransitionDelay', 'Delay', 'Transition')}}
 {{apply_animation('CSSPropertyWebkitTransitionDuration', 'Duration', 'Transition')}}
 {{apply_animation('CSSPropertyWebkitTransitionProperty', 'Property', 'Transition')}}
 {{apply_animation('CSSPropertyWebkitTransitionTimingFunction', 'TimingFunction', 'Transition')}}
 
-{% macro apply_auto(property_id, auto_getter=none, auto_setter=none, auto_identity='CSSValueAuto', compute_length=false) %}
+{% macro apply_auto(property_id, auto_getter=none, auto_setter=none, auto_identity='CSSValueAuto') %}
 {% set property = properties[property_id] %}
 {% set auto_getter = auto_getter or 'hasAuto' + property.name_for_methods %}
 {% set auto_setter = auto_setter or 'setHasAuto' + property.name_for_methods %}
 {{declare_initial_function(property_id)}}
 {
     state.style()->{{auto_setter}}();
 }
 
 {{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
-        {% if compute_length %}
-        {{set_value(property)}}(primitiveValue->computeLength<{{property.type_name}}>(state.cssToLengthConversionData()));
-        {% else %}
-        {{set_value(property)}}(*primitiveValue);
-        {% endif %}
+        {{convert_and_set_value(property)}}
 }
 {% endmacro %}
 {{apply_auto('CSSPropertyOrphans')}}
 {{apply_auto('CSSPropertyWebkitColumnCount')}}
-{{apply_auto('CSSPropertyWebkitColumnGap', auto_getter='hasNormalColumnGap', auto_setter='setHasNormalColumnGap', auto_identity='CSSValueNormal', compute_length=true)}}
-{{apply_auto('CSSPropertyWebkitColumnWidth', compute_length=true)}}
+{{apply_auto('CSSPropertyWebkitColumnGap', auto_getter='hasNormalColumnGap', auto_setter='setHasNormalColumnGap', auto_identity='CSSValueNormal')}}
+{{apply_auto('CSSPropertyWebkitColumnWidth')}}
 {{apply_auto('CSSPropertyWidows')}}
 {{apply_auto('CSSPropertyZIndex')}}
 
 static bool lengthTypeAndValueMatch(const Length& length, LengthType type, float value)
 {
     return length.type() == type && length.value() == value;
 }
 
 static bool lengthTypeAndValueMatch(const LengthBox& lengthBox, LengthType type, float value)
 {
@@ skipping 468 matching lines @@
         }
         {{set_value(property)}}(ptype, c, url,
             state.applyPropertyToRegularStyle(),
             state.applyPropertyToVisitedLinkStyle());
     }
 }
 {% endmacro %}
 {{apply_svg_paint('CSSPropertyFill', 'FillPaint')}}
 {{apply_svg_paint('CSSPropertyStroke', 'StrokePaint')}}
 } // namespace blink