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 0a84f98ae2915a57988a57319bcaa68e0ea482e6..251b96c6d2392979a9bfce5992b20f258b4cd219 100644 |
--- a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl |
+++ b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl |
@@ -38,7 +38,7 @@ namespace WebCore { |
{% for property_id, property in properties.items() if property.should_declare_functions %} |
{% set apply_type = property.apply_type %} |
-{% if not property.custom_initial %} |
+{% if not property.sb_custom_initial %} |
{{declare_initial_function(property_id)}} |
{ |
{% if property.svg %} |
@@ -51,7 +51,7 @@ namespace WebCore { |
} |
{% endif %} |
-{% if not property.custom_inherit %} |
+{% if not property.sb_custom_inherit %} |
{{declare_inherit_function(property_id)}} |
{ |
{% if property.svg %} |
@@ -64,11 +64,11 @@ namespace WebCore { |
} |
{% endif %} |
-{% if not property.custom_value %} |
+{% if not property.sb_custom_value %} |
{{declare_value_function(property_id)}} |
{ |
- {% if property.converter %} |
- {{set_value(property)}}(StyleBuilderConverter::{{property.converter}}(state, value)); |
+ {% if property.sb_converter %} |
+ {{set_value(property)}}(StyleBuilderConverter::{{property.sb_converter}}(state, value)); |
{% else %} |
{{set_value(property)}}(static_cast<{{property.type_name}}>(*toCSSPrimitiveValue(value))); |
{% endif %} |
@@ -118,8 +118,8 @@ namespace WebCore { |
{% macro apply_auto(property_id, auto_getter=none, auto_setter=none, auto_identity='CSSValueAuto', compute_length=false) %} |
{% set property = properties[property_id] %} |
-{% set auto_getter = auto_getter or 'hasAuto' + property.camel_case_name %} |
-{% set auto_setter = auto_setter or 'setHasAuto' + property.camel_case_name %} |
+{% set auto_getter = auto_getter or 'hasAuto' + property.name_for_methods %} |
+{% set auto_setter = auto_setter or 'setHasAuto' + property.name_for_methods %} |
{{declare_initial_function(property_id)}} |
{ |
state.style()->{{auto_setter}}(); |
@@ -281,7 +281,7 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt |
{% macro apply_color(property_id, initial_color='StyleColor::currentColor') %} |
{% set property = properties[property_id] %} |
-{% set visited_link_setter = 'setVisitedLink' + property.camel_case_name %} |
+{% set visited_link_setter = 'setVisitedLink' + property.name_for_methods %} |
{{declare_initial_function(property_id)}} |
{ |
StyleColor color = {{initial_color}}(); |