Changeset 93389 in webkit

Timestamp:

Aug 19, 2011 1:42:03 AM (13 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: backend js api: an ability to skip optional arguments in the middle of the argument list is required.
​https://bugs.webkit.org/show_bug.cgi?id=66482

There are functions in the API with multiple optional arguments.
When we call it we have to specify an optional argument as 'undefined' if we want to pass non default value for the next one.
This can be solved with passing the arguments as an object.

Reviewed by Pavel Feldman.

Source/WebCore:

• inspector/CodeGeneratorInspector.pm:
• inspector/front-end/RemoteObject.js:

LayoutTests:

• inspector/debugger/debugger-set-breakpoint-regex.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/debugger-set-breakpoint-regex.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/CodeGeneratorInspector.pm (modified) (2 diffs)
• Source/WebCore/inspector/front-end/RemoteObject.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-19  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: backend js api: an ability to skip optional arguments in the middle of the argument list is required.
+        https://bugs.webkit.org/show_bug.cgi?id=66482
+
+        There are functions in the API with multiple optional arguments.
+        When we call it we have to specify an optional argument as 'undefined' if we want to pass non default value for the next one.
+        This can be solved with passing the arguments as an object.
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/debugger/debugger-set-breakpoint-regex.html:
+
 2011-08-18  Shawn Singh  <shawnsingh@chromium.org>
 

trunk/LayoutTests/inspector/debugger/debugger-set-breakpoint-regex.html

@@ -19 +19 @@
         function testSetNoneOfURLAndRegex(next)
         {
-            var url = "debugger-set-breakpoint.js";
-            var urlRegex = "debugger-set-breakpoint.*";
-            DebuggerAgent.setBreakpointByUrl(undefined, undefined, 1, step2);
+            DebuggerAgent.setBreakpointByUrl.invoke({lineNumber: 1}, step2);
 
             function step2(result)
@@ -45 +43 @@
         function testSetByRegex(next)
         {
-            var url = undefined;
-            var urlRegex = "debugger-set-breakpoint.*";
-            var columnNumber = undefined;
-            var condition = undefined;
-            DebuggerAgent.setBreakpointByUrl(url, urlRegex, 8, columnNumber, condition, step2);
+            DebuggerAgent.setBreakpointByUrl.invoke({urlRegex: "debugger-set-breakpoint.*", lineNumber:8}, step2);
 
             function step2(result)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-19  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: backend js api: an ability to skip optional arguments in the middle of the argument list is required.
+        https://bugs.webkit.org/show_bug.cgi?id=66482
+
+        There are functions in the API with multiple optional arguments.
+        When we call it we have to specify an optional argument as 'undefined' if we want to pass non default value for the next one.
+        This can be solved with passing the arguments as an object.
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/CodeGeneratorInspector.pm:
+        * inspector/front-end/RemoteObject.js:
+
 2011-08-19  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Source/WebCore/inspector/CodeGeneratorInspector.pm

@@ -787 +787 @@
             window[agentName] = {};
         window[agentName][domainAndFunction[1]] = this.sendMessageToBackend.bind(this, requestString);
+        window[agentName][domainAndFunction[1]]["invoke"] = this._invoke.bind(this, requestString)
+    },
+
+    _invoke: function(requestString, args, callback)
+    {
+        var request = JSON.parse(requestString);
+        request.params = args;
+        this.sendMessageObjectToBackend(request, callback);
     },
 
@@ -832 +840 @@
             }
         }
-        request.id = this._wrap(callback || function() {});
-
+
+        this.sendMessageObjectToBackend(request, callback);
+    },
+
+    sendMessageObjectToBackend: function(messageObject, callback)
+    {
+        messageObject.id = this._wrap(callback || function() {});
+        var message = JSON.stringify(messageObject);
         if (window.dumpInspectorProtocolMessages)
-            console.log("frontend: " + JSON.stringify(request));
+            console.log("frontend: " + message);
 
         ++this._pendingResponsesCount;
-        this.sendMessageObjectToBackend(request);
-    },
-
-    sendMessageObjectToBackend: function(messageObject)
-    {
-        var message = JSON.stringify(messageObject);
         InspectorFrontendHost.sendMessageToBackend(message);
     },

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

@@ -161 +161 @@
         }
 
-        RuntimeAgent.evaluate(value, undefined, false, true, evaluatedCallback.bind(this));
+        RuntimeAgent.evaluate.invoke({expression:value, doNotPauseOnExceptions:true}, evaluatedCallback.bind(this));
 
         function evaluatedCallback(error, result, wasThrown)