Changeset 51385 in webkit

Timestamp:

Nov 25, 2009 8:15:39 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-25 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Pavel Feldman.

Load InspectorResource mime type from CachedResource for 304 responses

For network libraries that do not merge cache data into 304 ResourceResponses,
the mime type for cached resources is unknown.
​https://bugs.webkit.org/show_bug.cgi?id=31868

• inspector/InspectorResource.cpp: (WebCore::InspectorResource::updateResponse): (WebCore::InspectorResource::updateScriptObject): (WebCore::InspectorResource::type):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorResource.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-25  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Load InspectorResource mime type from CachedResource for 304 responses
+
+        For network libraries that do not merge cache data into 304 ResourceResponses,
+        the mime type for cached resources is unknown.
+        https://bugs.webkit.org/show_bug.cgi?id=31868
+
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::updateResponse):
+        (WebCore::InspectorResource::updateScriptObject):
+        (WebCore::InspectorResource::type):
+
 2009-11-25  Andrei Popescu  <andreip@google.com>
 

trunk/WebCore/inspector/InspectorResource.cpp

@@ -106 +106 @@
     m_expectedContentLength = response.expectedContentLength();
     m_mimeType = response.mimeType();
+    if (m_mimeType.isEmpty() && response.httpStatusCode() == 304) {
+        CachedResource* cachedResource = cache()->resourceForURL(response.url().string());
+        if (cachedResource)
+            m_mimeType = cachedResource->response().mimeType();
+    }
     m_responseHeaderFields = response.httpHeaderFields();
     m_responseStatusCode = response.httpStatusCode();
@@ -187 +192 @@
         jsonObject.set("didTypeChange", true);
     }
-    
+
     if (m_changes.hasChange(LengthChange)) {
         jsonObject.set("contentLength", m_length);
@@ -282 +287 @@
     if (m_loader->frameLoader() && m_requestURL == m_loader->frameLoader()->iconURL())
         return Image;
-    
+
     return cachedResourceType();
-    
+
 }