Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: Source/build/scripts/templates/StyleBuilder.cpp.tmpl

Issue 186403002: Make font-related CSS properties less custom. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed comments. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/build/scripts/templates/StyleBuilder.cpp.tmpl
diff --git a/Source/build/scripts/templates/StyleBuilder.cpp.tmpl b/Source/build/scripts/templates/StyleBuilder.cpp.tmpl
index 94b468d233c1b729746b2cfbb55697a7bc861a8d..88bce6c5d9e814fb17668573cc39cb704445fda3 100644
--- a/Source/build/scripts/templates/StyleBuilder.cpp.tmpl
+++ b/Source/build/scripts/templates/StyleBuilder.cpp.tmpl
@@ -14,6 +14,8 @@
{%- 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 %}
@@ -30,6 +32,8 @@ void StyleBuilderFunctions::applyInitial{{property_id}}(StyleResolverState& stat
{
{%- if property.svg %}
{{ set_value(property) }}(SVGRenderStyle::{{property.initial}}());
+{%- elif property.font %}
+ {{ set_value(property) }}(FontBuilder::{{property.initial}}());
{%- else %}
{{ set_value(property) }}(RenderStyle::{{property.initial}}());
{%- endif %}
@@ -41,6 +45,8 @@ void StyleBuilderFunctions::applyInherit{{property_id}}(StyleResolverState& stat
{
{%- if property.svg %}
{{ set_value(property) }}(state.parentStyle()->svgStyle()->{{property.getter}}());
+{%- elif property.font %}
+ {{ set_value(property) }}(state.parentFontDescription().{{property.getter}}());
{%- else %}
{{ set_value(property) }}(state.parentStyle()->{{property.getter}}());
{%- endif %}
@@ -52,6 +58,10 @@ void StyleBuilderFunctions::applyValue{{property_id}}(StyleResolverState& state,
{
{%- if property.converter %}
{{ set_value(property) }}(StyleBuilderConverter::{{property.converter}}(state, value));
+{%- elif property.font %}
+ if (!value->isPrimitiveValue())
+ return;
+ {{ set_value(property) }}(static_cast<{{property.type_name}}>(*toCSSPrimitiveValue(value)));
{%- else %}
{{ set_value(property) }}(static_cast<{{property.type_name}}>(*toCSSPrimitiveValue(value)));
{%- endif %}
« no previous file with comments | « Source/build/scripts/make_style_builder.py ('k') | Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698