diff options
Diffstat (limited to 'webkit/glue')
-rw-r--r-- | webkit/glue/webkitclient_impl.cc | 5 | ||||
-rw-r--r-- | webkit/glue/webkitclient_impl.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 70be0f3..5bfd43a5 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -424,10 +424,11 @@ static size_t memoryUsageMBGeneric() { } #endif -size_t WebKitClientImpl::memoryUsageMB() { +size_t WebKitClientImpl::memoryUsageMB(bool no_cache) { size_t current_mem_usage = 0; MemoryUsageCache* mem_usage_cache_singleton = MemoryUsageCache::Get(); - if (mem_usage_cache_singleton->IsCachedValueValid(¤t_mem_usage)) + if (!no_cache + && mem_usage_cache_singleton->IsCachedValueValid(¤t_mem_usage)) return current_mem_usage; current_mem_usage = diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h index 8c0cfa3..2d446f4 100644 --- a/webkit/glue/webkitclient_impl.h +++ b/webkit/glue/webkitclient_impl.h @@ -34,7 +34,7 @@ class WebKitClientImpl : public WebKit::WebKitClient { virtual WebKit::WebString signedPublicKeyAndChallengeString( unsigned key_size_index, const WebKit::WebString& challenge, const WebKit::WebURL& url); - virtual size_t memoryUsageMB(); + virtual size_t memoryUsageMB(bool no_cache = false); virtual WebKit::WebURLLoader* createURLLoader(); virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle(); virtual WebKit::WebString userAgent(const WebKit::WebURL& url); |