Changeset 83724 in webkit

Timestamp:

Apr 13, 2011 6:24:02 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

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

Reviewed by Yury Semikhatsky.

Web Inspector: make optional event parameter last to prevent regressions.
​https://bugs.webkit.org/show_bug.cgi?id=58433

• inspector/Inspector.json:
• inspector/InspectorResourceAgent.cpp: (WebCore::InspectorResourceAgent::willSendRequest):
• inspector/front-end/NetworkManager.js: (WebInspector.NetworkDispatcher.prototype.requestWillBeSent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/Inspector.json (modified) (1 diff)
• inspector/InspectorResourceAgent.cpp (modified) (1 diff)
• inspector/front-end/NetworkManager.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: make optional event parameter last to prevent regressions.
+        https://bugs.webkit.org/show_bug.cgi?id=58433
+
+        * inspector/Inspector.json:
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::willSendRequest):
+        * inspector/front-end/NetworkManager.js:
+        (WebInspector.NetworkDispatcher.prototype.requestWillBeSent):
+
 2011-04-13  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -447 +447 @@
                     { "name": "documentURL", "type": "string", "description": "URL of the document this resource is loaded for." },
                     { "name": "request", "$ref": "ResourceRequest", "description": "Request data." },
-                    { "name": "redirectResponse", "optional": true, "$ref": "ResourceResponse", "description": "Redirect response data." },
                     { "name": "timestamp", "type": "number", "description": "Timestamp." },
-                    { "name": "stackTrace", "type": "array", "items": { "$ref": "Console.CallFrame"}, "description": "JavaScript stack trace upon issuing this request." }
+                    { "name": "stackTrace", "type": "array", "items": { "$ref": "Console.CallFrame"}, "description": "JavaScript stack trace upon issuing this request." },
+                    { "name": "redirectResponse", "optional": true, "$ref": "ResourceResponse", "description": "Redirect response data." }
                 ]
             },

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -304 +304 @@
     else
         callStackValue = InspectorArray::create();
-    m_frontend->requestWillBeSent(static_cast<int>(identifier), pointerAsId(loader->frame()), pointerAsId(loader), loader->url().string(), buildObjectForResourceRequest(request), buildObjectForResourceResponse(redirectResponse), currentTime(), callStackValue);
+    m_frontend->requestWillBeSent(static_cast<int>(identifier), pointerAsId(loader->frame()), pointerAsId(loader), loader->url().string(), buildObjectForResourceRequest(request), currentTime(), callStackValue, buildObjectForResourceResponse(redirectResponse));
 }
 

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

@@ -113 +113 @@
     },
 
-    requestWillBeSent: function(identifier, frameId, loaderId, documentURL, request, redirectResponse, time, stackTrace)
+    requestWillBeSent: function(identifier, frameId, loaderId, documentURL, request, time, stackTrace, redirectResponse)
     {
         var resource = this._inflightResourcesById[identifier];