Added functionality in ComputedStyleBase to use platform/ types

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 in_generator
 import template_expander
@@ skipping 17 matching lines @@
       - 'enum', for fields that store the values of an enum
       - 'inherited_flag', for single-bit flags that store whether a property is
                           inherited by this style or set explicitly
     """
     def __init__(self, field_family, **kwargs):
         # Values common to all fields
         # Name of field
         self.name = kwargs.pop('name')
         # Name of property field is for
         self.property_name = kwargs.pop('property_name')
-        # Internal field storage type
+        # Internal field storage type (storage_type_path can be None)
         self.storage_type = kwargs.pop('storage_type')
+        self.storage_type_path = kwargs.pop('storage_type_path')
         # Bits needed for storage
         self.size = kwargs.pop('size')
         # Default value for field
         self.default_value = kwargs.pop('default_value')
         # Method names
         self.getter_method_name = kwargs.pop('getter_method_name')
         self.setter_method_name = kwargs.pop('setter_method_name')
         self.initial_method_name = kwargs.pop('initial_method_name')
         self.resetter_method_name = kwargs.pop('resetter_method_name')
 
@@ skipping 21 matching lines @@
         super(ComputedStyleBaseWriter, self).__init__(in_file_path)
         self._outputs = {
             'ComputedStyleBase.h': self.generate_base_computed_style_h,
             'ComputedStyleBase.cpp': self.generate_base_computed_style_cpp,
             'ComputedStyleBaseConstants.h': self.generate_base_computed_style_constants,
         }
 
         # A map of enum name -> list of enum values
         self._computed_enums = {}
         for property in self._properties.values():
-            if property['keyword_only']:
+            # Only generate enums for keyword properties that use the default field_storage_type.
+            if property['keyword_only'] and property['field_storage_type'] is None:
                 enum_name = property['type_name']
                 # From the Blink style guide: Enum members should use InterCaps with an initial capital letter. [names-enum-members]
                 enum_values = [camel_case(k) for k in property['keywords']]
                 self._computed_enums[enum_name] = enum_values
 
         # A list of all the fields to be generated.
         self._fields = []
         for property in self._properties.values():
             if property['keyword_only']:
                 property_name = property['name_for_methods']
                 property_name_lower = property_name[0].lower() + property_name[1:]
 
                 # From the Blink style guide: Other data members should be prefixed by "m_". [names-data-members]
                 field_name = 'm_' + property_name_lower
                 bits_needed = math.log(len(property['keywords']), 2)
+
+                # Separate the type path from the type name, if specified.
                 type_name = property['type_name']
+                type_path = None
+                if property['field_storage_type']:
+                    type_path = property['field_storage_type']
+                    type_name = type_path.split('/')[-1]
 
                 assert property['initial_keyword'] is not None, \
                     ('MakeComputedStyleBase requires an initial keyword for keyword_only values, none specified '
                      'for property ' + property['name'])
                 default_value = type_name + '::' + camel_case(property['initial_keyword'])
 
                 # If the property is independent, add the single-bit sized isInherited flag
                 # to the list of Fields as well.
                 if property['independent']:
                     field_name_suffix_upper = property_name + 'IsInherited'
                     field_name_suffix_lower = property_name_lower + 'IsInherited'
                     self._fields.append(Field(
                         'inherited_flag',
                         name='m_' + field_name_suffix_lower,
                         property_name=property['name'],
                         storage_type='bool',
+                        storage_type_path=None,
                         size=1,
                         default_value='true',
                         getter_method_name=field_name_suffix_lower,
                         setter_method_name='set' + field_name_suffix_upper,
                         initial_method_name='initial' + field_name_suffix_upper,
                         resetter_method_name='reset' + field_name_suffix_upper,
                     ))
 
                 # Add the property itself as a member variable.
                 self._fields.append(Field(
                     'enum',
                     name=field_name,
                     property_name=property['name'],
                     inherited=property['inherited'],
                     independent=property['independent'],
                     storage_type=type_name,
+                    storage_type_path=type_path,
                     size=int(math.ceil(bits_needed)),
                     default_value=default_value,
                     getter_method_name=property_name_lower,
                     setter_method_name='set' + property_name,
                     initial_method_name='initial' + property_name,
                     resetter_method_name='reset' + property_name,
                     is_inherited_method_name=property_name_lower + 'IsInherited',
                 ))
 
         # Small optimization: order fields by size, from largest to smallest,
@@ skipping 19 matching lines @@
     @template_expander.use_jinja('ComputedStyleBaseConstants.h.tmpl')
     def generate_base_computed_style_constants(self):
         return {
             'properties': self._properties,
             'enums': self._computed_enums,
             'fields': self._fields,
         }
 
 if __name__ == '__main__':
     in_generator.Maker(ComputedStyleBaseWriter).main(sys.argv)