content/browser/compositor/gpu_process_transport_factory.cc - Issue 663563002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

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/browser/compositor/gpu_process_transport_factory.cc

Issue 663563002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/browser/android/java/gin_java_bridge_dispatcher_host.cc ('k') | content/browser/download/download_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/gpu_process_transport_factory.cc

diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc

index c286b6f2bf93cb3eabfe9ac6644915f81d2e5535..b917df657a0b7699406d25a7fa8b1b837d91f55d 100644

--- a/content/browser/compositor/gpu_process_transport_factory.cc

+++ b/content/browser/compositor/gpu_process_transport_factory.cc

@@ -207,7 +207,7 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface(

display_client->set_surface_output_surface(output_surface.get());

output_surface->set_display_client(display_client.get());

data->display_client = display_client.Pass();

- return output_surface.PassAs<cc::OutputSurface>();

+ return output_surface.Pass();

}

if (!context_provider.get()) {

@@ -216,14 +216,12 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface(

" compositing with browser threaded compositing. Aborting.";

}

- scoped_ptr<SoftwareBrowserCompositorOutputSurface> surface(

- new SoftwareBrowserCompositorOutputSurface(

- output_surface_proxy_,

- CreateSoftwareOutputDevice(compositor),

- per_compositor_data_[compositor]->surface_id,

- &output_surface_map_,

- compositor->vsync_manager()));

- return surface.PassAs<cc::OutputSurface>();

+ return make_scoped_ptr(new SoftwareBrowserCompositorOutputSurface(

+ output_surface_proxy_,

+ CreateSoftwareOutputDevice(compositor),

+ per_compositor_data_[compositor]->surface_id,

+ &output_surface_map_,

+ compositor->vsync_manager()));

}

scoped_ptr<BrowserCompositorOutputSurface> surface;

@@ -249,7 +247,7 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface(

if (data->reflector.get())

data->reflector->ReattachToOutputSurfaceFromMainThread(surface.get());

- return surface.PassAs<cc::OutputSurface>();

+ return surface.Pass();

}

scoped_refptr<ui::Reflector> GpuProcessTransportFactory::CreateReflector(