Changeset 83435 in webkit

Timestamp:

Apr 11, 2011 5:30:57 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-04-11 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: add support for optional output parameters.
​https://bugs.webkit.org/show_bug.cgi?id=58207

Output parameters such as "redirectResponse" are optional, but
do not allow specifying them as such.

• inspector/CodeGeneratorInspector.pm:
• inspector/Inspector.json:
• inspector/InspectorResourceAgent.cpp: (WebCore::buildObjectForResourceResponse): (WebCore::buildObjectForCachedResource):
• inspector/front-end/NetworkManager.js: (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
• inspector/generate-inspector-idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/CodeGeneratorInspector.pm (modified) (1 diff)
• inspector/Inspector.json (modified) (3 diffs)
• inspector/InspectorResourceAgent.cpp (modified) (2 diffs)
• inspector/front-end/NetworkManager.js (modified) (1 diff)
• inspector/generate-inspector-idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-11  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: add support for optional output parameters.
+        https://bugs.webkit.org/show_bug.cgi?id=58207
+
+        Output parameters such as "redirectResponse" are optional, but
+        do not allow specifying them as such.
+
+        * inspector/CodeGeneratorInspector.pm:
+        * inspector/Inspector.json:
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::buildObjectForResourceResponse):
+        (WebCore::buildObjectForCachedResource):
+        * inspector/front-end/NetworkManager.js:
+        (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
+        * inspector/generate-inspector-idl:
+
 2011-04-11  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/inspector/CodeGeneratorInspector.pm

@@ -376 +376 @@
     if (scalar(@argsFiltered)) {
         push(@function, "    RefPtr<InspectorObject> paramsObject = InspectorObject::create();");
-        my @pushArguments = map("    paramsObject->set" . typeTraits($_->type, "JSONType") . "(\"" . $_->name . "\", " . $_->name . ");", @argsFiltered);
-        push(@function, @pushArguments);
+
+        foreach my $parameter (@argsFiltered) {
+            my $optional = $parameter->extendedAttributes->{"optional"} ? "if (" . $parameter->name . ")\n        " : "";
+            push(@function, "    " . $optional . "paramsObject->set" . typeTraits($parameter->type, "JSONType") . "(\"" . $parameter->name . "\", " . $parameter->name . ");");
+        }
         push(@function, "    ${functionName}Message->setObject(\"params\", paramsObject);");
     }

trunk/Source/WebCore/inspector/Inspector.json

@@ -387 +387 @@
                     { "name": "documentURL", "type": "string", "description": "URL of the document this resource is loaded for." },
                     { "name": "request", "$ref": "ResourceRequest", "description": "Request data." },
-                    { "name": "redirectResponse", "$ref": "ResourceResponse", "description": "Redirect response data." },
+                    { "name": "redirectResponse", "optional": true, "$ref": "ResourceResponse", "description": "Redirect response data." },
                     { "name": "time", "type": "number", "description": "Timestamp." },
                     { "name": "callStack", "type": "array", "items": { "$ref" : "DebuggerStackFrame"}, "description": "JavaScript stack trace upon issuing this request." }
@@ -394 +394 @@
             {
                 "name": "resourceMarkedAsCached",
-                "description": "Fired when request is known to be served from memory cache.",
+                "description": "Fired when request is known to be served from disk cache.",
                 "parameters": [
                     { "name": "identifier", "type": "integer", "description": "Request identifier." }
@@ -1285 +1285 @@
                 "returns": [
                     { "name": "breakpointId", "type": "string", "description": "Id of the created breakpoint for further manipulations." },
-                    { "name": "locations", "type": "array", "items": { "$ref" : "Location"}, "description": "List of the locations this breakpoint resolved into." }
+                    { "name": "locations", "optional": true, "type": "array", "items": { "$ref" : "Location"}, "description": "List of the locations this breakpoint resolved into." }
                 ],
                 "description": "Sets JavaScript breakpoint at a given location specified by URL. This breakpoint will survive page reload."

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -216 +216 @@
 static PassRefPtr<InspectorObject> buildObjectForResourceResponse(const ResourceResponse& response)
 {
+    if (response.isNull())
+        return 0;
+
     RefPtr<InspectorObject> responseObject = InspectorObject::create();
-    if (response.isNull())
-        return responseObject;
-
     responseObject->setNumber("status", response.resourceLoadInfo() ? response.resourceLoadInfo()->httpStatusCode : response.httpStatusCode());
     responseObject->setString("statusText", response.resourceLoadInfo() ? response.resourceLoadInfo()->httpStatusText : response.httpStatusText());
@@ -271 +271 @@
     resourceObject->setString("type", cachedResourceTypeString(cachedResource));
     resourceObject->setNumber("bodySize", cachedResource.encodedSize());
-    resourceObject->setObject("response", buildObjectForResourceResponse(cachedResource.response()));
+    RefPtr<InspectorObject> resourceResponse = buildObjectForResourceResponse(cachedResource.response());
+    if (resourceResponse)
+        resourceObject->setObject("response", resourceResponse);
     return resourceObject;
 }

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

@@ -86 +86 @@
     _updateResourceWithResponse: function(resource, response)
     {
-        if (!("status" in response))
+        if (!response)
             return;
 

trunk/Source/WebCore/inspector/generate-inspector-idl

@@ -131 +131 @@
             if ("parameters" in event):
                 for in_param in event["parameters"]:
-                    params.append("out %s %s" % (param_type(in_param), in_param["name"]))
+                    if ("optional" in in_param):
+                        optional = " [optional]"
+                    else:
+                        optional = ""
+                    params.append("out%s %s %s" % (optional, param_type(in_param), in_param["name"]))
             output_file.write("\n        [event] void %s(%s);" % (event["name"], ", ".join(params)))
     output_file.write("\n    };")