Added initial_keyword flag to CSSProperties.in

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.
 
 from collections import namedtuple
 import math
 import sys
 
 import in_generator
 import template_expander
 import make_style_builder
 
+from name_utilities import camel_case
 
 class ComputedStyleBaseWriter(make_style_builder.StyleBuilderWriter):
     def __init__(self, in_file_path):
         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']:
                 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 = [k.title() for k in property['keywords']]
+                enum_values = [camel_case(k) for k in property['keywords']]
                 self._computed_enums[enum_name] = enum_values
 
         # A list of fields
         Field = namedtuple('Field', [
             # Name of field member variable
             'name',
             # Property field is for
             'property',
             # Field storage type
             'type',
@@ skipping 12 matching lines @@
             if property['keyword_only']:
                 property_name = property['upper_camel_name']
                 if property['name_for_methods']:
                     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)
                 type_name = property['type_name']
-                # For now, assume the default value is the first enum value.
-                default_value = type_name + '::' + self._computed_enums[type_name][0]
+
+                assert len(property['initial_keyword']) == 1, \
+                    ('MakeComputedStyleBase requires an initial keyword for keyword_only values, none specified '
+                     'for property %s' % property['name'])

[napper, 2016/12/01 02:10:02]

'for property ' + property['name']

seems a bit cleaner

[sashab, 2016/12/01 02:35:21]

Done

+                default_value = type_name + '::' + camel_case(property['initial_keyword'][0])
 
                 self._fields.append(Field(
                     name=field_name,
                     property=property,
                     type=type_name,
                     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,
@@ 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)