Revert "Revert "Use interceptor convention for methods declared on native classes.""

sdk/lib/_internal/compiler/implementation/js_backend/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.
 
 part of js_backend;
 
 class NativeEmitter {
 
   CodeEmitterTask emitter;
   CodeBuffer nativeBuffer;
@@ skipping 173 matching lines @@
                              new jsAst.LiteralNumber('$arity')]))));
             break;
           }
         }
       }
     });
   }
 
   List<jsAst.Statement> generateParameterStubStatements(
       Element member,
+      bool isInterceptedMethod,
       String invocationName,
       List<jsAst.Parameter> stubParameters,
       List<jsAst.Expression> argumentsBuffer,
       int indexOfLastOptionalArgumentInParameters) {
     // The target JS function may check arguments.length so we need to
     // make sure not to pass any unspecified optional arguments to it.
     // For example, for the following Dart method:
     //   foo([x, y, z]);
     // The call:
     //   foo(y: 1)
     // must be turned into a JS call to:
     //   foo(null, y).
 
     ClassElement classElement = member.enclosingElement;
     String nativeTagInfo = classElement.nativeTagInfo.slowToString();
 
     List<jsAst.Statement> statements = <jsAst.Statement>[];
     potentiallyConvertDartClosuresToJs(statements, member, stubParameters);
 
     String target;
+    jsAst.Expression receiver;
     List<jsAst.Expression> arguments;
 
     if (!nativeMethods.contains(member)) {
       // When calling a method that has a native body, we call it with our
       // calling conventions.
       target = backend.namer.getName(member);
       arguments = argumentsBuffer;
     } else {
       // When calling a JS method, we call it with the native name, and only the
       // arguments up until the last one provided.
       target = member.fixedBackendName();
-      arguments = argumentsBuffer.getRange(
-          0, indexOfLastOptionalArgumentInParameters + 1);
+
+      if (isInterceptedMethod) {
+        receiver = argumentsBuffer[0];
+        arguments = argumentsBuffer.getRange(1,
+            indexOfLastOptionalArgumentInParameters);
+      } else {
+        receiver = new jsAst.VariableUse('this');
+        arguments = argumentsBuffer.getRange(0,
+            indexOfLastOptionalArgumentInParameters + 1);
+      }
     }
-    statements.add(
-        new jsAst.Return(
-            new jsAst.VariableUse('this')[target](arguments)));
+    statements.add(new jsAst.Return(receiver[target](arguments)));
 
     if (!overriddenMethods.contains(member)) {
       // Call the method directly.
       return statements;
     } else {
       return <jsAst.Statement>[
           generateMethodBodyWithPrototypeCheck(
               invocationName, new jsAst.Block(statements), stubParameters)];
     }
   }
@@ skipping 297 matching lines @@
       if (emitter.compiler.enableMinification) targetBuffer.add(';');
       targetBuffer.add(jsAst.prettyPrint(
           new jsAst.ExpressionStatement(init), compiler));
       targetBuffer.add('\n');
     }
 
     targetBuffer.add(nativeBuffer);
     targetBuffer.add('\n');
   }
 }