diff options
author | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 00:06:30 +0000 |
---|---|---|
committer | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 00:08:00 +0000 |
commit | 65bd25eb43439e79fa829b15a0b3318cd6887ef5 (patch) | |
tree | a65c4190ee6159738444cdcee4029cf5b8c599a2 /base/memory/discardable_memory_android.cc | |
parent | d8d54bcf7023e562e1bd5fbf7141653b54ac2bd4 (diff) | |
download | chromium_src-65bd25eb43439e79fa829b15a0b3318cd6887ef5.zip chromium_src-65bd25eb43439e79fa829b15a0b3318cd6887ef5.tar.gz chromium_src-65bd25eb43439e79fa829b15a0b3318cd6887ef5.tar.bz2 |
Re-land: base: Introduce an explicit call for reducing emulated discardable memory usage.
This removes the use of memory pressure signals from discardable memory
system and instead introduces an explicit call for reducing emulated
discardable memory that the renderer can call when all widgets are hidden
until we have a better mechanism in place.
BUG=398087
TEST=base_unittests,content_browsertests
Review URL: https://codereview.chromium.org/448173002
Cr-Commit-Position: refs/heads/master@{#289127}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/memory/discardable_memory_android.cc')
-rw-r--r-- | base/memory/discardable_memory_android.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/base/memory/discardable_memory_android.cc b/base/memory/discardable_memory_android.cc index 8988c2b..acf29ac 100644 --- a/base/memory/discardable_memory_android.cc +++ b/base/memory/discardable_memory_android.cc @@ -32,10 +32,7 @@ size_t GetOptimalAshmemRegionSizeForAllocator() { // Holds the shared state used for allocations. struct SharedState { SharedState() - : manager(kAshmemMemoryLimit, - kAshmemMemoryLimit, - kAshmemMemoryLimit, - TimeDelta::Max()), + : manager(kAshmemMemoryLimit, kAshmemMemoryLimit, TimeDelta::Max()), allocator(kAshmemAllocatorName, GetOptimalAshmemRegionSizeForAllocator()) {} @@ -47,16 +44,6 @@ LazyInstance<SharedState>::Leaky g_shared_state = LAZY_INSTANCE_INITIALIZER; } // namespace // static -void DiscardableMemory::RegisterMemoryPressureListeners() { - internal::DiscardableMemoryEmulated::RegisterMemoryPressureListeners(); -} - -// static -void DiscardableMemory::UnregisterMemoryPressureListeners() { - internal::DiscardableMemoryEmulated::UnregisterMemoryPressureListeners(); -} - -// static bool DiscardableMemory::ReduceMemoryUsage() { return internal::DiscardableMemoryEmulated::ReduceMemoryUsage(); } |