Fix bug http://code.google.com/p/dart/issues/detail?id=2718: methods that are implemented by the ht…

lib/compiler/implementation/native_emitter.dart

 // 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.
 
 class NativeEmitter {
 
   Compiler compiler;
   StringBuffer buffer;
 
   // Classes that participate in dynamic dispatch. These are the
   // classes that contain used members.
   Set<ClassElement> classesWithDynamicDispatch;
 
   // Native classes found in the application.
   Set<ClassElement> nativeClasses;
 
   // Caches the native subtypes of a native class.
   Map<ClassElement, List<ClassElement>> subtypes;
 
   // Caches the direct native subtypes of a native class.
   Map<ClassElement, List<ClassElement>> directSubtypes;
 
   // Caches the native methods that are overridden by a native class.
   // Note that the method that overrides does not have to be native:
   // it's the overridden method that must make sure it will dispatch
   // to its subclass if it sees an instance whose class is a subclass.
   Set<FunctionElement> overriddenMethods;
 
+  // Caches the methods that should just call a native JS
+  // implementation.
+  Set<FunctionElement> nativeMethods;
+
   NativeEmitter(this.compiler)
       : classesWithDynamicDispatch = new Set<ClassElement>(),
         nativeClasses = new Set<ClassElement>(),
         subtypes = new Map<ClassElement, List<ClassElement>>(),
         directSubtypes = new Map<ClassElement, List<ClassElement>>(),
         overriddenMethods = new Set<FunctionElement>(),
+        nativeMethods = new Set<FunctionElement>(),
         buffer = new StringBuffer();
 
   String get dynamicName() {
     Element element = compiler.findHelper(
         const SourceString('dynamicFunction'));
     return compiler.namer.isolateAccess(element);
   }
 
   String get dynamicSetMetadataName() {
     Element element = compiler.findHelper(
@@ skipping 127 matching lines @@
     List<String> nativeArgumentsBuffer = argumentsBuffer.getRange(
         0, indexOfLastOptionalArgumentInParameters + 1);
 
     ClassElement classElement = member.enclosingElement;
     String nativeName = classElement.nativeName.slowToString();
     String nativeArguments = Strings.join(nativeArgumentsBuffer, ",");
 
     StringBuffer code = new StringBuffer();
     potentiallyConvertDartClosuresToJs(code, member);
 
-    String name = member.name.slowToString();
-    code.add('  return this.$name($nativeArguments);');
+    if (!nativeMethods.contains(member)) {
+      // When calling a method that has a native body, we call it
+      // with our calling conventions.
+      String arguments = Strings.join(argumentsBuffer, ",");
+      code.add('  return this.${compiler.namer.getName(member)}($arguments)');
+    } else {
+      // When calling a JS method, we call it with the native name.
+      String name = member.name.slowToString();
+      code.add('  return this.$name($nativeArguments);');
+    }
 
     if (isNativeLiteral(nativeName) || !overriddenMethods.contains(member)) {
       // Call the method directly.
       buffer.add(code.toString());
     } else {
       native.generateMethodWithPrototypeCheck(
           compiler, buffer, invocationName, code.toString(), stubParameters);
     }
   }
 
@@ skipping 160 matching lines @@
     String toStringName = compiler.namer.instanceMethodName(
         null, const SourceString('toString'), 0);
     objectProperties.add("$defPropName(Object.prototype, '$toStringName', ");
     objectProperties.add(
         'function() { return $toStringHelperName(this); });\n');
 
     // Finally, emit the code in the main buffer.
     targetBuffer.add('(function() {\n$objectProperties$buffer\n})();\n');
   }
 }