Make resolver strings match up better

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 305 matching lines @@
 
 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,
+                         argument_count, type_ids):
+    type_string = \
+        "_".join(type_ids[:argument_count])
+    if native_suffix:
+        operation_id = "%s_%s" % (operation_id, native_suffix)
+    components = \
+        [interface_id, operation_id,
+         "RESOLVER_STRING", str(argument_count), 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):
     def massage_path(path):
         # The most robust way to emit path separators is to use / always.
         return path.replace('\\', '/')
@@ skipping 206 matching lines @@
       self._cpp_definitions_emitter.Emit(
         '\n'
         'static void constructorCallback(Dart_NativeArguments args)\n'
         '{\n'
         '    WebCore::DartArrayBufferViewInternal::constructWebGLArray<Dart$(INTERFACE_NAME)>(args);\n'
         '}\n',
         INTERFACE_NAME=self._interface.id);
 
   def _EmitConstructorInfrastructure(self,
       constructor_info, constructor_callback_cpp_name, factory_method_name,
-      argument_count=None, emit_to_native=False):
-    constructor_callback_id = self._interface.id + '_' + constructor_callback_cpp_name
-    if argument_count is None:
+      arguments=None, emit_to_native=False):
+
+    if arguments is None:
       argument_count = len(constructor_info.param_infos)
+    else:
+      argument_count = len(arguments)
 
     typed_formals = constructor_info.ParametersAsArgumentList(argument_count)
     parameters = constructor_info.ParametersAsStringOfVariables(argument_count)
     interface_name =  self._interface_type_info.interface_name()
 
+    if self._dart_use_blink and arguments:
+        type_ids = [p.type.id for p in arguments]
+        constructor_callback_id = \
+            DeriveResolverString(self._interface.id,
+                                 constructor_callback_cpp_name, None,
+                                 argument_count, type_ids)
+    else:
+        constructor_callback_id = self._interface.id + '_' + constructor_callback_cpp_name
+
     if self._dart_use_blink:
         # First we emit the toplevel function
         dart_native_name = \
             DeriveNativeName(self._interface.id, constructor_callback_cpp_name, "")
         self._native_library_emitter.Emit(
             '\n'
             '$FACTORY_METHOD_NAME($PARAMETERS) native "$ID";\n',
             FACTORY_METHOD_NAME=dart_native_name,
             PARAMETERS=parameters,
             ID=constructor_callback_id)
@@ skipping 51 matching lines @@
         '\n'
         'void $CPP_CALLBACK(Dart_NativeArguments);\n',
         CPP_CALLBACK=constructor_callback_cpp_name)
 
     return True
 
   def IsConstructorArgumentOptional(self, argument):
     return False
 
   def EmitStaticFactoryOverload(self, constructor_info, name, arguments):
