diff options
-rw-r--r-- | chrome/renderer/render_thread.cc | 3 | ||||
-rw-r--r-- | chrome/renderer/renderer_glue.cc | 8 | ||||
-rw-r--r-- | content/common/resource_dispatcher.cc | 3 | ||||
-rw-r--r-- | webkit/glue/webkit_glue.h | 4 |
4 files changed, 3 insertions, 15 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index c90724e..30ed651 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -230,6 +230,9 @@ class RenderResourceObserver : public ResourceDispatcher::Observer { webkit_glue::ResourceLoaderBridge::Peer* current_peer, ResourceType::Type resource_type, const net::URLRequestStatus& status) { + // Update the browser about our cache. + RenderThread::current()->InformHostOfCacheStatsLater(); + if (status.status() != net::URLRequestStatus::CANCELED || status.os_error() == net::ERR_ABORTED) { return NULL; diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 7ba91ff..72ff0ad 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -240,14 +240,6 @@ WebSocketStreamHandleBridge* WebSocketStreamHandleBridge::Create( return dispatcher->CreateBridge(handle, delegate); } -void NotifyCacheStats() { - // Update the browser about our cache - // NOTE: Since this can be called from the plugin process, we might not have - // a RenderThread. Do nothing in that case. - if (RenderThread::current()) - RenderThread::current()->InformHostOfCacheStatsLater(); -} - void CloseCurrentConnections() { RenderThread::current()->CloseCurrentConnections(); } diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc index d9a7016..d6c21c9 100644 --- a/content/common/resource_dispatcher.cc +++ b/content/common/resource_dispatcher.cc @@ -19,7 +19,6 @@ #include "net/base/upload_data.h" #include "net/http/http_response_headers.h" #include "webkit/glue/resource_type.h" -#include "webkit/glue/webkit_glue.h" // Each resource request is assigned an ID scoped to this process. static int MakeRequestID() { @@ -449,8 +448,6 @@ void ResourceDispatcher::OnRequestComplete(int request_id, // Normally, dispatching this message causes the reference-counted request to // die immediately. peer->OnCompletedRequest(status, security_info, completion_time); - - webkit_glue::NotifyCacheStats(); } int ResourceDispatcher::AddPendingRequest( diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index d2cdd5f..c1f45e6 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -164,10 +164,6 @@ void PrecacheUrl(const char16* url, int url_length); // This function is called to add a line to the application's log file. void AppendToLog(const char* filename, int line, const char* message); -// Gather usage statistics from the in-memory cache and inform our host, if -// applicable. -void NotifyCacheStats(); - // Glue to get resources from the embedder. // Gets a localized string given a message id. Returns an empty string if the |