Merge BaseGenerator into HtmlDartInterfaceGenerator.

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 systembase import GeneratorOptions
 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):
   database = LoadDatabase(database_dir, use_database_cache)
   GenerateFromDatabase(database, dart2js_output_dir, dartium_output_dir)
 
 def LoadDatabase(database_dir, use_database_cache):
   common_database = database.Database(database_dir)
   if use_database_cache:
     common_database.LoadFromCache()
@@ skipping 142 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())