-    constructor_callback_cpp_name = name + 'constructorCallback'
+    if self._dart_use_blink:
+        constructor_callback_cpp_name = 'constructorCallback'
+    else:
+        constructor_callback_cpp_name = name + 'constructorCallback'  
     self._EmitConstructorInfrastructure(
-        constructor_info, constructor_callback_cpp_name, name, len(arguments), 
+        constructor_info, constructor_callback_cpp_name, name, arguments, 
         emit_to_native=self._dart_use_blink)
 
     ext_attrs = self._interface.ext_attrs
 
     create_function = 'create'
     if 'NamedConstructor' in ext_attrs:
       create_function = 'createForJSConstructor'
     function_expression = '%s::%s' % (self._interface_type_info.native_type(), create_function)
     self._GenerateNativeCallback(
         constructor_callback_cpp_name,
@@ skipping 326 matching lines @@
     if self._HasNativeIndexGetter():
       self._EmitNativeIndexGetter(dart_element_type)
     elif self._HasExplicitIndexedGetter():
       self._EmitExplicitIndexedGetter(dart_element_type)
     else:
       if self._dart_use_blink:
           dart_native_name = \
               DeriveNativeName(self._interface.id, "NativeIndexed", "Getter")
           # First emit a toplevel function to do the native call
           # Calls to this are emitted elsewhere,
+          resolver_string = \
+              DeriveResolverString(self._interface.id, "item", "Callback",
+                                   1, ["unsigned long"])
           self._native_library_emitter.Emit(
               '\n'
               '$(DART_NATIVE_NAME)(mthis, index) '
-              'native "$(INTERFACE)_item_Callback";\n',
+              'native "$(RESOLVER_STRING)";\n',
               DART_NATIVE_NAME = dart_native_name,
-              INTERFACE=self._interface.id)
+              RESOLVER_STRING=resolver_string)
 
           # Emit the method which calls the toplevel function, along with
           # the [] operator.
           self._members_emitter.Emit(
               '\n'
               '  $TYPE operator[](int index) {\n'
               '    if (index < 0 || index >= length)\n'
               '      throw new RangeError.range(index, 0, length);\n'
               '    return $(DART_NATIVE_NAME)(this, index);\n'
               '  }\n\n'
@@ skipping 104 matching lines @@
     has_optional_arguments = any(self._IsArgumentOptionalInWebCore(operation, argument) for argument in operation.arguments)
     needs_dispatcher = not is_custom and (len(info.operations) > 1 or has_optional_arguments)
 
     if info.callback_args:
       self._AddFutureifiedOperation(info, html_name)
     elif not needs_dispatcher:
       # Bind directly to native implementation
       argument_count = (0 if info.IsStatic() else 1) + len(info.param_infos)
       native_suffix = 'Callback'
       auto_scope_setup = self._GenerateAutoSetupScope(info.name, native_suffix)
+      if self._dart_use_blink:
+          type_ids = [argument.type.id
+                      for argument in operation.arguments[:argument_count]]
+          resolver_string = \
+              DeriveResolverString(self._interface.id, operation.id,
+                                   native_suffix, len(info.param_infos), 
+                                   type_ids)
+      else:
+          resolver_string = None
       cpp_callback_name = self._GenerateNativeBinding(
         info.name, argument_count, dart_declaration,
         info.IsStatic(), return_type, parameters,
-        native_suffix, is_custom, auto_scope_setup)
+        native_suffix, is_custom, auto_scope_setup, 
+        resolver_string=resolver_string)
       if not is_custom:
         self._GenerateOperationNativeCallback(operation, operation.arguments, cpp_callback_name, auto_scope_setup)
     else:
       self._GenerateDispatcher(info, info.operations, dart_declaration, html_name)
 
   def _GenerateDispatcher(self, info, operations, dart_declaration, html_name):
 
     def GenerateCall(
         stmts_emitter, call_emitter, version, operation, argument_count):
       native_suffix = 'Callback'
       actuals = info.ParametersAsListOfVariables(argument_count)
       return_type = self.SecureOutputType(operation.type.id)
       native_suffix = 'Callback'
       if self._dart_use_blink:
           base_name = '_%s_%s' % (operation.id, version)
-          cpp_base_name = '%s' % operation.id
           overload_name = \
               DeriveNativeName(self._interface.id, base_name, native_suffix)
           static = True
           if not operation.is_static:
             actuals = ['mthis'] + actuals
           actuals_s = ", ".join(actuals)
           dart_declaration = '%s(%s)' % (
             base_name, actuals_s)
-          type_string = \
-              "_".join([argument.type.id
-                        for argument in operation.arguments[:argument_count]])
-          components = \
-              [self._interface.id, cpp_base_name, native_suffix,
-               str(argument_count), type_string]
-          resolver_string = "_".join(components)
+          type_ids = [argument.type.id
+                      for argument in operation.arguments[:argument_count]]
+          resolver_string = \
+              DeriveResolverString(self._interface.id, operation.id,
+                                   native_suffix, argument_count, type_ids)
       else:
           base_name = '_%s_%s' % (operation.id, version)
-          cpp_base_name = base_name
           overload_name = base_name
           static = operation.is_static
           actuals_s = ", ".join(actuals)
           dart_declaration = '%s%s %s(%s)' % (
             'static ' if static else '',
             return_type,
             overload_name, actuals_s)
           resolver_string = None
 
       call_emitter.Emit('$NAME($ARGS)', NAME=overload_name, ARGS=actuals_s)
@@ skipping 742 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')