Remove global DartType function.

lib/html/scripts/systemhtml.py

 #!/usr/bin/python
 # Copyright (c) 2012, 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 module provides shared functionality for the system to generate
 Dart:html APIs from the IDL database."""
 
 import emitter
 import os
@@ skipping 146 matching lines @@
   # TODO(sra): Handle multiple and named constructors.
   if typename not in _html_element_constructors:
     return []
   infos = _html_element_constructors[typename]
   if isinstance(infos, str):
     infos = ElementConstructorInfo(tag=infos)
   if not isinstance(infos, list):
     infos = [infos]
   return infos
 
-def EmitHtmlElementFactoryConstructors(emitter, infos, typename, class_name):
+def EmitHtmlElementFactoryConstructors(emitter, infos, typename, class_name,
+                                       dart_type):
   for info in infos:
     constructor_info = info.ConstructorInfo(typename)
 
     inits = emitter.Emit(
         '\n'
         '  static $RETURN_TYPE $CONSTRUCTOR($PARAMS) {\n'
         '    $CLASS _e = _document.$dom_createElement("$TAG");\n'
         '$!INITS'
         '    return _e;\n'
         '  }\n',
         RETURN_TYPE=constructor_info.type_name,
-        CONSTRUCTOR=constructor_info.ConstructorFactoryName(DartType),
+        CONSTRUCTOR=constructor_info.ConstructorFactoryName(dart_type),
         CLASS=class_name,
         TAG=info.tag,
-        PARAMS=constructor_info.ParametersInterfaceDeclaration(DartType))
+        PARAMS=constructor_info.ParametersInterfaceDeclaration(dart_type))
     for param in constructor_info.param_infos:
       inits.Emit('    if ($E != null) _e.$E = $E;\n', E=param.name)
 
 # ------------------------------------------------------------------------------
 
 class HtmlDartInterfaceGenerator(object):
   """Generates dart interface and implementation for the DOM IDL interface."""
 
   def __init__(self, options, library_emitter, event_generator, interface,
                backend):
@@ skipping 15 matching lines @@
 
   def GenerateCallback(self):
     """Generates a typedef for the callback interface."""
     handlers = [operation for operation in self._interface.operations
                 if operation.id == 'handleEvent']
     info = AnalyzeOperation(self._interface, handlers)
     code = self._library_emitter.FileEmitter(self._interface.id)
     code.Emit(self._template_loader.Load('callback.darttemplate'))
     code.Emit('typedef $TYPE $NAME($PARAMS);\n',
               NAME=self._interface.id,
-              TYPE=DartType(info.type_name),
-              PARAMS=info.ParametersImplementationDeclaration(DartType))
+              TYPE=self._DartType(info.type_name),
+              PARAMS=info.ParametersImplementationDeclaration(self._DartType))
     self._backend.GenerateCallback(info)
 
   def GenerateInterface(self):
     if (not self._interface.id in _merged_html_interfaces and
         # Don't re-generate types that have been converted to native dart types.
         self._html_interface_name not in nativified_classes):
       interface_emitter = self._library_emitter.FileEmitter(
           self._html_interface_name)
     else:
       interface_emitter = emitter.Emitter()
@@ skipping 44 matching lines @@
           constructor_info, factory_provider, factory_provider_emitter)
 
     infos = HtmlElementConstructorInfos(typename)
     if infos:
       template = self._template_loader.Load(
           'factoryprovider_Elements.darttemplate')
       EmitHtmlElementFactoryConstructors(
           self._library_emitter.FileEmitter('_Elements', template),
           infos,
           self._html_interface_name,
-          self._backend.ImplementationClassName())
+          self._backend.ImplementationClassName(),
+          self._DartType)
 
     for info in infos:
       constructors.append(info.ConstructorInfo(typename))
       if factory_provider:
         assert factory_provider == info.factory_provider_name
       else:
         factory_provider = info.factory_provider_name
 
     # TODO(vsm): Add appropriate package / namespace syntax.
     (self._type_comment_emitter,
@@ skipping 616 matching lines @@
               '$(INDENT)$TYPE $NAME = $CONVERT($ARG);\n',
               TYPE=TypeOrVar(temp_type),
               NAME=temp_name,
               CONVERT=conversion.function_name,
               ARG=parameter_names[position])
           arguments.append(temp_name)
           param_type = temp_type
           verified_type = temp_type  # verified by assignment in checked mode.
         else:
           arguments.append(parameter_names[position])
-          param_type = self._NarrowInputType(DartType(arg.type.id))
+          param_type = self._NarrowInputType(arg.type.id)
           # Verified by argument checking on entry to the dispatcher.
           verified_type = InputType(info.param_infos[position].dart_type)
 
         # The native method does not need an argument type if we know the type.
         # But we do need the native methods to have correct function types, so
         # be conservative.
         if param_type == verified_type:
           if param_type in ['String', 'num', 'int', 'double', 'bool', 'Object']:
             param_type = 'Dynamic'
         target_parameters.append(
@@ skipping 183 matching lines @@
 
     library_emitter = self._multiemitter.FileEmitter(library_file_path)
     library_file_dir = os.path.dirname(library_file_path)
     auxiliary_dir = os.path.relpath(auxiliary_dir, library_file_dir)
     imports_emitter = library_emitter.Emit(
         self._template, AUXILIARY_DIR=massage_path(auxiliary_dir))
     for path in sorted(self._path_to_emitter.keys()):
       relpath = os.path.relpath(path, library_file_dir)
       imports_emitter.Emit(
           "#source('$PATH');\n", PATH=massage_path(relpath))