diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 18:37:54 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 18:37:54 +0000 |
| commit | ce7dabcdd3528252e5a991f287cdcb2b3853b422 (patch) | |
| tree | f15094afffc4153fdeb0cf71cbe738d73bc6071b /webkit/glue/webkitclient_impl.cc | |
| parent | 7ea99ca4dcac7ec6bd2ad80f4e04758e901a3f0a (diff) | |
| download | chromium_src-ce7dabcdd3528252e5a991f287cdcb2b3853b422.zip chromium_src-ce7dabcdd3528252e5a991f287cdcb2b3853b422.tar.gz chromium_src-ce7dabcdd3528252e5a991f287cdcb2b3853b422.tar.bz2 | |
Revert 58153 - Introduce a flag to bypass the cache when retrieving current memory usage.
We need the most fresh value when giving an estimate to current working set, for
example, after major GC in V8 happened.
Review URL: http://codereview.chromium.org/3285003
TBR=antonm@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkitclient_impl.cc')
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 5bfd43a5..70be0f3 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -424,11 +424,10 @@ static size_t memoryUsageMBGeneric() { } #endif -size_t WebKitClientImpl::memoryUsageMB(bool no_cache) { +size_t WebKitClientImpl::memoryUsageMB() { size_t current_mem_usage = 0; MemoryUsageCache* mem_usage_cache_singleton = MemoryUsageCache::Get(); - if (!no_cache - && mem_usage_cache_singleton->IsCachedValueValid(¤t_mem_usage)) + if (mem_usage_cache_singleton->IsCachedValueValid(¤t_mem_usage)) return current_mem_usage; current_mem_usage = |