Stop passing HtmlSystemShared around and move html renaming to IDLTypeInfo.

lib/dom/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 logging.config
 import multiemitter
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 from generator import TypeRegistry
 from systembase import GeneratorContext
 from systemfrog import FrogSystem
-from systemhtml import HtmlInterfacesSystem, HtmlFrogSystem
+from systemhtml import HtmlInterfacesSystem, HtmlFrogSystem, HtmlSystemShared
 from systeminterface import InterfacesSystem
 from systemnative import NativeImplementationSystem
 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',
@@ skipping 24 matching lines @@
   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)
 
-  def CreateGeneratorContext(template_paths, conditions, output_dir):
+  def CreateGeneratorContext(template_paths, conditions, type_registry,
+                             output_dir):
     return GeneratorContext(
         TemplateLoader(template_dir, template_paths, conditions),
-        webkit_database, emitters, TypeRegistry(), output_dir)
+        webkit_database, emitters, type_registry, output_dir)
 
   def Generate(system):
     generator.Generate(webkit_database, system,
                        super_database=common_database,
                        webkit_renames=_webkit_renames)
 
   emitters = multiemitter.MultiEmitter()
 
   for system_name in system_names:
     if system_name in ['htmlfrog', 'htmldartium']:
+      renames = HtmlSystemShared.MakeHtmlRenames(webkit_database)
+      type_registry = TypeRegistry(renames)
       if system_name == 'htmlfrog':
         context = CreateGeneratorContext(
             ['html/frog', 'html/impl', 'html', ''],
             {'DARTIUM': False, 'FROG': True},
+            type_registry,
             html_output_dir)
         backend = HtmlFrogSystem(context)
       else:
         context = CreateGeneratorContext(
             ['dom/native', 'html/dartium', 'html/impl', ''],
             {'DARTIUM': True, 'FROG': False},
+            type_registry,
             html_output_dir)
         backend = NativeImplementationSystem(context, auxiliary_dir)
       context = CreateGeneratorContext(
-          ['html/interface', 'html/impl', 'html', ''], {}, html_output_dir)
+          ['html/interface', 'html/impl', 'html', ''], {}, type_registry,
+          html_output_dir)
       html_system = HtmlInterfacesSystem(context, backend)
       Generate(html_system)
     else:
+      type_registry = TypeRegistry({})
       context = CreateGeneratorContext(
-          ['dom/interface', 'dom', ''], {}, dom_output_dir)
+          ['dom/interface', 'dom', ''], {}, type_registry, dom_output_dir)
       interface_system = InterfacesSystem(context)
       if system_name == 'dummy':
         context = CreateGeneratorContext(
-            ['dom/dummy', 'dom', ''], {}, dom_output_dir)
+            ['dom/dummy', 'dom', ''], {}, type_registry, dom_output_dir)
         implementation_system = dartgenerator.DummyImplementationSystem(
             context)
       elif system_name == 'frog':
         context = CreateGeneratorContext(
-            ['dom/frog', 'dom', ''], {}, dom_output_dir)
+            ['dom/frog', 'dom', ''], {}, type_registry, dom_output_dir)
         implementation_system = FrogSystem(context)
       else:
         raise Exception('Unsupported system_name %s' % system_name)
 
       # Makes interface files available for listing in the library for the
       # implementation system.
       implementation_system._interface_system = interface_system
       Generate(interface_system)
       Generate(implementation_system)
 
@@ skipping 53 matching lines @@
   dom_output_dir = options.output_dir or os.path.join(current_dir,
       '../generated')
   html_output_dir = options.output_dir or os.path.join(current_dir,
       '../../html/generated')
   Generate(systems, database_dir, options.use_database_cache,
               dom_output_dir, html_output_dir)
   GenerateSingleFile(systems)
 
 if __name__ == '__main__':
   sys.exit(main())