Allow ComputedStyleBase property fields to be storage_only.

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 40 matching lines @@
     {'name': 'HasExplicitlyInheritedProperties', 'field_template': 'monotonic_flag',
      'inherited': False, 'independent': False, 'default_value': False},
     # These are set if we used viewport or rem units when resolving a length.
     # TODO(shend): HasViewportUnits should be a monotonic_flag.
     {'name': 'HasViewportUnits', 'field_template': 'primitive', 'default_value': 'false',
      'type_name': 'bool', 'inherited': False, 'independent': False},
     {'name': 'HasRemUnits', 'field_template': 'monotonic_flag', 'default_value': 'false',
      'inherited': False, 'independent': False},
     # These properties only have generated storage, and their methods are handwritten in ComputedStyle.
     # TODO(shend): Remove these fields and delete the 'storage_only' template.
-    {'name': 'EmptyState', 'field_template': 'storage_only', 'size': 1, 'default_value': 'false',
+    {'name': 'EmptyState', 'field_template': 'storage_only', 'field_size': 1, 'default_value': 'false',
      'type_name': 'bool', 'inherited': False, 'independent': False},
-    {'name': 'StyleType', 'field_template': 'storage_only', 'size': 6, 'default_value': '0',
+    {'name': 'StyleType', 'field_template': 'storage_only', 'field_size': 6, 'default_value': '0',
      'type_name': 'PseudoId', 'inherited': False, 'independent': False},
-    {'name': 'PseudoBits', 'field_template': 'storage_only', 'size': 8, 'default_value': 'kPseudoIdNone',
+    {'name': 'PseudoBits', 'field_template': 'storage_only', 'field_size': 8, 'default_value': 'kPseudoIdNone',
      'type_name': 'PseudoId', 'inherited': False, 'independent': False},
     # True if 'underline solid' is the only text decoration on this element.
-    {'name': 'HasSimpleUnderline', 'field_template': 'storage_only', 'size': 1, 'default_value': 'false',
+    {'name': 'HasSimpleUnderline', 'field_template': 'storage_only', 'field_size': 1, 'default_value': 'false',
      'type_name': 'bool', 'inherited': True, 'independent': False},
     # TODO(shend): vertical align is actually a CSS property, but since we don't support union fields
     # which can be either a keyword or Length, this is generated as a nonproperty for now. Remove this
     # once we can support union fields and groups.
-    {'name': 'VerticalAlign', 'field_template': 'storage_only', 'size': 4, 'default_value': 'EVerticalAlign::kBaseline',
+    {'name': 'VerticalAlign', 'field_template': 'storage_only', 'field_size': 4, 'default_value': 'EVerticalAlign::kBaseline',
      'type_name': 'EVerticalAlign', 'inherited': False, 'independent': False},
 ]
 
 
 class Field(object):
     """
     The generated ComputedStyle object is made up of a series of Fields.
     Each Field has a name, size, type, etc, and a bunch of attributes to
     determine which methods it will be used in.
 
@@ skipping 108 matching lines @@
          'for property ' + property_['name'])
 
     if property_['field_template'] == 'keyword':
         type_name = property_['type_name']
         default_value = type_name + '::' + enum_value_name(property_['default_value'])
         size = int(math.ceil(math.log(len(property_['keywords']), 2)))
     elif property_['field_template'] == 'storage_only':
         # 'storage_only' fields need to specify a size, type_name and default_value
         type_name = property_['type_name']
         default_value = property_['default_value']
-        size = property_['size']
+        size = property_['field_size']
     elif property_['field_template'] == 'external':
         type_name = property_['type_name']
         default_value = property_['default_value']
         size = None
     elif property_['field_template'] == 'primitive':
         type_name = property_['type_name']
         default_value = property_['default_value']
         size = 1 if type_name == 'bool' else None  # pack bools with 1 bit.
     else:
         assert property_['field_template'] in ('monotonic_flag',)
@@ skipping 97 matching lines @@
         # 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_values = self._properties.values()
 
-        # Override the type name when field_type_path is specified
         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
 
         self._generated_enums = _create_enums(property_values + NONPROPERTIES)
 
         all_fields = (_create_fields('property', property_values) +
                       _create_fields('nonproperty', NONPROPERTIES))
 
         # Separate the normal fields from the bit fields
         bit_fields = [field for field in all_fields if field.is_bit_field]
         normal_fields = [field for field in all_fields if not field.is_bit_field]
 
@@ skipping 68 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()