Split has_custom_compare_and_copy in ComputedStyleExtraFields.json5.

third_party/WebKit/Source/build/scripts/make_computed_style_base.py

 #!/usr/bin/env python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import math
 import sys
 
 import json5_generator
 import template_expander
@@ skipping 102 matching lines @@
         type_name: Name of the C++ type exposed by the generated interface (e.g. EClear, int).
         wrapper_pointer_name: Name of the pointer type that wraps this field (e.g. RefPtr).
         field_template: Determines the interface generated for the field. Can be one of:
            keyword, flag, or monotonic_flag.
         field_group: The name of the group that this field is inside.
         size: Number of bits needed for storage.
         default_value: Default value for this field when it is first initialized.
     """
 
     def __init__(self, field_role, name_for_methods, property_name, type_name, wrapper_pointer_name,
-                 field_template, field_group, size, default_value, has_custom_compare_and_copy,
+                 field_template, field_group, size, default_value, custom_copy, custom_compare,
                  getter_method_name, setter_method_name, initial_method_name, **kwargs):
         """Creates a new field."""
         self.name = class_member_name(name_for_methods)
         self.property_name = property_name
         self.type_name = type_name
         self.wrapper_pointer_name = wrapper_pointer_name
         self.alignment_type = self.wrapper_pointer_name or self.type_name
         self.field_template = field_template
         self.group_name = field_group
         self.group_member_name = class_member_name(join_name(field_group, 'data')) if field_group else None
         self.size = size
         self.default_value = default_value
-        self.has_custom_compare_and_copy = has_custom_compare_and_copy
+        self.custom_copy = custom_copy
+        self.custom_compare = custom_compare
 
         # Field role: one of these must be true
         self.is_property = field_role == 'property'
         self.is_inherited_flag = field_role == 'inherited_flag'
         assert (self.is_property, self.is_inherited_flag).count(True) == 1, \
             'Field role has to be exactly one of: property, inherited_flag'
 
         if not self.is_inherited_flag:
             self.is_inherited = kwargs.pop('inherited')
             self.is_independent = kwargs.pop('independent')
@@ skipping 144 matching lines @@
         name_for_methods,
         property_name=property_['name'],
         inherited=property_['inherited'],
         independent=property_['independent'],
         type_name=type_name,
         wrapper_pointer_name=property_['wrapper_pointer_name'],
         field_template=property_['field_template'],
         field_group=property_['field_group'],
         size=size,
         default_value=default_value,
-        has_custom_compare_and_copy=property_['has_custom_compare_and_copy'],
+        custom_copy=property_['custom_copy'],
+        custom_compare=property_['custom_compare'],
         getter_method_name=property_['getter'],
         setter_method_name=property_['setter'],
         initial_method_name=property_['initial'],
     )
 
 
 def _create_inherited_flag_field(property_):
     """
     Create the field used for an inheritance fast path from an independent CSS property,
     and return the Field object.
     """
     name_for_methods = join_name(property_['name_for_methods'], 'is inherited')
     return Field(
         'inherited_flag',
         name_for_methods,
         property_name=property_['name'],
         type_name='bool',
         wrapper_pointer_name=None,
         field_template='primitive',
         field_group=property_['field_group'],
         size=1,
         default_value='true',
-        has_custom_compare_and_copy=False,
+        custom_copy=False,
+        custom_compare=False,
         getter_method_name=method_name(name_for_methods),
         setter_method_name=method_name(join_name('set', name_for_methods)),
         initial_method_name=method_name(join_name('initial', name_for_methods)),
     )
 
 
 def _create_fields(properties):
     """
     Create ComputedStyle fields from properties and return a list of Field objects.
     """
@@ skipping 68 matching lines @@
 
         # Ignore shorthand properties
         for property_ in self._properties.values():
             if property_['field_template'] is not None:
                 assert not property_['longhands'], \
                     "Shorthand '{}' cannot have a field_template.".format(property_['name'])
 
         css_properties = [value for value in self._properties.values() if not value['longhands']]
 
         for property_ in css_properties:
-            # All CSS properties that are generated do not have custom comparison and copy logic.
-            property_['has_custom_compare_and_copy'] = False
+            # All CSS properties from CSSProperties.json5 do not have custom comparison and copy logic.
+            property_['custom_copy'] = False
+            property_['custom_compare'] = False
 
         # Read extra fields using the parameter specification from the CSS properties file.
         extra_fields = json5_generator.Json5File.load_from_files(
             [json5_file_paths[1]],
             default_parameters=self.json5_file.parameters
         ).name_dictionaries
 
         for property_ in extra_fields:
             make_style_builder.apply_property_naming_defaults(property_)
 
@@ skipping 28 matching lines @@
 
     @template_expander.use_jinja('ComputedStyleBaseConstants.h.tmpl')
     def generate_base_computed_style_constants(self):
         return {
             'properties': self._properties,
             'enums': self._generated_enums,
         }
 
 if __name__ == '__main__':
     json5_generator.Maker(ComputedStyleBaseWriter).main()