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; |
} |