| Index: Source/bindings/dart/DartDebugHooks.js
|
| diff --git a/Source/bindings/dart/DartDebugHooks.js b/Source/bindings/dart/DartDebugHooks.js
|
| index c55cfd35bc8ecfb3d70285dcca1e80816fb84cf6..3793cf457749174f4b6c6682bc1f76580866efcd 100644
|
| --- a/Source/bindings/dart/DartDebugHooks.js
|
| +++ b/Source/bindings/dart/DartDebugHooks.js
|
| @@ -105,9 +105,11 @@ DartDebug.Script.prototype = {
|
|
|
| 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);
|
|
|
| @@ -127,7 +129,7 @@ DartDebug.FrameMirror.prototype = {
|
|
|
| sourceLocation: function()
|
| {
|
| - return { line: this._lineNumber, column: 0 };
|
| + return { line: this._lineNumber, column: this._columnNumber };
|
| },
|
|
|
| scopeCount: function()
|
| @@ -155,8 +157,9 @@ DartDebug.FrameMirror.prototype = {
|
| 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; } };
|
| },
|
|
|
|
|