Rename enums/functions that collide in chromium style in core/style/

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

 #!/usr/bin/env python
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 38 matching lines @@
 
         def set_if_none(property, key, value):
             if property[key] is None:
                 property[key] = value
 
         for property in self._properties.values():
             upper_camel = property['upper_camel_name']
             set_if_none(property, 'name_for_methods', upper_camel.replace('Webkit', ''))
             name = property['name_for_methods']
             set_if_none(property, 'type_name', 'E' + name)
-            set_if_none(property, 'getter', lower_first(name))
+            set_if_none(property, 'getter', lower_first(name) if property['type_name'] != name else 'get' + name)
             set_if_none(property, 'setter', 'set' + name)
             set_if_none(property, 'initial', 'initial' + name)
             if property['custom_all']:
                 property['custom_initial'] = True
                 property['custom_inherit'] = True
                 property['custom_value'] = True
             property['should_declare_functions'] = not property['use_handlers_for'] and not property['longhands'] \
                                                    and not property['direction_aware'] and not property['builder_skip']
 
     @template_expander.use_jinja('StyleBuilderFunctions.h.tmpl',
@@ skipping 12 matching lines @@
 
     @template_expander.use_jinja('StyleBuilder.cpp.tmpl', filters=filters)
     def generate_style_builder(self):
         return {
             'properties': self._properties,
         }
 
 
 if __name__ == '__main__':
     in_generator.Maker(StyleBuilderWriter).main(sys.argv)