"Reverting 15020"

sdk/lib/html/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 190 matching lines @@
 
     native_binding = '%s_constructor_Callback' % self._interface.id
     emitter.Emit(
         template,
         FACTORYPROVIDER=factory_provider,
         INTERFACE=interface_name,
         PARAMETERS=constructor_info.ParametersDeclaration(self._DartType),
         ARGUMENTS=constructor_info.ParametersAsArgumentList(),
         NATIVE_NAME=native_binding)
 
-  def AddConstructors(self, constructors, factory_name, class_name,
-      base_class, factory_constructor_name=None):
-    super(DartiumBackend, self).AddConstructors(constructors, factory_name,
-        class_name, base_class, factory_constructor_name)
+  def AddConstructors(self, constructors, factory_provider, class_name,
+      base_class):
+    super(DartiumBackend, self).AddConstructors(constructors, factory_provider,
+        class_name, base_class)
 
     super_constructor = ''
     if base_class and base_class != 'NativeFieldWrapperClass1':
       super_constructor = ': super.internal()'
 
     self._members_emitter.Emit(
         '  $CLASSNAME.internal()$SUPERCONSTRUCTOR;\n',
         CLASSNAME=class_name,
         SUPERCONSTRUCTOR=super_constructor)
 
@@ skipping 664 matching lines @@
   def EmitResolver(self, template, output_dir):
     file_path = os.path.join(output_dir, 'DartResolver.cpp')
     includes_emitter, body_emitter = self._emitters.FileEmitter(file_path).Emit(template)
     for header_file in self._headers_list:
       path = os.path.relpath(header_file, output_dir)
       includes_emitter.Emit('#include "$PATH"\n', PATH=path)
       body_emitter.Emit(
           '    if (Dart_NativeFunction func = $CLASS_NAME::resolver(name, argumentCount))\n'
           '        return func;\n',
           CLASS_NAME=os.path.splitext(os.path.basename(path))[0])