Index: base/memory/discardable_memory.cc |
diff --git a/base/memory/discardable_memory.cc b/base/memory/discardable_memory.cc |
index 33f9e19cdeee523f7b99a53a8452ef23f0f569f0..5dcfc1cc2fd4229b9872cc0ec74fcf9020565880 100644 |
--- a/base/memory/discardable_memory.cc |
+++ b/base/memory/discardable_memory.cc |
@@ -4,51 +4,24 @@ |
#include "base/memory/discardable_memory.h" |
+#include "base/compiler_specific.h" |
#include "base/logging.h" |
namespace base { |
-DiscardableMemory::DiscardableMemory() |
- : memory_(NULL), |
- size_(0), |
- is_locked_(false) |
-#if defined(OS_ANDROID) |
- , fd_(-1) |
-#endif // OS_ANDROID |
- { |
- DCHECK(Supported()); |
-} |
- |
-void* DiscardableMemory::Memory() const { |
- DCHECK(is_locked_); |
- return memory_; |
-} |
- |
// Stub implementations for platforms that don't support discardable memory. |
#if !defined(OS_ANDROID) && !defined(OS_MACOSX) |
-DiscardableMemory::~DiscardableMemory() { |
- NOTIMPLEMENTED(); |
-} |
- |
// static |
bool DiscardableMemory::Supported() { |
return false; |
} |
-bool DiscardableMemory::InitializeAndLock(size_t size) { |
- NOTIMPLEMENTED(); |
- return false; |
-} |
- |
-LockDiscardableMemoryStatus DiscardableMemory::Lock() { |
- NOTIMPLEMENTED(); |
- return DISCARDABLE_MEMORY_FAILED; |
-} |
- |
-void DiscardableMemory::Unlock() { |
- NOTIMPLEMENTED(); |
+// static |
+scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemory( |
+ size_t size) { |
+ return scoped_ptr<DiscardableMemory>(); |
} |
// static |