diff options
| -rw-r--r-- | base/memory/memory_pressure_listener.cc | 1 | ||||
| -rw-r--r-- | base/memory/memory_pressure_listener.h | 17 | ||||
| -rw-r--r-- | content/common/host_discardable_shared_memory_manager.cc | 1 |
3 files changed, 11 insertions, 8 deletions
diff --git a/base/memory/memory_pressure_listener.cc b/base/memory/memory_pressure_listener.cc index 745c985..d51d918 100644 --- a/base/memory/memory_pressure_listener.cc +++ b/base/memory/memory_pressure_listener.cc @@ -51,6 +51,7 @@ void MemoryPressureListener::Notify(MemoryPressureLevel memory_pressure_level) { // static void MemoryPressureListener::NotifyMemoryPressure( MemoryPressureLevel memory_pressure_level) { + DCHECK_NE(memory_pressure_level, MEMORY_PRESSURE_LEVEL_NONE); TRACE_EVENT1("memory", "MemoryPressureListener::NotifyMemoryPressure", "level", memory_pressure_level); g_observers.Get().Notify(&MemoryPressureListener::Notify, diff --git a/base/memory/memory_pressure_listener.h b/base/memory/memory_pressure_listener.h index f586209..f159fb0 100644 --- a/base/memory/memory_pressure_listener.h +++ b/base/memory/memory_pressure_listener.h @@ -3,12 +3,9 @@ // found in the LICENSE file. // MemoryPressure provides static APIs for handling memory pressure on -// platforms that have such signals, such as Android. +// platforms that have such signals, such as Android and ChromeOS. // The app will try to discard buffers that aren't deemed essential (individual // modules will implement their own policy). -// -// Refer to memory_pressure_level_list.h for information about what sorts of -// signals can be sent under what conditions. #ifndef BASE_MEMORY_PRESSURE_LISTENER_H_ #define BASE_MEMORY_PRESSURE_LISTENER_H_ @@ -26,12 +23,11 @@ namespace base { // the listener. // Note that even on the same thread, the callback is not guaranteed to be // called synchronously within the system memory pressure broadcast. -// Please see notes on memory_pressure_level_list.h: some levels are absolutely -// critical, and if not enough memory is returned to the system, it'll -// potentially kill the app, and then later the app will have to be +// Please see notes in MemoryPressureLevel enum below: some levels are +// absolutely critical, and if not enough memory is returned to the system, +// it'll potentially kill the app, and then later the app will have to be // cold-started. // -// // Example: // // void OnMemoryPressure(MemoryPressureLevel memory_pressure_level) { @@ -52,6 +48,11 @@ class BASE_EXPORT MemoryPressureListener { // A Java counterpart will be generated for this enum. // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.base enum MemoryPressureLevel { + // No problems, there is enough memory to use. This event is not sent via + // callback, but the enum is used in other places to find out the current + // state of the system. + MEMORY_PRESSURE_LEVEL_NONE = -1, + // Modules are advised to free buffers that are cheap to re-allocate and not // immediately needed. MEMORY_PRESSURE_LEVEL_MODERATE = 0, diff --git a/content/common/host_discardable_shared_memory_manager.cc b/content/common/host_discardable_shared_memory_manager.cc index c56fd11..c2e9275 100644 --- a/content/common/host_discardable_shared_memory_manager.cc +++ b/content/common/host_discardable_shared_memory_manager.cc @@ -158,6 +158,7 @@ void HostDiscardableSharedMemoryManager::OnMemoryPressure( base::AutoLock lock(lock_); switch (memory_pressure_level) { + case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE: case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE: break; case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL: |