Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Unified Diff: base/memory/discardable_memory_emulated.cc

Issue 336273003: base: Add soft memory limit to DiscardableMemoryManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac build Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/memory/discardable_memory_emulated.h ('k') | base/memory/discardable_memory_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/discardable_memory_emulated.cc
diff --git a/base/memory/discardable_memory_emulated.cc b/base/memory/discardable_memory_emulated.cc
index 140fdb01e28952acd80025c5bda9591fa67276c3..d1bebc4ab16355e33c35af4de13baa93929740fe 100644
--- a/base/memory/discardable_memory_emulated.cc
+++ b/base/memory/discardable_memory_emulated.cc
@@ -19,7 +19,9 @@ const size_t kEmulatedBytesToKeepUnderModeratePressure =
struct SharedState {
SharedState()
: manager(kEmulatedMemoryLimit,
- kEmulatedBytesToKeepUnderModeratePressure) {}
+ kEmulatedMemoryLimit,
+ kEmulatedBytesToKeepUnderModeratePressure,
+ TimeDelta::Max()) {}
internal::DiscardableMemoryManager manager;
};
@@ -52,6 +54,11 @@ void DiscardableMemoryEmulated::UnregisterMemoryPressureListeners() {
}
// static
+bool DiscardableMemoryEmulated::ReduceMemoryUsage() {
+ return g_shared_state.Pointer()->manager.ReduceMemoryUsage();
+}
+
+// static
void DiscardableMemoryEmulated::PurgeForTesting() {
g_shared_state.Pointer()->manager.PurgeAll();
}
« no previous file with comments | « base/memory/discardable_memory_emulated.h ('k') | base/memory/discardable_memory_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698