| Index: base/memory/discardable_memory_android.cc
|
| diff --git a/base/memory/discardable_memory_android.cc b/base/memory/discardable_memory_android.cc
|
| index acf29ac85f11eb19df32b638048d4ded8e9990a5..8988c2b8d2bd46d759ec2f9c42243b6274d114be 100644
|
| --- a/base/memory/discardable_memory_android.cc
|
| +++ b/base/memory/discardable_memory_android.cc
|
| @@ -32,7 +32,10 @@
|
| // Holds the shared state used for allocations.
|
| struct SharedState {
|
| SharedState()
|
| - : manager(kAshmemMemoryLimit, kAshmemMemoryLimit, TimeDelta::Max()),
|
| + : manager(kAshmemMemoryLimit,
|
| + kAshmemMemoryLimit,
|
| + kAshmemMemoryLimit,
|
| + TimeDelta::Max()),
|
| allocator(kAshmemAllocatorName,
|
| GetOptimalAshmemRegionSizeForAllocator()) {}
|
|
|
| @@ -42,6 +45,16 @@
|
| 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() {
|
|
|