Rename some classes where names changed for 1916

tools/dom/scripts/systemnative.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 systems to generate
 native binding from the IDL database."""
 
 import emitter
 import os
@@ skipping 125 matching lines @@
 }
 
 _cpp_overloaded_callback_map = {
   ('DOMURL', 'createObjectUrlFromSourceCallback'): 'URLMediaSource',
   ('DOMURL', 'createObjectUrlFromStreamCallback'): 'URLMediaStream',
   ('DOMURL', '_createObjectUrlFromWebKitSourceCallback'): 'URLMediaSource',
   ('DOMURL', '_createObjectURL_2Callback'): 'URLMediaSource',
   ('DOMURL', '_createObjectURL_3Callback'): 'URLMediaStream',
 }
 
+_blink_1916_rename_map = {
+  'NavigatorID': 'Navigator',
+  'Clipboard': 'DataTransfer',
+  'Player': 'AnimationPlayer',
+}
+
 _cpp_partial_map = {}
 
 _cpp_no_auto_scope_list = set([
   ('Document', 'body', 'Getter'),
   ('Document', 'getElementById', 'Callback'),
   ('Document', 'getElementsByName', 'Callback'),
   ('Document', 'getElementsByTagName', 'Callback'),
   ('Element', 'getAttribute', 'Callback'),
   ('Element', 'getAttributeNS', 'Callback'),
   ('Element', 'id', 'Getter'),
@@ skipping 145 matching lines @@
     return _cpp_partial_map[interface_name]
   else:
     return set([])
 
 def array_type(data_type):
     matched = re.match(r'([\w\d_\s]+)\[\]', data_type)
     if not matched:
         return None
     return matched.group(1)
 
+def TypeIdToBlinkName(interface_id):
+  if interface_id in _blink_1916_rename_map:
+    interface_id = _blink_1916_rename_map[interface_id]
+  return interface_id
+
 def _GetCPPTypeName(interface_name, callback_name, cpp_name):
   # TODO(vsm): We need to track the original IDL file name in order to recover
   # the proper CPP name.
 
   cpp_tuple = (interface_name, callback_name)
   if cpp_tuple in _cpp_callback_map:
     cpp_type_name = _cpp_callback_map[cpp_tuple]
   elif (interface_name, cpp_name) in _cpp_overloaded_callback_map:
     cpp_type_name = _cpp_overloaded_callback_map[(interface_name, cpp_name)]
   else:
     cpp_type_name = interface_name
   return cpp_type_name
 
 def DeriveQualifiedName(library_name, name):
     return library_name + "." + name
 
 def DeriveNativeName(interface_name, name, suffix):
     fields = ["Native", interface_name, name]
     if suffix != "":
         fields.append(suffix)
     return "_".join(fields)
 
 def DeriveResolverString(interface_id, operation_id, native_suffix, type_ids):
     type_string = \
-        "_".join(type_ids)
+        "_".join(map(TypeIdToBlinkName, type_ids))
     if native_suffix:
         operation_id = "%s_%s" % (operation_id, native_suffix)
     components = \
-        [interface_id, operation_id,
+        [TypeIdToBlinkName(interface_id), operation_id,
          "RESOLVER_STRING", str(len(type_ids)), type_string]
     return "_".join(components)
 
 # FIXME(leafp) This should really go elsewhere.  I think the right thing
 # to do is to add support in the DartLibraries objects in systemhtml
 # for emitting top level code in libraries.  This can then just be a
 # normal use of that kind of object
 def GetNativeLibraryEmitter(emitters, template_loader, 
                             dartium_output_dir, dart_output_dir,
                             auxiliary_dir):
@@ skipping 1295 matching lines @@
     if emit_metadata:
       metadata = self._metadata.GetFormattedMetadata(
           self._renamer.GetLibraryName(self._interface),
           self._interface, idl_name, '  ')
     dart_native_name = \
         DeriveNativeName(self._interface.id, idl_name, native_suffix)
 
     if (resolver_string):
         native_binding = resolver_string
     else:
+        native_binding_id = self._interface.id
+        if self._dart_use_blink:
+          native_binding_id = TypeIdToBlinkName(native_binding_id)
         native_binding = \
-            '%s_%s_%s' % (self._interface.id, idl_name, native_suffix)
+            '%s_%s_%s' % (native_binding_id, idl_name, native_suffix)
 
     if self._dart_use_blink:
         if not static:
             formals = ", ".join(['mthis'] + parameters)
             actuals = ", ".join(['this'] + parameters)
         else:
             formals = ", ".join(parameters)
             actuals = ", ".join(parameters)
         if native_binding in _cpp_resolver_string_map:
             native_binding = \
@@ skipping 284 matching lines @@
     e.Emit("};\n");
     e.Emit('\n');
     e.Emit('} // namespace WebCore\n');
 
 def _IsOptionalStringArgumentInInitEventMethod(interface, operation, argument):
   return (
       interface.id.endswith('Event') and
       operation.id.startswith('init') and
       argument.ext_attrs.get('Default') == 'Undefined' and
       argument.type.id == 'DOMString')