Index: third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl |
diff --git a/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl |
index 050619f5a9ff4439a0817b56804abe6f74e835e7..515603c177ad76c367aed96e8c40ad52d7cd4005 100644 |
--- a/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl |
+++ b/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl |
@@ -45,7 +45,7 @@ class CORE_EXPORT ComputedStyleBase { |
inline bool inheritedEqual(const ComputedStyleBase& o) const { |
return true && |
- {% for field in fields if field.is_enum and field.property['inherited'] %} |
+ {% for field in fields if field.is_enum and field.is_inherited %} |
{{field.name}} == o.{{field.name}} && |
{% endfor %} |
true; |
@@ -53,7 +53,7 @@ class CORE_EXPORT ComputedStyleBase { |
inline bool independentInheritedEqual(const ComputedStyleBase& o) const { |
return true && |
- {% for field in fields if field.is_enum and field.property['inherited'] and field.property['independent'] %} |
+ {% for field in fields if field.is_enum and field.is_inherited and field.is_independent %} |
{{field.name}} == o.{{field.name}} && |
{% endfor %} |
true; |
@@ -61,7 +61,7 @@ class CORE_EXPORT ComputedStyleBase { |
inline bool nonIndependentInheritedEqual(const ComputedStyleBase& o) const { |
return true && |
- {% for field in fields if field.is_enum and field.property['inherited'] and not field.property['independent'] %} |
+ {% for field in fields if field.is_enum and field.is_inherited and not field.is_independent %} |
{{field.name}} == o.{{field.name}} && |
{% endfor %} |
true; |
@@ -69,7 +69,7 @@ class CORE_EXPORT ComputedStyleBase { |
inline bool nonInheritedEqual(const ComputedStyleBase& o) const { |
return true && |
- {% for field in fields if field.is_enum and not field.property['inherited'] %} |
+ {% for field in fields if field.is_enum and not field.is_inherited %} |
{{field.name}} == o.{{field.name}} && |
{% endfor %} |
true; |
@@ -99,7 +99,7 @@ class CORE_EXPORT ComputedStyleBase { |
// TODO(sashab): Remove initialFoo() static methods and update callers to |
// use resetFoo(), which can be more efficient. |
{% for field in fields %} |
- // {{field.property['name']}} |
+ // {{field.property_name}} |
inline static {{field.type}} {{field.initial_method_name}}() { return {{field.default_value}}; } |
{{field.type}} {{field.getter_method_name}}() const { return static_cast<{{field.type}}>({{field.name}}); } |
void {{field.setter_method_name}}({{field.type}} v) { {{field.name}} = static_cast<unsigned>(v); } |