[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit dda7403c0ddecc416289b01d87ba66e2424d8dd1
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 10:31:45 2010 +0000

    2010-11-01  Pavel Feldman  <pfeldman at 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):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71108 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a8519ff..baeea4b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-01  Pavel Feldman  <pfeldman at 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 at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/InspectorResourceAgent.cpp b/WebCore/inspector/InspectorResourceAgent.cpp
index ec50e12..ec70b8b 100644
--- a/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/WebCore/inspector/InspectorResourceAgent.cpp
@@ -291,6 +291,7 @@ void InspectorResourceAgent::markResourceAsCached(unsigned long identifier)
 
 void InspectorResourceAgent::didReceiveResponse(unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response)
 {
+    RefPtr<InspectorObject> resourceResponse = buildObjectForResourceResponse(response);
     String type = "Other";
     if (loader) {
         if (equalIgnoringFragmentIdentifier(response.url(), loader->frameLoader()->iconURL()))
@@ -302,9 +303,13 @@ void InspectorResourceAgent::didReceiveResponse(unsigned long identifier, Docume
 
             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);
 }
 
 void InspectorResourceAgent::didReceiveContentLength(unsigned long identifier, int lengthReceived)
diff --git a/WebCore/inspector/front-end/NetworkPanel.js b/WebCore/inspector/front-end/NetworkPanel.js
index cda65b1..a717c34 100644
--- a/WebCore/inspector/front-end/NetworkPanel.js
+++ b/WebCore/inspector/front-end/NetworkPanel.js
@@ -192,7 +192,7 @@ WebInspector.NetworkPanel.prototype = {
         columns.size.width = "10%";
         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%";
         columns.time.aligned = "right";

-- 
WebKit Debian packaging