Changeset 71108 in webkit

Timestamp:

Nov 2, 2010 3:31:45 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2010-11-01 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Joseph Pecoraro.

Web Inspector: use mimeType from cached resource
in case response data contains none.
​https://bugs.webkit.org/show_bug.cgi?id=48773

• inspector/InspectorResourceAgent.cpp: (WebCore::InspectorResourceAgent::didReceiveResponse):
• inspector/front-end/NetworkPanel.js: (WebInspector.NetworkPanel.prototype._createTable):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorResourceAgent.cpp (modified) (2 diffs)
• inspector/front-end/NetworkPanel.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-01  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Web Inspector: use mimeType from cached resource
+        in case response data contains none.
+        https://bugs.webkit.org/show_bug.cgi?id=48773
+
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::didReceiveResponse):
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkPanel.prototype._createTable):
+
 2010-11-01  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/WebCore/inspector/InspectorResourceAgent.cpp

@@ -292 +292 @@
 void InspectorResourceAgent::didReceiveResponse(unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response)
 {
+    RefPtr<InspectorObject> resourceResponse = buildObjectForResourceResponse(response);
     String type = "Other";
     if (loader) {
@@ -303 +304 @@
             if (equalIgnoringFragmentIdentifier(response.url(), loader->url()) && type == "Other")
                 type = "Document";
+
+            // Use mime type from cached resource in case the one in response is empty.
+            if (response.mimeType().isEmpty() && cachedResource)
+                resourceResponse->setString("mimeType", cachedResource->response().mimeType());
         }
     }
-    m_frontend->didReceiveResponse(identifier, currentTime(), type, buildObjectForResourceResponse(response));
+    m_frontend->didReceiveResponse(identifier, currentTime(), type, resourceResponse);
 }
 

trunk/WebCore/inspector/front-end/NetworkPanel.js

@@ -193 +193 @@
         columns.size.aligned = "right";
 
-        columns.time.titleDOMFragment = this._makeHeaderFragment(WebInspector.UIString("Time"), WebInspector.UIString("Duration"));
+        columns.time.titleDOMFragment = this._makeHeaderFragment(WebInspector.UIString("Time"), WebInspector.UIString("Latency"));
         columns.time.sortable = true;
         columns.time.width = "10%";