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

Unified Diff: base/memory/discardable_memory_linux.cc

Issue 195863005: Use DiscardableMemoryManager on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compilation issues on non-Android platforms Created 6 years, 8 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_linux.cc
diff --git a/base/memory/discardable_memory_linux.cc b/base/memory/discardable_memory_linux.cc
index e44b7c20ce0020fa1ba36bb0259e119488f1fe6c..fcbcfefbd7fd061f3e52c74031073af8fd04ea0e 100644
--- a/base/memory/discardable_memory_linux.cc
+++ b/base/memory/discardable_memory_linux.cc
@@ -35,7 +35,7 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType(
DiscardableMemoryType type, size_t size) {
switch (type) {
case DISCARDABLE_MEMORY_TYPE_NONE:
- case DISCARDABLE_MEMORY_TYPE_ANDROID:
+ case DISCARDABLE_MEMORY_TYPE_ASHMEM:
case DISCARDABLE_MEMORY_TYPE_MAC:
return scoped_ptr<DiscardableMemory>();
case DISCARDABLE_MEMORY_TYPE_EMULATED: {
@@ -61,13 +61,24 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType(
}
// static
-bool DiscardableMemory::PurgeForTestingSupported() {
- return true;
+bool DiscardableMemory::PurgeForTestingSupported(DiscardableMemoryType type) {
+ switch (type) {
+ case DISCARDABLE_MEMORY_TYPE_EMULATED:
+ return true;
+ default:
+ return false;
+ }
}
// static
-void DiscardableMemory::PurgeForTesting() {
- internal::DiscardableMemoryEmulated::PurgeForTesting();
+void DiscardableMemory::PurgeForTesting(DiscardableMemoryType type) {
+ switch (type) {
+ case DISCARDABLE_MEMORY_TYPE_EMULATED:
+ internal::DiscardableMemoryEmulated::PurgeForTesting();
+ return;
+ default:
+ NOTREACHED();
+ }
}
} // namespace base

Powered by Google App Engine
This is Rietveld 408576698