Move code from from ComputedStyleBase.cpp.tmpl to .h.tmpl

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

 {% from 'macros.tmpl' import license, print_if %}
-{% from 'fields/field.tmpl' import encode, getter_expression, declare_storage, fieldwise_compare %}
+{% from 'fields/field.tmpl' import encode, getter_expression, setter_expression, declare_storage, fieldwise_compare, fieldwise_copy, fieldwise_diff %}
 {% from 'fields/group.tmpl' import define_field_group_class %}
 {{license()}}
 
 #ifndef ComputedStyleBase_h
 #define ComputedStyleBase_h
 
 #include "core/style/ComputedStyleConstants.h"
 #include "core/CoreExport.h"
 #include "core/style/DataRef.h"
 #include "core/style/StyleDifference.h"
+#include "platform/wtf/SizeAssertions.h"
 {% for path in include_paths %}
 #include "{{path}}"
 {% endfor %}
 
 {# Each field template has macros that we can call to generate specific
    aspects of the field (e.g. getters, setters).
 #}
 {% import 'fields/keyword.tmpl' as keyword %}
 {% import 'fields/primitive.tmpl' as primitive %}
 {% import 'fields/monotonic_flag.tmpl' as monotonic_flag %}
 {% import 'fields/storage_only.tmpl' as storage_only %}
 {% import 'fields/external.tmpl' as external %}
 {% from 'fields/field.tmpl' import encode %}
 {% set field_templates = {
      'keyword': keyword,
      'primitive': primitive,
      'monotonic_flag': monotonic_flag,
      'storage_only': storage_only, 
      'external': external
    } %}
 
 namespace blink {
 
+struct SameSizeAsComputedStyleBase {
+  {% if computed_style.subgroups is defined %}
+  void* dataRefs[{{computed_style.subgroups|length}}];
+  {% endif %}
+  {% for field in computed_style.fields|rejectattr("is_bit_field") %}
+  {{field.type_name}} {{field.name}};
+  {% endfor %}
+  unsigned m_bit_fields[{{computed_style.num_32_bit_words_for_bit_fields}}];
+};
+
 // The generated portion of ComputedStyle. For more info, see the header comment
 // in ComputedStyle.h.
 class CORE_EXPORT ComputedStyleBase {
  public:
   inline bool IndependentInheritedEqual(const ComputedStyleBase& o) const {
     return (
         {{fieldwise_compare(computed_style, computed_style.all_fields
             |selectattr("is_property")
             |selectattr("is_inherited")
             |selectattr("is_independent")
@@ skipping 28 matching lines @@
             |list
           )|indent(8)}}
         true
     );
   }
 
   enum IsAtShadowBoundary {
     kAtShadowBoundary,
     kNotAtShadowBoundary,
   };
-  void InheritFrom(const ComputedStyleBase& inheritParent,
-                   IsAtShadowBoundary isAtShadowBoundary = kNotAtShadowBoundary);
 
-  void CopyNonInheritedFromCached(const ComputedStyleBase& other);
-  bool DiffNeedsFullLayoutAndPaintInvalidation(
-      const ComputedStyleBase& other) const;
-  bool ScrollAnchorDisablingPropertyChanged(const ComputedStyleBase& other,
-                                            const StyleDifference&) const;
+  void InheritFrom(const ComputedStyleBase& other,
+                                      IsAtShadowBoundary isAtShadowBoundary) {
+    {{fieldwise_copy(computed_style, computed_style.all_fields
+        |selectattr("is_property")
+        |selectattr("is_inherited")
+        |list
+      )|indent(2)}}

[shend, 2017/05/12 01:13:27]

indent(4)

[nainar, 2017/05/12 03:23:47]

Done

+  }
+
+  void CopyNonInheritedFromCached(
+      const ComputedStyleBase& other) {
+    {{fieldwise_copy(computed_style, computed_style.all_fields
+        |rejectattr("has_custom_compare_and_copy")
+        |rejectattr("is_inherited")
+        |list
+      )|indent(2)}}

[shend, 2017/05/12 01:13:27]

indent(4)

[nainar, 2017/05/12 03:23:47]

Done.

+  }
 
   // Copies the values of any independent inherited properties from the parent
   // style that are marked as inherited by this style.
   void PropagateIndependentInheritedProperties(
-      const ComputedStyleBase& parentStyle);
+      const ComputedStyleBase& parentStyle) {
+    {% for field in computed_style.all_fields if field.is_property and field.is_independent %}
+    if ({{field.is_inherited_method_name}}())
+      {{setter_expression(field)}} = parentStyle.{{getter_expression(field)}};
+    {% endfor %}
+  }
+
+  bool ScrollAnchorDisablingPropertyChanged(
+      const ComputedStyleBase& other,
+      const StyleDifference& diff) const {
+    {{fieldwise_diff(computed_style, computed_style.all_fields
+        |selectattr("property_name", "in", ["margin-top", "margin-left", "margin-right", "margin-bottom", "left", "right", "top", "bottom", "padding-top", "padding-left", "padding-right", "padding-bottom"])
+        |list
+      )|indent(2)}}

[shend, 2017/05/12 01:13:27]

indent(4)

[nainar, 2017/05/12 03:23:47]

Done.

+    return false;
+  }
+
+  bool DiffNeedsFullLayoutAndPaintInvalidation(
+      const ComputedStyleBase& other) const {
+    {{fieldwise_diff(computed_style, computed_style.all_fields
+        |selectattr("property_name", "in", ["padding-top", "padding-left", "padding-right", "padding-bottom"])
+        |list
+      )|indent(2)}}

[shend, 2017/05/12 01:13:27]

indent(4)

[nainar, 2017/05/12 03:23:47]

Done.

+    return false;
+  }
 
   // Fields.
   // TODO(sashab): Remove initialFoo() static methods and update callers to
   // use resetFoo(), which can be more efficient.
 
   {% for field in computed_style.all_fields %}
   // {{field.property_name}}
   {{field_templates[field.field_template].decl_public_methods(field)|indent(2)}}
 
   {% endfor %}
@@ skipping 36 matching lines @@
     return static_cast<unsigned>(std::min<float>(width, kMaxForBorderWidth) *
                                  kBorderWidthDenominator);
   }
 
  private:
   {% for field in computed_style.fields %}
   {{declare_storage(field)}}
   {% endfor %}
 };
 
+// If this fails, the packing algorithm in make_computed_style_base.py has
+// failed to produce the optimal packed size. To fix, update the algorithm to
+// ensure that the buckets are placed so that each takes up at most 1 word.
+ASSERT_SIZE(ComputedStyleBase, SameSizeAsComputedStyleBase);
+
 } // namespace blink
 
 #endif // ComputedStyleBase_h