content/renderer/android/synchronous_compositor_filter.cc - Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr

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/renderer/android/synchronous_compositor_filter.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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 | « content/renderer/android/synchronous_compositor_filter.h ('k') | content/renderer/android/synchronous_compositor_output_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/android/synchronous_compositor_filter.cc

diff --git a/content/renderer/android/synchronous_compositor_filter.cc b/content/renderer/android/synchronous_compositor_filter.cc

index ae42cc31d455758251ef66fc2509af7fa1b7eaf3..94e800bfa089d8513864b41aa60898939987b6fe 100644

--- a/content/renderer/android/synchronous_compositor_filter.cc

+++ b/content/renderer/android/synchronous_compositor_filter.cc

@@ -186,9 +186,10 @@ void SynchronousCompositorFilter::CheckIsReady(int routing_id) {

Entry& entry = entry_map_[routing_id];

if (filter_ready_ && entry.IsReady()) {

DCHECK(!sync_compositor_map_.contains(routing_id));

- scoped_ptr<SynchronousCompositorProxy> proxy(new SynchronousCompositorProxy(

- routing_id, this, entry.begin_frame_source,

- entry.synchronous_input_handler_proxy, &input_handler_));

+ std::unique_ptr<SynchronousCompositorProxy> proxy(

+ new SynchronousCompositorProxy(

+ routing_id, this, entry.begin_frame_source,

+ entry.synchronous_input_handler_proxy, &input_handler_));

if (entry.output_surface)

proxy->SetOutputSurface(entry.output_surface);

sync_compositor_map_.add(routing_id, std::move(proxy));