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

Unified Diff: base/memory/discardable_memory_emulated.cc

Issue 129963002: Re-land: base: Fix registering of memory pressure listeners used when emulating discardable memory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Temporarily disable memory_pressure_listener DCHECK Created 6 years, 11 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
Index: base/memory/discardable_memory_emulated.cc
diff --git a/base/memory/discardable_memory_emulated.cc b/base/memory/discardable_memory_emulated.cc
index af4bf39b7677e5d93655ef7bf550b4e5c9e878da..be756d6fc9cb94ee34aed5016100750778b79c30 100644
--- a/base/memory/discardable_memory_emulated.cc
+++ b/base/memory/discardable_memory_emulated.cc
@@ -29,6 +29,21 @@ DiscardableMemoryEmulated::~DiscardableMemoryEmulated() {
g_provider.Pointer()->Unregister(this);
}
+// static
+void DiscardableMemoryEmulated::RegisterMemoryPressureListeners() {
+ g_provider.Pointer()->RegisterMemoryPressureListener();
+}
+
+// static
+void DiscardableMemoryEmulated::UnregisterMemoryPressureListeners() {
+ g_provider.Pointer()->UnregisterMemoryPressureListener();
+}
+
+// static
+void DiscardableMemoryEmulated::PurgeForTesting() {
+ g_provider.Pointer()->PurgeAll();
+}
+
bool DiscardableMemoryEmulated::Initialize() {
return Lock() == DISCARDABLE_MEMORY_LOCK_STATUS_PURGED;
}
@@ -57,10 +72,5 @@ void* DiscardableMemoryEmulated::Memory() const {
return memory_.get();
}
-// static
-void DiscardableMemoryEmulated::PurgeForTesting() {
- g_provider.Pointer()->PurgeAll();
-}
-
} // namespace internal
} // namespace base

Powered by Google App Engine
This is Rietveld 408576698