base/memory/discardable_memory_shmem.h - Issue 1001833005: Update from https://crrev.com/320343

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_shmem.h

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Supress Created 5 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:

Index: base/memory/discardable_memory_shmem.h

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

index 98d3b97a204a4fe11ec0933aee7e5e877c1de2a9..f3945626a9270e8729ebbb16bd66acc9363b5c0c 100644

--- a/base/memory/discardable_memory_shmem.h

+++ b/base/memory/discardable_memory_shmem.h

@@ -20,12 +20,11 @@ class DiscardableMemoryShmem : public DiscardableMemory {

bool Initialize();

// Overridden from DiscardableMemory:

- DiscardableMemoryLockStatus Lock() override;

+ bool Lock() override;

void Unlock() override;

void* Memory() const override;

private:

- const size_t bytes_;

scoped_ptr<DiscardableMemoryShmemChunk> chunk_;

bool is_locked_;