content/child/child_discardable_shared_memory_manager.cc - Issue 1094433002: base: Rename DiscardableMemory::Memory() to ::data().

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: content/child/child_discardable_shared_memory_manager.cc

Issue 1094433002: base: Rename DiscardableMemory::Memory() to ::data(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « base/test/test_discardable_memory_allocator.cc ('k') | content/child/child_discardable_shared_memory_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/child_discardable_shared_memory_manager.cc

diff --git a/content/child/child_discardable_shared_memory_manager.cc b/content/child/child_discardable_shared_memory_manager.cc

index 73b4cb167a80ec5613c247c71d88ffd564ad51e3..961733170d578d2a5e23057504a4f822be513589 100644

--- a/content/child/child_discardable_shared_memory_manager.cc

+++ b/content/child/child_discardable_shared_memory_manager.cc

@@ -59,7 +59,7 @@ class DiscardableMemoryImpl : public base::DiscardableMemory {

manager_->UnlockSpan(span_.get());

is_locked_ = false;

}

- void* Memory() const override {

+ void* data() const override {

DCHECK(is_locked_);

return reinterpret_cast<void*>(span_->start() * base::GetPageSize());

}