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

WebCore/inspector/InspectorResource.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 99 matching lines @@
 void InspectorResource::updateRequest(const ResourceRequest& request)
 {
     m_requestHeaderFields = request.httpHeaderFields();
     m_requestMethod = request.httpMethod();
     if (request.httpBody() && !request.httpBody()->isEmpty())
         m_requestFormData = request.httpBody()->flattenToString();
 
     m_changes.set(RequestChange);
 }
 
+void InspectorResource::markAsCached()
+{
+    m_cached = true;
+}
+
 void InspectorResource::updateResponse(const ResourceResponse& response)
 {
     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();
     m_responseStatusText = response.httpStatusText();
     m_suggestedFilename = response.suggestedFilename();
 
     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;
     else
         m_responseReceivedTime = currentTime();
 
     m_changes.set(TimingChange);
     m_changes.set(ResponseChange);
     m_changes.set(TypeChange);
 }
@@ skipping 258 matching lines @@
     // Update load time, otherwise the resource will
     // have start time == end time and  0 load duration
     // until its loading is completed.
     m_endTime = currentTime();
     m_changes.set(TimingChange);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)