Rename Dartium dart:html implementation classes.

lib/html/scripts/generator.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 systems to generate
 Dart APIs from the IDL database."""
 
 import copy
 import re
@@ skipping 700 matching lines @@
   def dart_type(self):
     return self._data.dart_type or self._dart_interface_name
 
   def narrow_dart_type(self):
     # TODO(podivilov): only primitive and collection types should override
     # dart_type.
     if self._data.dart_type != None:
       return self.dart_type()
     if IsPureInterface(self.idl_type()):
       return self.idl_type()
-    return self.implementation_name()
+    return ImplementationClassNameForInterfaceName(self.interface_name())
 
   def interface_name(self):
     return self._dart_interface_name
 
   def implementation_name(self):
-    return ImplementationClassNameForInterfaceName(self._dart_interface_name)
+    implementation_name = ImplementationClassNameForInterfaceName(
+        self.interface_name())
+    if self.merged_into():
+      implementation_name = '%s_Merged' % implementation_name
+    return implementation_name
 
   def has_generated_interface(self):
     return True
 
   def merged_interface(self):
     # All constants, attributes, and operations of merged interface should be
     # added to this interface. Merged idl interface does not have corresponding
     # Dart generated interface, and all references to merged idl interface
     # (e.g. parameter types, return types, parent interfaces) should be replaced
     # with this interface. There are two important restrictions:
@@ skipping 349 matching lines @@
             self._database.GetInterface(type_name))
       else:
         dart_interface_name = type_name
       return InterfaceIDLTypeInfo(type_name, type_data, dart_interface_name)
 
     if type_data.clazz == 'ListLike':
       return ListLikeIDLTypeInfo(type_name, type_data, self.TypeInfo(type_data.item_type))
 
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)