Changeset 146937 in webkit

Timestamp:

Mar 26, 2013 3:04:36 PM (11 years ago)

Author:

timothy@apple.com

Message:

Make the Web Inspector console work in strict mode with JavaScriptCore.

​https://webkit.org/b/65829
rdar://problem/11271238

Reviewed by Joseph Pecoraro.

• inspector/InjectedScriptSource.js:

(InjectedScript.prototype._evaluateOn): Don't use 'eval' parameter (it isn't
allowed in strict mode). Swap window.eval with our known eval instead.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptSource.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-26  Timothy Hatcher  <timothy@apple.com>
+
+        Make the Web Inspector console work in strict mode with JavaScriptCore.
+
+        https://webkit.org/b/65829
+        rdar://problem/11271238
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/InjectedScriptSource.js:
+        (InjectedScript.prototype._evaluateOn): Don't use 'eval' parameter (it isn't
+        allowed in strict mode). Swap window.eval with our known eval instead.
+
 2013-03-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -558 +558 @@
             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; }";
 
             if (injectCommandLineAPI) {
@@ -572 +573 @@
                     parameters.push(commandLineAPI[parameterNames[i]]);
 
-                var expressionFunctionString = "(function(eval, __currentExpression, " + parameterNames.join(", ") + ") { return eval(__currentExpression); })";
+                var expressionFunctionString = "(function(__eval, __currentExpression, " + parameterNames.join(", ") + ") { " + expressionFunctionBody + " })";
             } else {
                 // Use a closure in this case too to keep the same behavior of 'var' being captured by the closure instead
                 // of leaking out into the calling scope.
-
-                var expressionFunctionString = "(function(eval, __currentExpression) { return eval(__currentExpression); })";
+                var expressionFunctionString = "(function(__eval, __currentExpression) { " + expressionFunctionBody + " })";
             }