Switch the DevTools to support a true Dart REPL

Source/bindings/dart/DartDebugHooks.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 87 matching lines @@
     },
 
     nameOrSourceURL: function()
     {
         return this.url;
     }
 };
 
 DartDebug.FrameMirror = function(callFrame)
 {
+    this._callFrame = callFrame;
     this._functionName = callFrame.functionName;
     this._scriptId = DartDebug.scriptURLToScriptId[callFrame.scriptURL];
     this._lineNumber = callFrame.lineNumber;
+    this._columnNumber = callFrame.columnNumber;
     this._localScope = new DartDebug.ScopeMirror(callFrame.localScopeProxy, ScopeType.Local);
     this._globalScope = new DartDebug.ScopeMirror(callFrame.libraryProxy, ScopeType.Global);
 
     this._scopes = [this._localScope, this._globalScope];
 };
 
 DartDebug.FrameMirror.prototype = {
     func: function()
     {
         var self = this;
         return {
             name: function() { return self._functionName; },
             inferredName: function() { return self._functionName; },
             script: function() { return { id: function() { return self._scriptId; } }; }
         };
     },
 
     sourceLocation: function()
     {
-        return { line: this._lineNumber, column: 0 };
+        return { line: this._lineNumber, column: this._columnNumber };
     },
 
     scopeCount: function()
     {
         return this._scopes.length;
     },
 
     scope: function(index)
     {
         return this._scopes[index];
     },
 
     evaluate: function(expression, disableBreak)
     {
         // FIXME: Dart VM doesn't currently support evaluations. Use
         // JavaScript eval and 'with' statement to emulate evaluation on Dart
         // call frame.
 
         // FIXME: dartbug.com/10434 find a less fragile way to determine whether
         // we need to strip off console API support added by InjectedScript.
         var CONSOLE_API_SUPPORT_HEADER =
             'with ((this && this.console && this.console._commandLineAPI) || {}) {\n';
         if (expression.indexOf(CONSOLE_API_SUPPORT_HEADER) == 0) {
             expression = expression.substr(expression.indexOf('\n') + 1);
             expression = expression.substr(0, expression.lastIndexOf('\n'));
         }
 
-        var result = DartDebug.nativeCallbacks.evaluateInScope(expression, this._localScope.receiver(),
-                this._globalScope._object, this._localScope._object);
+        var result = DartDebug.nativeCallbacks.invocationTrampoline(
+            DartDebug.nativeCallbacks.evaluateInScope,
+            [expression, this._localScope.receiver(), this._callFrame.functionProxy, this._callFrame.localVariables]);
         return { value: function() { return result; } };
     },
 
     get details_()
     {
         var receiver = this._localScope.receiver();
         return { receiver: function() { return receiver; } };
     }
 };
 
@@ skipping 227 matching lines @@
 
 Debug.clearBreakOnUncaughtException = function()
 {
     originals.clearBreakOnUncaughtException.apply(Debug);
     DartDebug.updateExceptionPauseInfo();
 }
 
 return DartDebug;
 
 })()