Changeset 142486 in webkit

Timestamp:

Feb 11, 2013 10:05:33 AM (11 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: [Extension API] adjust inspectedWindow.eval() callback parameters to expose non-exceptional error
​https://bugs.webkit.org/show_bug.cgi?id=108640

Reviewed by Vsevolod Vlasov.

Source/WebCore:

• only set first parameter to eval() callback iff expression successfully evaluates;
• use object, not bool as second parameter;
• pass exceptions and extension errors as second parameter if evaluate failed;
• minor drive-by changes in ExtensionAPI utilities.

• inspector/front-end/ExtensionAPI.js:

(injectedExtensionAPI.ExtensionSidebarPaneImpl.prototype.setExpression):
(injectedExtensionAPI.InspectedWindow.prototype.):
(injectedExtensionAPI.InspectedWindow.prototype.eval):
(injectedExtensionAPI.extractCallbackArgument):

• inspector/front-end/ExtensionServer.js:

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

LayoutTests:

Rebase tests following change in exception parameter to inspectedWindow.eval() callback.

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

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)
• LayoutTests/inspector/extensions/extensions-sidebar-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/ExtensionAPI.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/ExtensionServer.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-01  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: [Extension API] adjust inspectedWindow.eval() callback parameters to expose non-exceptional error
+        https://bugs.webkit.org/show_bug.cgi?id=108640
+
+        Reviewed by Vsevolod Vlasov.
+
+        Rebase tests following change in exception parameter to inspectedWindow.eval() callback.
+
+        * inspector/extensions/extensions-eval-expected.txt:
+        * inspector/extensions/extensions-eval.html:
+        * inspector/extensions/extensions-sidebar-expected.txt:
+
 2013-02-11  Andrey Kosyakov  <caseq@chromium.org>
 

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

@@ -12 +12 @@
 Evaluate: 0 (exception: undefined)
 RUNNING TEST: extension_testEvalStringifyingLoopFailed
-Evaluate: "Object has too long reference chain(must not be longer than 1000)" (exception: true)
+log: Extension server error: Inspector protocol error: Object has too long reference chain(must not be longer than 1000)
+Evaluate: undefined (exception: {"code":"E_PROTOCOLERROR","description":"Inspector protocol error: %s","details":["Object has too long reference chain(must not be longer than 1000)"],"isError":true})
 RUNNING TEST: extension_testEvalThrows
-Evaluate: "testExceptionString" (exception: true)
+Evaluate: undefined (exception: {"isException":true,"value":"testExceptionString"})
 RUNNING TEST: extension_testEvalUndefined
 Evaluate: undefined (exception: undefined)

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

@@ -52 +52 @@
 }
 
-function extension_onEval(value, isException)
+function extension_onEval(value, status)
 {
-    output("Evaluate: " + JSON.stringify(value) + " (exception: " + isException + ")");
+    var exceptionString = typeof status === "undefined" ? "undefined" : JSON.stringify(status);
+    output("Evaluate: " + JSON.stringify(value) + " (exception: " + exceptionString + ")");
 }
 

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

@@ -7 +7 @@
 Got onShown(), frame not defined
 RUNNING TEST: extension_testSidebarSetExpression
+log: Extension server error: Inspector protocol error: Object has too long reference chain(must not be longer than 1000)
 Sidebar content: titlef0: "expression"f1: undefinedf2: nullf3: Objectf4: Array[0]f5: Array[3]f6: Objectf7: 42f8: Locationf9: HTMLCollection[2]f10: function () {}f11: "foo"__proto__: Object
 RUNNING TEST: extension_testSidebarSetObject

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-01  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: [Extension API] adjust inspectedWindow.eval() callback parameters to expose non-exceptional error
+        https://bugs.webkit.org/show_bug.cgi?id=108640
+
+        Reviewed by Vsevolod Vlasov.
+
+        - only set first parameter to eval() callback iff expression successfully evaluates;
+        - use object, not bool as second parameter;
+        - pass exceptions and extension errors as second parameter if evaluate failed;
+        - minor drive-by changes in ExtensionAPI utilities.
+
+        * inspector/front-end/ExtensionAPI.js:
+        (injectedExtensionAPI.ExtensionSidebarPaneImpl.prototype.setExpression):
+        (injectedExtensionAPI.InspectedWindow.prototype.):
+        (injectedExtensionAPI.InspectedWindow.prototype.eval):
+        (injectedExtensionAPI.extractCallbackArgument):
+        * inspector/front-end/ExtensionServer.js:
+        (WebInspector.ExtensionServer.prototype.):
+        (WebInspector.ExtensionServer.prototype._onEvaluateOnInspectedPage):
+        (WebInspector.ExtensionStatus):
+
 2013-02-11  Andrey Kosyakov  <caseq@chromium.org>
 

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

@@ -450 +450 @@
     setExpression: function(expression, rootTitle, evaluateOptions)
     {
-        var callback = extractCallbackArgument(arguments);
         var request = {
             command: commands.SetSidebarContent,
@@ -460 +459 @@
         if (typeof evaluateOptions === "object")
             request.evaluateOptions = evaluateOptions;
-        extensionServer.sendRequest(request, callback);
+        extensionServer.sendRequest(request, extractCallbackArgument(arguments));
     },
 
@@ -658 +657 @@
         function callbackWrapper(result)
         {
-            callback(result.value, result.isException);
+            if (result.isError || result.isException)
+                callback(undefined, result);
+            else
+                callback(result.value);
         }
         var request = {

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

@@ -330 +330 @@
         function callback(error, resultPayload, wasThrown)
         {
-            var result = {};
-            if (error) {
-                result.isException = true;
-                result.value = error.toString();
-            }  else if (wasThrown) {
-                result.isException = true;
-                result.value = resultPayload.description;
-            } else {
-                result.value = resultPayload.value;
-            }
+            if (error)
+                result = this._status.E_PROTOCOLERROR(error.toString());
+            else if (wasThrown)
+                result = { isException: true, value: resultPayload.description };
+            else
+                result = { value: resultPayload.value };
       
             this._dispatchCallback(message.requestId, port, result);
@@ -820 +816 @@
     this.E_NOTFOUND = makeStatus.bind(null, "E_NOTFOUND", "Object not found: %s");
     this.E_NOTSUPPORTED = makeStatus.bind(null, "E_NOTSUPPORTED", "Object does not support requested operation: %s");
+    this.E_PROTOCOLERROR = makeStatus.bind(null, "E_PROTOCOLERROR", "Inspector protocol error: %s");
     this.E_FAILED = makeStatus.bind(null, "E_FAILED", "Operation failed: %s");
 }