Respect method name overrides in make_computed_style_base.py.

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 87 matching lines @@
             Should be in upper camel case.
         property_name: Name of the property that the field is part of.
         type_name: Name of the C++ type exposed by the generated interface (e.g. EClear, int).
         field_template: Determines the interface generated for the field. Can be one of:
            keyword, flag, or monotonic_flag.
         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,
-                 field_template, size, default_value, properties, **kwargs):
+                 field_template, size, default_value, 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.field_template = field_template
         self.size = size
         self.default_value = default_value
 
         # Field role: one of these must be true
         self.is_property = field_role == 'property'
         self.is_inherited_flag = field_role == 'inherited_flag'
         self.is_nonproperty = field_role == 'nonproperty'
         assert (self.is_property, self.is_inherited_flag, self.is_nonproperty).count(True) == 1, \
             'Field role has to be exactly one of: property, inherited_flag, nonproperty'
 
         if not self.is_inherited_flag:
             self.is_inherited = kwargs.pop('inherited')
             self.is_independent = kwargs.pop('independent')
             assert self.is_inherited or not self.is_independent, 'Only inherited fields can be independent'
 
             self.is_inherited_method_name = method_name(join_name(name_for_methods, 'is inherited'))
 
         # Method names
-        if 'getter' in properties and not self.is_inherited_flag:
-          self.getter_method_name = properties['getter']
-        else:
-          getter_prefix = 'Get' if name_for_methods == self.type_name else ''
-          self.getter_method_name = method_name(join_name(getter_prefix, name_for_methods))
-        self.setter_method_name = method_name(join_name('Set', name_for_methods))
-        self.initial_method_name = method_name(join_name('Initial', name_for_methods))
+        self.getter_method_name = getter_method_name
+        self.setter_method_name = setter_method_name
+        self.initial_method_name = initial_method_name
         self.resetter_method_name = method_name(join_name('Reset', name_for_methods))
 
         # If the size of the field is not None, it means it is a bit field
         self.is_bit_field = self.size is not None
 
         assert len(kwargs) == 0, 'Unexpected arguments provided to Field: ' + str(kwargs)
 
 
 def _get_include_paths(properties):
     """
@@ skipping 68 matching lines @@
     return Field(
         field_role,
         name_for_methods,
         property_name=property_['name'],
         inherited=property_['inherited'],
         independent=property_['independent'],
         type_name=type_name,
         field_template=property_['field_template'],
         size=size,
         default_value=default_value,
-        properties=property_,
+        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',
-        join_name(property_['name_for_methods'], 'is inherited'),
+        name_for_methods,
         property_name=property_['name'],
         type_name='bool',
         field_template='primitive',
         size=1,
         default_value='true',
-        properties=property_,
+        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(field_role, properties):
     """
     Create ComputedStyle fields from properties or nonproperties and return a list of Field objects.
     """
     fields = []
     for property_ in properties:
         # Only generate properties that have a field template
@@ skipping 52 matching lines @@
         }
 
         # TODO(shend): Remove this once we move NONPROPERTIES to its own JSON file,
         # since the JSON5 reader will handle missing fields and defaults.
         for property_ in NONPROPERTIES:
             property_['name_for_methods'] = property_['name']
             if 'field_type_path' not in property_:
                 property_['field_type_path'] = None
             if 'type_name' not in property_:
                 property_['type_name'] = 'E' + enum_type_name(property_['name_for_methods'])
+            property_['getter'] = method_name(property_['name_for_methods'])
+            property_['setter'] = method_name(join_name('set', property_['name_for_methods']))
+            property_['initial'] = method_name(join_name('initial', property_['name_for_methods']))
 
         property_values = self._properties.values()
 
         for property_ in property_values:
             # Override the type name when field_type_path is specified
             if property_['field_type_path']:
                 property_['type_name'] = property_['field_type_path'].split('/')[-1]
             # CSS properties are not allowed to explicitly specify their field_size.
             property_['field_size'] = None
 
@@ skipping 77 matching lines @@
                     'mapping': [(enum_value_name(k), enum_for_css_keyword(k)) for k in property_['keywords']],
                 }
 
         return {
             'include_paths': self._include_paths,
             'mappings': mappings,
         }
 
 if __name__ == '__main__':
     json5_generator.Maker(ComputedStyleBaseWriter).main()