Simplify ComputedStyleBase::inheritedEqual.

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

 {% from 'macros.tmpl' import license, print_if %}
 {{license()}}
 
 #ifndef ComputedStyleBase_h
 #define ComputedStyleBase_h
 
 #include "core/ComputedStyleBaseConstants.h"
 #include "core/CoreExport.h"
 {% for path in include_paths %}
 #include "{{path}}"
@@ skipping 17 matching lines @@
   {% endfor %}
   {}
   ~ComputedStyleBase() {}
 
   ALWAYS_INLINE ComputedStyleBase(const ComputedStyleBase& o) :
   {% for field in fields %}
       {{field.name}}(o.{{field.name}}){{print_if(not loop.last, ',')}}
   {% endfor %}
   {}
 
-  inline bool inheritedEqual(const ComputedStyleBase& o) const {
-    return (
-    {% for field in fields if field.is_property and field.is_inherited %}
-        {{field.name}} == o.{{field.name}}{{print_if(not loop.last, ' &&')}}
-    {% endfor %}
-    );
-  }
-
   inline bool independentInheritedEqual(const ComputedStyleBase& o) const {
     return (
     {% for field in fields if field.is_property and field.is_inherited and field.is_independent %}
         {{field.name}} == o.{{field.name}}{{print_if(not loop.last, ' &&')}}
     {% endfor %}
     );
   }
 
   inline bool nonIndependentInheritedEqual(const ComputedStyleBase& o) const {
     return (
     {% for field in fields if field.is_property and field.is_inherited and not field.is_independent %}
         {{field.name}} == o.{{field.name}}{{print_if(not loop.last, ' &&')}}
     {% endfor %}
     );
   }
 
+  inline bool inheritedEqual(const ComputedStyleBase& o) const {
+    return independentInheritedEqual(o) && nonIndependentInheritedEqual(o);
+  }
+
   inline bool nonInheritedEqual(const ComputedStyleBase& o) const {
     return (
     {% for field in fields if field.is_property and not field.is_inherited %}
         {{field.name}} == o.{{field.name}}{{print_if(not loop.last, ' &&')}}
     {% endfor %}
     );
   }
 
   enum IsAtShadowBoundary {
     AtShadowBoundary,
@@ skipping 38 matching lines @@
  protected:
   // Storage.
   {% for field in fields %}
   unsigned {{field.name}} : {{field.size}}; // {{field.type_name}}
   {% endfor %}
 };
 
 } // namespace blink
 
 #endif // ComputedStyleBase_h