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

Unified Diff: base/memory/discardable_memory_emulated.cc

Issue 195863005: Use DiscardableMemoryManager on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add |DiscardableMemoryAshmem::is_locked| 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_emulated.cc
diff --git a/base/memory/discardable_memory_emulated.cc b/base/memory/discardable_memory_emulated.cc
index c9effe6d2ff7e8439e6dc94245e7914da2ea4aa8..415a45145cd79176fad48d97775aaa98b3f739d0 100644
--- a/base/memory/discardable_memory_emulated.cc
+++ b/base/memory/discardable_memory_emulated.cc
@@ -17,9 +17,10 @@ base::LazyInstance<internal::DiscardableMemoryManager>::Leaky g_manager =
namespace internal {
-DiscardableMemoryEmulated::DiscardableMemoryEmulated(size_t size)
- : is_locked_(false) {
- g_manager.Pointer()->Register(this, size);
+DiscardableMemoryEmulated::DiscardableMemoryEmulated(size_t bytes)
+ : bytes_(bytes),
+ is_locked_(false) {
+ g_manager.Pointer()->Register(this, bytes);
}
DiscardableMemoryEmulated::~DiscardableMemoryEmulated() {
@@ -71,11 +72,11 @@ void* DiscardableMemoryEmulated::Memory() const {
return memory_.get();
}
-bool DiscardableMemoryEmulated::AllocateAndAcquireLock(size_t bytes) {
+bool DiscardableMemoryEmulated::AllocateAndAcquireLock() {
if (memory_)
return true;
- memory_.reset(new uint8[bytes]);
+ memory_.reset(new uint8[bytes_]);
return false;
}

Powered by Google App Engine
This is Rietveld 408576698