Get rid of webkit_renames in dartdomgenerator.py.

lib/html/scripts/dartdomgenerator.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """This is the entry point to create Dart APIs from the IDL database."""
 
 import dartgenerator
 import database
 import fremontcutbuilder
 import logging.config
 import multiemitter
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 from generator import TypeRegistry
 from htmleventgenerator import HtmlEventGenerator
 from htmlrenamer import HtmlRenamer
 from systemhtml import DartLibraryEmitter, Dart2JSBackend,\
                        HtmlDartInterfaceGenerator
 from systemnative import CPPLibraryEmitter, DartiumBackend
 from templateloader import TemplateLoader
 
 _logger = logging.getLogger('dartdomgenerator')
 
-_webkit_renames = {
-    # W3C -> WebKit name conversion
-    # TODO(vsm): Maybe Store these renames in the IDLs.
-    'ApplicationCache': 'DOMApplicationCache',
-    'BarProp': 'BarInfo',
-    'DedicatedWorkerGlobalScope': 'DedicatedWorkerContext',
-    'FormData': 'DOMFormData',
-    'Selection': 'DOMSelection',
-    'SharedWorkerGlobalScope': 'SharedWorkerContext',
-    'Window': 'DOMWindow',
-    'WorkerGlobalScope': 'WorkerContext'}
-
 class GeneratorOptions(object):
   def __init__(self, templates, database, type_registry, renamer):
     self.templates = templates
     self.database = database
     self.type_registry = type_registry
     self.renamer = renamer
 
 # TODO(vsm): Remove once we fix Dartium to pass in the database directly.
 def Generate(database_dir, use_database_cache, dart2js_output_dir=None,
              dartium_output_dir=None):
@@ skipping 18 matching lines @@
   generator.LoadAuxiliary(auxiliary_dir)
 
   generator.FilterMembersWithUnidentifiedTypes(common_database)
   webkit_database = common_database.Clone()
 
   # Generate Dart interfaces for the WebKit DOM.
   generator.FilterInterfaces(database = webkit_database,
                              or_annotations = ['WebKit', 'Dart'],
                              exclude_displaced = ['WebKit'],
                              exclude_suppressed = ['WebKit', 'Dart'])
-  generator.RenameTypes(webkit_database, _webkit_renames, True)
   generator.FixEventTargets(webkit_database)
   generator.AddMissingArguments(webkit_database)
 
   emitters = multiemitter.MultiEmitter()
   renamer = HtmlRenamer(webkit_database)
   type_registry = TypeRegistry(webkit_database, renamer)
 
   def RunGenerator(dart_library_template, dart_output_dir, dart_library_path,
                    template_loader, backend_factory):
     options = GeneratorOptions(
         template_loader, webkit_database, type_registry, renamer)
     dart_library_emitter = DartLibraryEmitter(
         emitters, dart_library_template, dart_output_dir)
     event_generator = HtmlEventGenerator(webkit_database, template_loader)
 
     def generate_interface(interface):
       backend = backend_factory(interface)
       interface_generator = HtmlDartInterfaceGenerator(
           options, dart_library_emitter, event_generator, interface, backend)
       interface_generator.Generate()
 
-    generator.Generate(
-        webkit_database, common_database, _webkit_renames, generate_interface)
+    generator.Generate(webkit_database, common_database, generate_interface)
     dart_library_emitter.EmitLibrary(dart_library_path, auxiliary_dir)
 
   if dart2js_output_dir:
     template_paths = ['html/dart2js', 'html/impl', 'html/interface', '']
     template_loader = TemplateLoader(template_dir,
                                      template_paths,
                                      {'DARTIUM': False, 'DART2JS': True})
     backend_options = GeneratorOptions(
         template_loader, webkit_database, type_registry, renamer)
     backend_factory = lambda interface:\
@@ skipping 90 matching lines @@
     _logger.info('Copy html_dart2js to dart2js/')
     GenerateSingleFile(os.path.join(dart2js_output_dir, 'html_dart2js.dart'),
                        '../dart2js')
   if 'htmldartium' in systems:
     _logger.info('Copy html_dartium to dartium/')
     GenerateSingleFile(os.path.join(dartium_output_dir, 'html_dartium.dart'),
                        '../dartium')
 
 if __name__ == '__main__':
   sys.exit(main())