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 35db2b9ab7d4256aaecd8c0ca7e2ed415c4340b6..cb1dc6e0f972260bda4257e64fee495e0c0449ee 100644 |
--- a/content/browser/compositor/gpu_process_transport_factory.cc |
+++ b/content/browser/compositor/gpu_process_transport_factory.cc |
@@ -263,6 +263,11 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
} |
} |
+ scoped_refptr<ContextProviderCommandBuffer> worker_context_provider( |
+ ContextProviderCommandBuffer::Create( |
+ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext(), |
+ BROWSER_WORKER_CONTEXT)); |
+ |
scoped_ptr<BrowserCompositorOutputSurface> surface; |
if (!create_gpu_output_surface) { |
surface = make_scoped_ptr(new SoftwareBrowserCompositorOutputSurface( |
@@ -281,14 +286,16 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
->CanShowPrimaryPlaneAsOverlay()) { |
surface = |
make_scoped_ptr(new GpuSurfacelessBrowserCompositorOutputSurface( |
- context_provider, data->surface_id, compositor->vsync_manager(), |
+ context_provider, worker_context_provider, data->surface_id, |
+ compositor->vsync_manager(), |
CreateOverlayCandidateValidator(compositor->widget()), GL_RGB, |
BrowserGpuMemoryBufferManager::current())); |
} else |
#endif |
{ |
surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface( |
- context_provider, compositor->vsync_manager(), |
+ context_provider, worker_context_provider, |
+ compositor->vsync_manager(), |
CreateOverlayCandidateValidator(compositor->widget()))); |
} |
} |
@@ -318,7 +325,8 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
scoped_ptr<cc::SurfaceDisplayOutputSurface> output_surface( |
new cc::SurfaceDisplayOutputSurface( |
- manager, compositor->surface_id_allocator(), context_provider)); |
+ manager, compositor->surface_id_allocator(), context_provider, |
+ worker_context_provider)); |
display_client->set_surface_output_surface(output_surface.get()); |
output_surface->set_display_client(display_client.get()); |
display_client->display()->Resize(compositor->size()); |