Merge 67709 - 2010-09-17 Pavel Feldman <pfeldman@chromium.org>...

WebCore/inspector/InspectorResource.cpp

Index: WebCore/inspector/InspectorResource.cpp
===================================================================
--- WebCore/inspector/InspectorResource.cpp	(revision 67840)
+++ WebCore/inspector/InspectorResource.cpp	(working copy)
@@ -117,6 +117,11 @@
     m_changes.set(RequestChange);
 }
 
+void InspectorResource::markAsCached()
+{
+    m_cached = true;
+}
+
 void InspectorResource::updateResponse(const ResourceResponse& response)
 {
     m_expectedContentLength = response.expectedContentLength();
@@ -134,7 +139,7 @@
     m_connectionID = response.connectionID();
     m_connectionReused = response.connectionReused();
     m_loadTiming = response.resourceLoadTiming();
-    m_cached = response.wasCached();
+    m_cached = m_cached || response.wasCached();
 
     if (!m_cached && m_loadTiming && m_loadTiming->requestTime)
         m_responseReceivedTime = m_loadTiming->requestTime + m_loadTiming->receiveHeadersEnd / 1000.0;