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

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

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.h
===================================================================
--- trunk/src/base/memory/discardable_memory_emulated.h (revision 267174)
+++ trunk/src/base/memory/discardable_memory_emulated.h (working copy)
@@ -16,7 +16,7 @@
: public DiscardableMemory,
public internal::DiscardableMemoryManagerAllocation {
public:
- explicit DiscardableMemoryEmulated(size_t bytes);
+ explicit DiscardableMemoryEmulated(size_t size);
virtual ~DiscardableMemoryEmulated();
static void RegisterMemoryPressureListeners();
@@ -32,12 +32,11 @@
virtual void* Memory() const OVERRIDE;
// Overridden from internal::DiscardableMemoryManagerAllocation:
- virtual bool AllocateAndAcquireLock() OVERRIDE;
+ virtual bool AllocateAndAcquireLock(size_t bytes) OVERRIDE;
virtual void ReleaseLock() OVERRIDE {}
virtual void Purge() OVERRIDE;
private:
- const size_t bytes_;
scoped_ptr<uint8[]> memory_;
bool is_locked_;

Powered by Google App Engine
This is Rietveld 408576698