Added support for isInherited flags to ComputedStyleBase

third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl

 {% from 'macros.tmpl' import license %}
 {{license()}}
 
 #ifndef ComputedStyleBase_h
 #define ComputedStyleBase_h
 
 #include "core/ComputedStyleBaseConstants.h"
 #include "core/CoreExport.h"
 #include "wtf/RefCounted.h"
 
 {# Returns the default value for the field, converted to fit in the storage container. #}
 {% macro default_value(field) %}
 {# We only support enum fields for now. #}
 static_cast<unsigned>({{field.default_value}}){% endmacro %}
 
 namespace blink {
 
 // The generated portion of ComputedStyle. For more info, see the header comment
 // in ComputedStyle.h.
 class CORE_EXPORT ComputedStyleBase : public RefCounted<ComputedStyleBase> {
 public:
+    // Empty constructor.
     ALWAYS_INLINE ComputedStyleBase() :
         RefCounted<ComputedStyleBase>(),
     {% for field in fields %}
         {% set trailing_comma = "," if field != fields[-1] else "" %}
         {{field.name}}({{default_value(field)}}){{trailing_comma}}
     {% endfor %}
     {}
     ~ComputedStyleBase() {}
 
+    // Copy constructor.
     ALWAYS_INLINE ComputedStyleBase(const ComputedStyleBase& o) :
     {% for field in fields %}
         {% set trailing_comma = "," if field != fields[-1] else "" %}
         {{field.name}}(o.{{field.name}}){{trailing_comma}}
     {% endfor %}
     {}
 
+    // Comparison functions.
     bool operator==(const ComputedStyleBase& o) const
     {
         return true
         {% for field in fields %}
             && {{field.name}} == o.{{field.name}}
         {% endfor %}
             && true;
     }
 
     bool operator!=(const ComputedStyleBase& o) const { return !(*this == o); }
 
     inline bool inheritedEqual(const ComputedStyleBase& o) const
     {
         return true
-        {% for field in fields if field.property['inherited'] %}
+        {% for field in fields if field.comparison_function_independent_inherited or field.comparison_function_non_independent_inherited %}
             && {{field.name}} == o.{{field.name}}
         {% endfor %}
             && true;
     }
 
     inline bool independentInheritedEqual(const ComputedStyleBase& o) const
     {
         return true
-        {% for field in fields if field.property['inherited'] and field.property['independent'] %}
+        {% for field in fields if field.comparison_function_independent_inherited %}
             && {{field.name}} == o.{{field.name}}
         {% endfor %}
             && true;
     }
 
     inline bool nonIndependentInheritedEqual(const ComputedStyleBase& o) const
     {
         return true
-        {% for field in fields if field.property['inherited'] and not field.property['independent'] %}
+        {% for field in fields if field.comparison_function_non_independent_inherited %}
             && {{field.name}} == o.{{field.name}}
         {% endfor %}
             && true;
     }
 
     inline bool nonInheritedEqual(const ComputedStyleBase& o) const
     {
         return true
-        {% for field in fields if not field.property['inherited'] %}
+        {% for field in fields if field.comparison_function_non_inherited %}
             && {{field.name}} == o.{{field.name}}
         {% endfor %}
             && true;
     }
 
+    // Resets all fields to their default values.
     void setBitDefaults()
     {
         {% for field in fields %}
-        reset{{field.property['upper_camel_name']}}();
+        reset{{field.upper_camel_name}}();
         {% endfor %}
     }
 
     enum IsAtShadowBoundary {
         AtShadowBoundary,
         NotAtShadowBoundary,
     };
     void inheritFrom(const ComputedStyleBase& inheritParent, IsAtShadowBoundary isAtShadowBoundary = NotAtShadowBoundary);
+    void copyNonInheritedFromCached(const ComputedStyleBase&);
+    void propagateIndependentInheritedProperties(const ComputedStyleBase& parentStyle);
 
     // Fields.
-    // TODO(sashab): Remove initialFoo() static methods and update callers to
-    // use resetFoo(), which can be more efficient.
+    // TODO(sashab): Remove initialFoo() static methods and update callers to use
+    // resetFoo(), which can be made more efficient.
+
+    {% for property_name, fields in fields_per_property.items() if fields %}
+    // {{property_name}}
     {% for field in fields %}
-    // {{field.property['name']}}
-    inline static {{field.type}} initial{{field.property['upper_camel_name']}}() { return {{field.default_value}}; }
-    {{field.type}} {{field.property['lower_camel_name']}}() const { return static_cast<{{field.type}}>({{field.name}}); }
-    void set{{field.property['upper_camel_name']}}({{field.type}} v) { {{field.name}} = static_cast<unsigned>(v); }
-    inline void reset{{field.property['upper_camel_name']}}() { {{field.name}} = {{default_value(field)}}; }
+    inline static {{field.type}} initial{{field.upper_camel_name}}() { return {{field.default_value}}; }
+    {{field.type}} {{field.lower_camel_name}}() const { return static_cast<{{field.type}}>({{field.name}}); }
+    void set{{field.upper_camel_name}}({{field.type}} v) { {{field.name}} = static_cast<unsigned>(v); }
+    inline void reset{{field.upper_camel_name}}() { {{field.name}} = {{default_value(field)}}; }
 
     {% endfor %}
+    {% endfor %}
 protected:
     // Storage.
     {% for field in fields %}
     unsigned {{field.name}} : {{field.size}}; // {{field.type}}
     {% endfor %}
 };
 
 } // namespace blink
 
 #endif // ComputedStyleBase_h