Make font-related CSS properties less custom.

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

 {% from "macros.tmpl" import wrap_with_condition, license -%}
 {{ license() }}
 
 #include "config.h"
 #include "core/css/resolver/StyleBuilder.h"
 
 #include "StyleBuilderFunctions.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/resolver/StyleResolverState.h"
 
 // FIXME: currently we're just generating a switch statement, but we should
 //   test other variations for performance once we have more properties here.
 
 {%- macro set_value(property) %}
 {%- if property.svg -%}
     state.style()->accessSVGStyle()->{{property.setter}}
 {%- else -%}
     state.style()->{{property.setter}}
 {%- endif %}

[Timothy Loh, 2014/03/04 05:58:22]

I'd probably put state.fontBuilder().{{property.setter}} here and reduce
copy-paste a tiny amount.

[dglazkov, 2014/03/05 04:05:19]

Done.

 {%- endmacro %}
 
 namespace WebCore {
 
 {%- for property_id, property in properties.items() if not property.use_handlers_for %}
 {%- call wrap_with_condition(property.condition) %}
 {%- set apply_type = property.apply_type %}
 
 {%- if not property.custom_initial %}
 void StyleBuilderFunctions::applyInitial{{property_id}}(StyleResolverState& state)
 {
 {%- if property.svg %}
     {{ set_value(property) }}(SVGRenderStyle::{{property.initial}}());
+{%- elif property.font %}
+    state.fontBuilder().{{property.setter}}(FontBuilder::{{property.initial}}());
 {%- else %}
     {{ set_value(property) }}(RenderStyle::{{property.initial}}());
 {%- endif %}
 }
 {% endif %}
 
 {%- if not property.custom_inherit %}
 void StyleBuilderFunctions::applyInherit{{property_id}}(StyleResolverState& state)
 {
 {%- if property.svg %}
     {{ set_value(property) }}(state.parentStyle()->svgStyle()->{{property.getter}}());
+{%- elif property.font %}
+    state.fontBuilder().{{property.setter}}(state.parentFontDescription().{{property.getter}}());
 {%- else %}
     {{ set_value(property) }}(state.parentStyle()->{{property.getter}}());
 {%- endif %}
 }
 {% endif %}
 
 {%- if not property.custom_value %}
 void StyleBuilderFunctions::applyValue{{property_id}}(StyleResolverState& state, CSSValue* value)
 {
 {%- if property.converter %}
     {{ set_value(property) }}(StyleBuilderConverter::{{property.converter}}(state, value));
+{%- elif property.font %}
+    if (!value->isPrimitiveValue())

[Timothy Loh, 2014/03/04 05:58:22]

Can we see if removing this branch doesn't break anything? I think the early
returns like this in the StyleBuilder will only hide parser bugs. The
toCSSPrimitiveValue call should assert if we have a wrong value.

I've been meaning to go around and get rid of all these returns (and get rid of
oldApplyProperty!), but I haven't gotten around to it.

[dglazkov, 2014/03/05 04:05:19]

Will do next!

+        return;
+    state.fontBuilder().{{property.setter}}(static_cast<{{property.type_name}}>(*toCSSPrimitiveValue(value)));
 {%- else %}
     {{ set_value(property) }}(static_cast<{{property.type_name}}>(*toCSSPrimitiveValue(value)));
 {%- endif %}
 }
 {% endif %}
 
 {%- endcall %}
 {%- endfor %}
 
 bool StyleBuilder::applyProperty(CSSPropertyID property, StyleResolverState& state, CSSValue* value, bool isInitial, bool isInherit) {
@@ skipping 11 matching lines @@
             StyleBuilderFunctions::applyValue{{ used_property_id }}(state, value);
         return true;
 {%- endcall %}
 {% endfor %}
     default:
         return false;
     }
 }
 
 } // namespace WebCore