Reapply 12799.

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
 
@@ skipping 200 matching lines @@
   'webkitSpeechChange': 'speechChange',
   'webkitsourceclose': 'sourceClose',
   'webkitsourceended': 'sourceEnded',
   'webkitsourceopen': 'sourceOpen',
   'webkitTransitionEnd': 'transitionEnd',
   'write': 'write',
   'writeend': 'writeEnd',
   'writestart': 'writeStart'
 }
 
-
-
 # Information for generating element constructors.
 #
 # TODO(sra): maybe remove all the argument complexity and use cascades.
 #
 #   var c = new CanvasElement(width: 100, height: 70);
 #   var c = new CanvasElement()..width = 100..height = 70;
 #
 class ElementConstructorInfo(object):
   def __init__(self, name=None, tag=None,
                params=[], opt_params=[],
@@ skipping 239 matching lines @@
 
   def __init__(self, system, interface):
     super(HtmlDartInterfaceGenerator, self).__init__(
         system._database, interface)
     self._system = system
     self._shared = system._shared
     self._html_interface_name = system._renamer.RenameInterface(self._interface)
     self._backend = system._backend.ImplementationGenerator(self._interface)
 
   def StartInterface(self):
-    if not self._interface.id in _merged_html_interfaces:
+    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):
       path = '%s.dart' % self._html_interface_name
       self._interface_emitter = self._system._CreateEmitter(path)
     else:
       self._interface_emitter = emitter.Emitter()
 
     template_file = 'interface_%s.darttemplate' % self._html_interface_name
     interface_template = (self._system._templates.TryLoad(template_file) or
                           self._system._templates.Load('interface.darttemplate'))
 
     typename = self._html_interface_name
@@ skipping 63 matching lines @@
      self._top_level_emitter) = self._interface_emitter.Emit(
          interface_template + '$!TOP_LEVEL',
          ID=typename,
          EXTENDS=implements_str)
 
     self._type_comment_emitter.Emit("/// @domName $DOMNAME",
         DOMNAME=self._interface.doc_js_name)
 
     if self._backend.HasImplementation():
       if not self._interface.id in _merged_html_interfaces:
-        filename = '%sImpl.dart' % self._html_interface_name
+        name = self._html_interface_name
+        if self._html_interface_name in nativified_classes:
+          name = nativified_classes[self._html_interface_name]
+        filename = '%sImpl.dart' % name
       else:
         filename = '%sImpl_Merged.dart' % self._html_interface_name
       self._implementation_emitter = self._system._CreateEmitter(filename)
     else:
       self._implementation_emitter = emitter.Emitter()
     self._backend.SetImplementationEmitter(self._implementation_emitter)
     self._implementation_members_emitter = self._backend.StartInterface()
 
     for constructor_info in constructors:
       constructor_info.GenerateFactoryInvocation(
@@ skipping 199 matching lines @@
   def ImplementationClassName(self):
     return self._ImplClassName(self._html_interface_name)
 
   def SetImplementationEmitter(self, implementation_emitter):
     self._dart_code = implementation_emitter
 
   def ImplementsMergedMembers(self):
     return True
 
   def _ImplClassName(self, type_name):
-    return '_%sImpl' % type_name
+    name = type_name
+    if type_name in nativified_classes:
+      name = nativified_classes[type_name]
+    return '_%sImpl' % name
 
   def StartInterface(self):
     interface = self._interface
     interface_name = interface.id
 
     self._class_name = self._ImplClassName(self._html_interface_name)
 
     base = None
     if interface.parents:
       supertype = interface.parents[0].type.id
@@ skipping 433 matching lines @@
   def GenerateLibraries(self, dart_files):
     auxiliary_dir = os.path.relpath(self._auxiliary_dir, self._output_dir)
     self._GenerateLibFile(
         'html_dart2js.darttemplate',
         os.path.join(self._output_dir, 'html_dart2js.dart'),
         dart_files,
         AUXILIARY_DIR=systembase.MassagePath(auxiliary_dir))
 
   def Finish(self):
     pass