| Index: third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| diff --git a/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| index 241ed5cbcfedaca0cf9d17382d629555c865440e..8e627b225fbb18c3407bbdfc487ad0c1e9d18ba8 100644
|
| --- a/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| +++ b/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| @@ -43,6 +43,9 @@ state.style()->{{property.setter}}
|
| {{set_value(property)}}(toCSSPrimitiveValue(value).convertTo<{{property.type_name}}>());
|
| {%- endif %}
|
| {% endmacro %}
|
| +{% macro set_is_inherited(property) %}
|
| +state.style()->{{property.is_inherited_setter}}
|
| +{% endmacro %}
|
|
|
| namespace blink {
|
|
|
| @@ -58,6 +61,9 @@ namespace blink {
|
| {% else %}
|
| {{set_value(property)}}(ComputedStyle::{{property.initial}}());
|
| {% endif %}
|
| + {% if property.independent %}
|
| + {{set_is_inherited(property)}}(true);
|
| + {% endif %}
|
| }
|
|
|
| {% endif %}
|
| @@ -71,6 +77,9 @@ namespace blink {
|
| {% else %}
|
| {{set_value(property)}}(state.parentStyle()->{{property.getter}}());
|
| {% endif %}
|
| + {% if property.independent %}
|
| + {{set_is_inherited(property)}}(false);
|
| + {% endif %}
|
| }
|
|
|
| {% endif %}
|
| @@ -78,6 +87,9 @@ namespace blink {
|
| {{declare_value_function(property_id)}}
|
| {
|
| {{convert_and_set_value(property)}}
|
| + {% if property.independent %}
|
| + {{set_is_inherited(property)}}(false);
|
| + {% endif %}
|
| }
|
|
|
| {% endif %}
|
|
|