Title: [93974] trunk/Source/WebCore
- Revision
- 93974
- Author
- [email protected]
- Date
- 2011-08-29 07:11:32 -0700 (Mon, 29 Aug 2011)
Log Message
Web Inspector: cached permanent redirects don't show redirect code and text in Network panel.
https://bugs.webkit.org/show_bug.cgi?id=67126
Reviewed by Yury Semikhatsky.
* inspector/InspectorResourceAgent.cpp:
(WebCore::buildObjectForResourceResponse):
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkDataGridNode.prototype._refreshStatusCell):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93973 => 93974)
--- trunk/Source/WebCore/ChangeLog 2011-08-29 12:34:22 UTC (rev 93973)
+++ trunk/Source/WebCore/ChangeLog 2011-08-29 14:11:32 UTC (rev 93974)
@@ -1,3 +1,15 @@
+2011-08-29 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: cached permanent redirects don't show redirect code and text in Network panel.
+ https://bugs.webkit.org/show_bug.cgi?id=67126
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::buildObjectForResourceResponse):
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkDataGridNode.prototype._refreshStatusCell):
+
2011-08-25 Pavel Podivilov <[email protected]>
Web Inspector: extract FormattedContentProvider from RawSourceCode.
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (93973 => 93974)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-08-29 12:34:22 UTC (rev 93973)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-08-29 14:11:32 UTC (rev 93974)
@@ -139,8 +139,13 @@
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());
+ if (response.resourceLoadInfo() && response.resourceLoadInfo()->httpStatusCode) {
+ responseObject->setNumber("status", response.resourceLoadInfo()->httpStatusCode);
+ responseObject->setString("statusText", response.resourceLoadInfo()->httpStatusText);
+ } else {
+ responseObject->setNumber("status", response.httpStatusCode());
+ responseObject->setString("statusText", response.httpStatusText());
+ }
responseObject->setString("mimeType", response.mimeType());
responseObject->setBoolean("connectionReused", response.connectionReused());
Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (93973 => 93974)
--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-08-29 12:34:22 UTC (rev 93973)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-08-29 14:11:32 UTC (rev 93974)
@@ -1911,14 +1911,6 @@
return;
}
- var fromCache = this._resource.cached;
- if (fromCache) {
- this._statusCell.setTextAndTitle(WebInspector.UIString("(from cache)"));
- this._statusCell.addStyleClass("network-dim-cell");
- this.element.removeStyleClass("network-error-row");
- return;
- }
-
this._statusCell.removeStyleClass("network-dim-cell");
this.element.removeStyleClass("network-error-row");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
