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

Unified Diff: trunk/src/base/memory/discardable_memory_emulated.cc

Issue 257383004: Revert 267170 "Use DiscardableMemoryManager on Android." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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: trunk/src/base/memory/discardable_memory_emulated.cc
===================================================================
--- trunk/src/base/memory/discardable_memory_emulated.cc (revision 267174)
+++ trunk/src/base/memory/discardable_memory_emulated.cc (working copy)
@@ -17,10 +17,9 @@
namespace internal {
-DiscardableMemoryEmulated::DiscardableMemoryEmulated(size_t bytes)
- : bytes_(bytes),
- is_locked_(false) {
- g_manager.Pointer()->Register(this, bytes);
+DiscardableMemoryEmulated::DiscardableMemoryEmulated(size_t size)
+ : is_locked_(false) {
+ g_manager.Pointer()->Register(this, size);
}
DiscardableMemoryEmulated::~DiscardableMemoryEmulated() {
@@ -72,11 +71,11 @@
return memory_.get();
}
-bool DiscardableMemoryEmulated::AllocateAndAcquireLock() {
+bool DiscardableMemoryEmulated::AllocateAndAcquireLock(size_t bytes) {
if (memory_)
return true;
- memory_.reset(new uint8[bytes_]);
+ memory_.reset(new uint8[bytes]);
return false;
}
« no previous file with comments | « trunk/src/base/memory/discardable_memory_emulated.h ('k') | trunk/src/base/memory/discardable_memory_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698