Changeset 140114 in webkit

Timestamp:

Jan 18, 2013 2:22:01 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: inspectedWindow.eval("IamUndefined.prop", callback) fails to give exception text
​https://bugs.webkit.org/show_bug.cgi?id=106926

Patch by John J. Barton <​johnjbarton@chromium.org> on 2013-01-18
Reviewed by Pavel Feldman.

Source/WebCore:

Return .description from exceptions rather than .value (which is undefined)

New test added to extensions/extensions-eval.html

• inspector/front-end/ExtensionServer.js:

(WebInspector.ExtensionServer.prototype.):
(WebInspector.ExtensionServer.prototype._onEvaluateOnInspectedPage):

LayoutTests:

New test case for evaluations that throw.

• inspector/extensions/extensions-eval-expected.txt:
• inspector/extensions/extensions-eval.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/extensions/extensions-eval-expected.txt (modified) (1 diff)
• LayoutTests/inspector/extensions/extensions-eval.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/ExtensionServer.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-18  John J. Barton  <johnjbarton@chromium.org>
+
+        Web Inspector: inspectedWindow.eval("IamUndefined.prop", callback) fails to give exception text
+        https://bugs.webkit.org/show_bug.cgi?id=106926
+
+        Reviewed by Pavel Feldman.
+
+        New test case for evaluations that throw.
+
+        * inspector/extensions/extensions-eval-expected.txt:
+        * inspector/extensions/extensions-eval.html:
+
 2013-01-17  Dominik Röttsches  <dominik.rottsches@intel.com>
 

trunk/LayoutTests/inspector/extensions/extensions-eval-expected.txt

@@ -13 +13 @@
 RUNNING TEST: extension_testEvalStringifyingLoopFailed
 Evaluate: "Object has too long reference chain(must not be longer than 1000)" (exception: true)
+RUNNING TEST: extension_testEvalThrows
+Evaluate: "testExceptionString" (exception: true)
 RUNNING TEST: extension_testEvalUndefined
 Evaluate: undefined (exception: undefined)

trunk/LayoutTests/inspector/extensions/extensions-eval.html

@@ -47 +47 @@
 }
 
+function extension_testEvalThrows(nextTest)
+{
+    webInspector.inspectedWindow.eval("throw('testExceptionString')", callbackAndNextTest(extension_onEval, nextTest));
+}
+
 function extension_onEval(value, isException)
 {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-18  John J. Barton  <johnjbarton@chromium.org>
+
+        Web Inspector: inspectedWindow.eval("IamUndefined.prop", callback) fails to give exception text
+        https://bugs.webkit.org/show_bug.cgi?id=106926
+
+        Reviewed by Pavel Feldman.
+
+        Return .description from exceptions rather than .value (which is undefined)
+
+        New test added to extensions/extensions-eval.html
+
+        * inspector/front-end/ExtensionServer.js:
+        (WebInspector.ExtensionServer.prototype.):
+        (WebInspector.ExtensionServer.prototype._onEvaluateOnInspectedPage):
+
 2013-01-14  Dominik Röttsches  <dominik.rottsches@intel.com>
 

trunk/Source/WebCore/inspector/front-end/ExtensionServer.js

@@ -334 +334 @@
                 result.isException = true;
                 result.value = error.toString();
-            }  else
+            }  else if (wasThrown) {
+                result.isException = true;
+                result.value = resultPayload.description;
+            } else {
                 result.value = resultPayload.value;
-
-            if (wasThrown)
-                result.isException = true;
+            }
       
             this._dispatchCallback(message.requestId, port, result);