Merge CSSProperties.in and CSSShorthands.in

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 100 matching lines @@
 {{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) %}
 {% set property = properties[property_id] %}
-{% set auto_getter = auto_getter or 'hasAuto' + property.camel_case_name %}
-{% set auto_setter = auto_setter or 'setHasAuto' + property.camel_case_name %}
+{% 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
@@ skipping 141 matching lines @@
 {
     {% set property = properties[property_id] %}
     {{set_value(property)}}(state.styleImage({{property_id}}, value));
 }
 {% endmacro %}
 {{apply_value_border_image_source('CSSPropertyBorderImageSource')}}
 {{apply_value_border_image_source('CSSPropertyWebkitMaskBoxImageSource')}}
 
 {% macro apply_color(property_id, initial_color='StyleColor::currentColor') %}
 {% set property = properties[property_id] %}
-{% set visited_link_setter = 'setVisitedLink' + property.camel_case_name %}
+{% set visited_link_setter = 'setVisitedLink' + property.name_for_methods %}
 {{declare_initial_function(property_id)}}
 {
     StyleColor color = {{initial_color}}();
     if (state.applyPropertyToRegularStyle())
         {{set_value(property)}}(color);
     if (state.applyPropertyToVisitedLinkStyle())
         state.style()->{{visited_link_setter}}(color);
 }
 
 {{declare_inherit_function(property_id)}}
@@ skipping 339 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