Fix native bindings in _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 541 matching lines @@
       self._cpp_impl_includes.add('"DartArrayBufferViewCustom.h"');
       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,
+      constructor_info, cpp_prefix, cpp_suffix, factory_method_name,
       arguments=None, emit_to_native=False):
 
+    constructor_callback_cpp_name = cpp_prefix + cpp_suffix
+
     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,
+                                 cpp_suffix, 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'
@@ skipping 42 matching lines @@
     self._members_emitter.Emit(
         '\n  $(ANNOTATIONS)factory $CTOR($PARAMS) => _create($FACTORY_PARAMS);\n',
         ANNOTATIONS=annotations,
         CTOR=constructor_info._ConstructorFullName(self._DartType),
         PARAMS=constructor_info.ParametersAsDeclaration(self._DartType),
         FACTORY_PARAMS= \
             constructor_info.ParametersAsArgumentList())
 
     constructor_callback_cpp_name = 'constructorCallback'
     self._EmitConstructorInfrastructure(
-        constructor_info, constructor_callback_cpp_name, '_create')
+        constructor_info, "", constructor_callback_cpp_name, '_create')
 
     self._cpp_declarations_emitter.Emit(
         '\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):
-    if self._dart_use_blink:
-        constructor_callback_cpp_name = 'constructorCallback'
-    else:
-        constructor_callback_cpp_name = name + 'constructorCallback'  
+    constructor_callback_cpp_name = name + 'constructorCallback'  
     self._EmitConstructorInfrastructure(
-        constructor_info, constructor_callback_cpp_name, name, arguments, 
+        constructor_info, name, 'constructorCallback', 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 1265 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')