content/renderer/android/synchronous_compositor_output_surface.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_output_surface.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_output_surface.h ('k') | content/renderer/android/synchronous_compositor_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/android/synchronous_compositor_output_surface.cc

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

index 567de401f87f1ad8b46973072be81ab23979fcad..9a9660f5ad95991cef2ee6d86ea0f3fd17948ec3 100644

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

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

@@ -70,7 +70,7 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(

: cc::OutputSurface(

context_provider,

worker_context_provider,

- scoped_ptr<cc::SoftwareOutputDevice>(new SoftwareDevice(this))),

+ std::unique_ptr<cc::SoftwareOutputDevice>(new SoftwareDevice(this))),

routing_id_(routing_id),

output_surface_id_(output_surface_id),

registry_(registry),

@@ -259,9 +259,9 @@ void SynchronousCompositorOutputSurface::SetTreeActivationCallback(

}

void SynchronousCompositorOutputSurface::GetMessagesToDeliver(

- std::vector<scoped_ptr<IPC::Message>>* messages) {

+ std::vector<std::unique_ptr<IPC::Message>>* messages) {

DCHECK(CalledOnValidThread());

- scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =

+ std::unique_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =

frame_swap_message_queue_->AcquireSendMessageScope();

frame_swap_message_queue_->DrainMessages(messages);

}