Remove mangling for custom methods in dart:_blink

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 327 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, type_ids):
+def DeriveResolverString(interface_id, operation_id, native_suffix, type_ids, is_custom=False):
     type_string = \
         "_".join(map(TypeIdToBlinkName, type_ids))
     if native_suffix:
         operation_id = "%s_%s" % (operation_id, native_suffix)
-    components = \
-        [TypeIdToBlinkName(interface_id), operation_id,
-         "RESOLVER_STRING", str(len(type_ids)), type_string]
+    if is_custom:
+        components = \
+            [TypeIdToBlinkName(interface_id), operation_id]
+    else:
+        components = \
+            [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):
     def massage_path(path):
@@ skipping 795 matching lines @@
 
     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]]
+                      for argument in operation.arguments[:len(info.param_infos)]]
           resolver_string = \
               DeriveResolverString(self._interface.id, operation.id,
-                                   native_suffix, type_ids)
+                                   native_suffix, type_ids, is_custom)
       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, 
         resolver_string=resolver_string)
       if not is_custom:
         self._GenerateOperationNativeCallback(operation, operation.arguments, cpp_callback_name, auto_scope_setup)
     else:
@@ skipping 784 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')