Title: [90356] trunk/Source/WebCore
- Revision
- 90356
- Author
- vse...@chromium.org
- Date
- 2011-07-04 02:36:03 -0700 (Mon, 04 Jul 2011)
Log Message
2011-07-04 Vsevolod Vlasov <vse...@chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: Update network resource url from response data.
https://bugs.webkit.org/show_bug.cgi?id=63736
* inspector/Inspector.json:
* inspector/InspectorResourceAgent.cpp:
(WebCore::buildObjectForResourceResponse):
* inspector/front-end/NetworkManager.js:
(WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90355 => 90356)
--- trunk/Source/WebCore/ChangeLog 2011-07-04 09:20:15 UTC (rev 90355)
+++ trunk/Source/WebCore/ChangeLog 2011-07-04 09:36:03 UTC (rev 90356)
@@ -1,3 +1,16 @@
+2011-07-04 Vsevolod Vlasov <vse...@chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: Update network resource url from response data.
+ https://bugs.webkit.org/show_bug.cgi?id=63736
+
+ * inspector/Inspector.json:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::buildObjectForResourceResponse):
+ * inspector/front-end/NetworkManager.js:
+ (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
+
2011-07-04 Andrey Kosyakov <ca...@chromium.org>
Reviewed by Yury Semikhatsky.
Modified: trunk/Source/WebCore/inspector/Inspector.json (90355 => 90356)
--- trunk/Source/WebCore/inspector/Inspector.json 2011-07-04 09:20:15 UTC (rev 90355)
+++ trunk/Source/WebCore/inspector/Inspector.json 2011-07-04 09:36:03 UTC (rev 90356)
@@ -425,6 +425,7 @@
"type": "object",
"description": "HTTP response data.",
"properties": [
+ { "name": "url", "type": "string", "description": "Response URL." },
{ "name": "status", "type": "number", "description": "HTTP response status code." },
{ "name": "statusText", "type": "string", "description": "HTTP response status text." },
{ "name": "headers", "type": "object", "description": "HTTP response headers." },
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (90355 => 90356)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-07-04 09:20:15 UTC (rev 90355)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-07-04 09:36:03 UTC (rev 90356)
@@ -149,6 +149,7 @@
return 0;
RefPtr<InspectorObject> responseObject = InspectorObject::create();
+ responseObject->setString("url", response.url().string());
responseObject->setNumber("status", response.resourceLoadInfo() ? response.resourceLoadInfo()->httpStatusCode : response.httpStatusCode());
responseObject->setString("statusText", response.resourceLoadInfo() ? response.resourceLoadInfo()->httpStatusText : response.httpStatusText());
Modified: trunk/Source/WebCore/inspector/front-end/NetworkManager.js (90355 => 90356)
--- trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-07-04 09:20:15 UTC (rev 90355)
+++ trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-07-04 09:36:03 UTC (rev 90356)
@@ -88,6 +88,8 @@
if (!response)
return;
+ if (response.url && resource.url !== response.url)
+ resource.url = ""
resource.mimeType = response.mimeType;
resource.statusCode = response.status;
resource.statusText = response.statusText;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
