Index: Source/core/scripts/templates/StyleBuilder.cpp.tmpl |
diff --git a/Source/core/scripts/templates/StyleBuilder.cpp.tmpl b/Source/core/scripts/templates/StyleBuilder.cpp.tmpl |
index 8e3a3e61b6407a9dfb930cc0a872d8362f65367a..09d2be175a9965e446b9724442ab6f577b1912ba 100644 |
--- a/Source/core/scripts/templates/StyleBuilder.cpp.tmpl |
+++ b/Source/core/scripts/templates/StyleBuilder.cpp.tmpl |
@@ -59,7 +59,7 @@ namespace WebCore { |
{{ set_value(property) }}(primitiveValue->viewportPercentageLength()); |
{%- endmacro %} |
-{%- for property_id, property in properties.items() %} |
+{%- 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 %} |
@@ -94,14 +94,16 @@ void StyleBuilderFunctions::applyValue{{property_id}}(StyleResolver* styleResolv |
bool StyleBuilder::applyProperty(CSSPropertyID property, StyleResolver* styleResolver, CSSValue* value, bool isInitial, bool isInherit) { |
switch(property) { |
{%- for property_id, property in properties.items() %} |
-{%- call wrap_with_condition(property.condition) %} |
+{%- set used_property = properties[property.use_handlers_for] or property %} |
+{%- set used_property_id = used_property.property_id %} |
+{%- call wrap_with_condition(used_property.condition) %} |
case {{ property_id }}: |
if (isInitial) |
- StyleBuilderFunctions::applyInitial{{ property_id }}(styleResolver); |
+ StyleBuilderFunctions::applyInitial{{ used_property_id }}(styleResolver); |
else if (isInherit) |
- StyleBuilderFunctions::applyInherit{{ property_id }}(styleResolver); |
+ StyleBuilderFunctions::applyInherit{{ used_property_id }}(styleResolver); |
else |
- StyleBuilderFunctions::applyValue{{ property_id }}(styleResolver, value); |
+ StyleBuilderFunctions::applyValue{{ used_property_id }}(styleResolver, value); |
return true; |
{%- endcall %} |
{% endfor %} |