content/browser/compositor/gpu_process_transport_factory.cc - Issue 889063002: (not for commit) Create 2nd ContextProvider for Ganesh rasterization.

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 889063002: (not for commit) Create 2nd ContextProvider for Ganesh rasterization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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/compositor/gpu_browser_compositor_output_surface.cc ('k') | content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h » ('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 c7c867e6001ea62b0ae91752c2b9e3171a601b98..25a53ebcd7a7ae455c8881928726fccd335247fd 100644

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

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

@@ -223,9 +223,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(

compositor->vsync_manager()));

} else {

display_surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface(

- context_provider,

- data->surface_id,

- &output_surface_map_,

+ context_provider, NULL, data->surface_id, &output_surface_map_,

compositor->vsync_manager(),

CreateOverlayCandidateValidator(compositor->widget())));

}

@@ -234,8 +232,9 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(

compositor->task_runner()));

scoped_ptr<SurfaceDisplayOutputSurface> output_surface(

- new SurfaceDisplayOutputSurface(

- manager, compositor->surface_id_allocator(), context_provider));

+ new SurfaceDisplayOutputSurface(manager,

+ compositor->surface_id_allocator(),

+ context_provider, NULL));

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

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

display_client->display()->Resize(compositor->size());

@@ -274,9 +273,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(

#endif

if (!surface)