Properly managing overlfow-aligment for inherit and initial.

Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

Index: Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
diff --git a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
index e0dba7d86c8e76e0ba1c65298cf9f59f2d6f1d3b..ad44754c450571388214880fe5ba6170ca8cdf07 100644
--- a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
+++ b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
@@ -554,6 +554,17 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt
 {{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);
@@ -569,25 +580,6 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt
 {{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)}}