Properly managing overlfow-aligment for inherit and initial.

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 536 matching lines @@
         if (shape)
             {{set_value(property)}}(ShapeValue::createShapeValue(shape.release(), cssBox));
         else if (cssBox != BoxMissing)
             {{set_value(property)}}(ShapeValue::createBoxShapeValue(cssBox));
     }
 }
 {% endmacro %}
 {{apply_value_shape('CSSPropertyShapeOutside')}}
 
 {% macro apply_alignment(property_id, alignment_type) %}
+{% set property = properties[property_id] %}
+{{declare_initial_function(property_id)}}
+{
+    state.style()->set{{alignment_type}}(RenderStyle::initial{{alignment_type}}());
+    state.style()->set{{alignment_type}}OverflowAlignment(RenderStyle::initial{{alignment_type}}OverflowAlignment());
+}
+{{declare_inherit_function(property_id)}}

[Timothy Loh, 2014/07/02 01:20:02]

Looks like the other macros in this file put spaces between functions, probably
want to be consistent here.

[jfernandez, 2014/07/02 10:10:19]

Done.

+{
+    state.style()->set{{alignment_type}}(state.parentStyle()->{{property.getter}}());
+    state.style()->set{{alignment_type}}OverflowAlignment(state.parentStyle()->{{property.getter}}OverflowAlignment());
+}
 {{declare_value_function(property_id)}}
 {
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     if (Pair* pairValue = primitiveValue->getPairValue()) {
         state.style()->set{{alignment_type}}(*pairValue->first());
         state.style()->set{{alignment_type}}OverflowAlignment(*pairValue->second());
     } else {
         state.style()->set{{alignment_type}}(*primitiveValue);
     }
 }
 {% endmacro %}
 {{apply_alignment('CSSPropertyJustifySelf', 'JustifySelf')}}
 {{apply_alignment('CSSPropertyAlignItems', 'AlignItems')}}
 {{apply_alignment('CSSPropertyAlignSelf', 'AlignSelf')}}
 
-{% macro apply_alignment_with_legacy_keyword(property_id, alignment_type) %}
-{{declare_value_function(property_id)}}
-{
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-    if (Pair* pairValue = primitiveValue->getPairValue()) {
-        if (pairValue->first()->getValueID() == CSSValueLegacy) {
-            state.style()->set{{alignment_type}}PositionType(LegacyPosition);
-            state.style()->set{{alignment_type}}(*pairValue->second());
-        } else {
-            state.style()->set{{alignment_type}}(*pairValue->first());
-            state.style()->set{{alignment_type}}OverflowAlignment(*pairValue->second());
-        }
-    } else {
-        state.style()->set{{alignment_type}}(*primitiveValue);
-    }
-}
-{% endmacro %}
-{{apply_alignment_with_legacy_keyword('CSSPropertyJustifyItems', 'JustifyItems')}}
-
 {% macro apply_svg_paint(property_id, paint_type) %}
 {% set property = properties[property_id] %}
 {{declare_initial_function(property_id)}}
 {
     {{set_value(property)}}(
         SVGRenderStyle::initial{{paint_type}}Type(),
         SVGRenderStyle::initial{{paint_type}}Color(),
         SVGRenderStyle::initial{{paint_type}}Uri(),
         state.applyPropertyToRegularStyle(),
         state.applyPropertyToVisitedLinkStyle());
@@ skipping 26 matching lines @@
             color,
             svgPaint->uri(),
             state.applyPropertyToRegularStyle(),
             state.applyPropertyToVisitedLinkStyle());
     }
 }
 {% endmacro %}
 {{apply_svg_paint('CSSPropertyFill', 'FillPaint')}}
 {{apply_svg_paint('CSSPropertyStroke', 'StrokePaint')}}
 } // namespace WebCore