Changeset 147356 in webkit

Timestamp:

Apr 1, 2013 1:33:04 PM (11 years ago)

Author:

timothy@apple.com

Message:

Make 'this' evaluate to the correct object when paused in the Debugger.

​https://webkit.org/b/113607
rdar://problem/13538351

Reviewed by Joseph Pecoraro.

Source/WebCore:

• inspector/InjectedScriptSource.js:

(InjectedScript.prototype._evaluateOn): Bind 'this' to the expression function.

LayoutTests:

• platform/mac/http/tests/inspector/console-resource-errors-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/http/tests/inspector/console-resource-errors-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InjectedScriptSource.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-01  Timothy Hatcher  <timothy@apple.com>
+
+        Make 'this' evaluate to the correct object when paused in the Debugger.
+
+        https://webkit.org/b/113607
+        rdar://problem/13538351
+
+        Reviewed by Joseph Pecoraro.
+
+        * platform/mac/http/tests/inspector/console-resource-errors-expected.txt:
+
 2013-04-01  Victor Carbune  <vcarbune@chromium.org>
 

trunk/LayoutTests/platform/mac/http/tests/inspector/console-resource-errors-expected.txt

@@ -5 +5 @@
 GET http://127.0.0.1:8000/inspector/non-existent-iframe.html 404 (Not Found) non-existent-iframe.html:1 console-message console-error-level
 GET http://127.0.0.1:8000/inspector/non-existent-script.js 404 (Not Found) console-resource-errors-iframe.html:4 console-message console-error-level
-GET http://127.0.0.1:8000/inspector/non-existent-xhr 404 (Not Found) [native code]:1send [native code]:1loadXHR console-resource-errors.html:18performActions console-resource-errors.html:10eval codeeval [native code]:1(anonymous function)_evaluateOn_evaluateAndWrapevaluate console-message console-error-level
+GET http://127.0.0.1:8000/inspector/non-existent-xhr 404 (Not Found) [native code]:1send [native code]:1loadXHR console-resource-errors.html:18performActions console-resource-errors.html:10eval codeeval [native code]:1(anonymous function)(anonymous function)_evaluateOn_evaluateAndWrapevaluate console-message console-error-level
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-01  Timothy Hatcher  <timothy@apple.com>
+
+        Make 'this' evaluate to the correct object when paused in the Debugger.
+
+        https://webkit.org/b/113607
+        rdar://problem/13538351
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/InjectedScriptSource.js:
+        (InjectedScript.prototype._evaluateOn): Bind 'this' to the expression function.
+
 2013-04-01  Victor Carbune  <vcarbune@chromium.org>
 

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -556 +556 @@
             // create that provides the command line APIs.
 
-            var thisObject = isEvalOnCallFrame ? object : null;
             var parameters = [InjectedScriptHost.evaluate, expression];
             var expressionFunctionBody = "var __originalEval = window.eval; window.eval = __eval; try { return eval(__currentExpression); } finally { window.eval = __originalEval; }";
@@ -567 +566 @@
                 // expressions with 'use strict';.
 
-                var commandLineAPI = new CommandLineAPI(this._commandLineAPIImpl, thisObject);
+                var commandLineAPI = new CommandLineAPI(this._commandLineAPIImpl, isEvalOnCallFrame ? object : null);
                 var parameterNames = Object.getOwnPropertyNames(commandLineAPI);
-
                 for (var i = 0; i < parameterNames.length; ++i)
                     parameters.push(commandLineAPI[parameterNames[i]]);
@@ -580 +578 @@
             }
 
-            var expressionFunction = evalFunction.call(thisObject, expressionFunctionString);
-            var result = expressionFunction.apply(thisObject, parameters);
+            // Bind 'this' to the function expression using another closure instead of Function.prototype.bind. This ensures things will work if the page replaces bind.
+            var boundExpressionFunctionString = "(function(__function, __thisObject) { return function() { return __function.apply(__thisObject, arguments) }; })(" + expressionFunctionString + ", this)";
+            var expressionFunction = evalFunction.call(object, boundExpressionFunctionString);
+            var result = expressionFunction.apply(null, parameters);
 
             if (objectGroup === "console")