Changeset 125033 in webkit

Timestamp:

Aug 8, 2012 6:21:41 AM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: store last evaluation result in $_
​https://bugs.webkit.org/show_bug.cgi?id=93377

Reviewed by Vsevolod Vlasov.

Source/WebCore:

All "console" evaluations end up in that variable on command line API.

Test: inspector/console/console-last-result.html

• inspector/InjectedScriptSource.js:

(.):

LayoutTests:

• inspector/console/console-last-result-expected.txt: Added.
• inspector/console/console-last-result.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/console/console-last-result-expected.txt (added)
• LayoutTests/inspector/console/console-last-result.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InjectedScriptSource.js (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-08  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: store last evaluation result in $_
+        https://bugs.webkit.org/show_bug.cgi?id=93377
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/console/console-last-result-expected.txt: Added.
+        * inspector/console/console-last-result.html: Added.
+
 2012-08-08  KwangYong Choi  <ky0.choi@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-08  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: store last evaluation result in $_
+        https://bugs.webkit.org/show_bug.cgi?id=93377
+
+        Reviewed by Vsevolod Vlasov.
+
+        All "console" evaluations end up in that variable on command line API.
+
+        Test: inspector/console/console-last-result.html
+
+        * inspector/InjectedScriptSource.js:
+        (.):
+
 2012-08-08  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -405 +405 @@
         try {
             return { wasThrown: false,
-                     result: this._wrapObject(this._evaluateOn(evalFunction, object, expression, isEvalOnCallFrame, injectCommandLineAPI), objectGroup, returnByValue) };
+                     result: this._wrapObject(this._evaluateOn(evalFunction, object, objectGroup, expression, isEvalOnCallFrame, injectCommandLineAPI), objectGroup, returnByValue) };
         } catch (e) {
             return this._createThrownValue(e, objectGroup);
@@ -429 +429 @@
      * @param {Function} evalFunction
      * @param {Object} object
+     * @param {string} objectGroup
      * @param {string} expression
      * @param {boolean} isEvalOnCallFrame
@@ -434 +435 @@
      * @return {*}
      */
-    _evaluateOn: function(evalFunction, object, expression, isEvalOnCallFrame, injectCommandLineAPI)
+    _evaluateOn: function(evalFunction, object, objectGroup, expression, isEvalOnCallFrame, injectCommandLineAPI)
     {
         // Only install command line api object for the time of evaluation.
@@ -445 +446 @@
                 expression = "with ((window && window.console && window.console._commandLineAPI) || {}) {\n" + expression + "\n}";
             }
-            return evalFunction.call(object, expression);
+            var result = evalFunction.call(object, expression);
+            if (objectGroup === "console")
+                this._lastResult = result;
+            return result;
         } finally {
             if (injectCommandLineAPI && inspectedWindow.console)
@@ -798 +802 @@
         this.__defineGetter__("$" + i, commandLineAPIImpl._inspectedObject.bind(commandLineAPIImpl, i));
     }
+
+    this.$_ = injectedScript._lastResult;
 }