base/memory/discardable_memory_emulated.h - Issue 204733003: base: Refactor DiscardableMemoryManager for use with different type of allocations.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/memory/discardable_memory_emulated.h

Issue 204733003: base: Refactor DiscardableMemoryManager for use with different type of allocations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add missing unlock call and remove unnecessary unlock call Created 6 years, 9 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

« base/memory/discardable_memory_allocation.h ('K') | « base/memory/discardable_memory_allocation.h ('k') | base/memory/discardable_memory_emulated.cc » ('j') | base/memory/discardable_memory_emulated.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/memory/discardable_memory_emulated.h

diff --git a/base/memory/discardable_memory_emulated.h b/base/memory/discardable_memory_emulated.h

index 20144ff25f016a50c5810892f3be265b542fc165..34c0a0167c4ac1df3b13a501d69bd25dd555c1c6 100644

--- a/base/memory/discardable_memory_emulated.h

+++ b/base/memory/discardable_memory_emulated.h

@@ -7,6 +7,8 @@

#include "base/memory/discardable_memory.h"

+#include "base/memory/discardable_memory_manager.h"

namespace base {

namespace internal {

@@ -28,8 +30,8 @@ class DiscardableMemoryEmulated : public DiscardableMemory {

virtual void* Memory() const OVERRIDE;

private:

- scoped_ptr<uint8, FreeDeleter> memory_;

- bool is_locked_;

+ DiscardableMemoryManager::AllocationId allocation_id_;

+ void* memory_;

DISALLOW_COPY_AND_ASSIGN(DiscardableMemoryEmulated);

};