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 4cb2547a6f6b95125186a39b021e3bd8a67c8755..1689355514a2b3693e930a9355ae719afed0eafb 100644 |
--- a/content/browser/compositor/gpu_process_transport_factory.cc |
+++ b/content/browser/compositor/gpu_process_transport_factory.cc |
@@ -329,7 +329,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
if (!create_gpu_output_surface) { |
surface = make_scoped_ptr(new SoftwareBrowserCompositorOutputSurface( |
CreateSoftwareOutputDevice(compositor.get()), |
- compositor->vsync_manager())); |
+ compositor->vsync_manager(), compositor->task_runner().get())); |
} else { |
DCHECK(context_provider); |
ContextProvider::Capabilities capabilities = |
@@ -337,7 +337,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
if (!data->surface_id) { |
surface = make_scoped_ptr(new OffscreenBrowserCompositorOutputSurface( |
context_provider, shared_worker_context_provider_, |
- compositor->vsync_manager(), |
+ compositor->vsync_manager(), compositor->task_runner().get(), |
scoped_ptr<BrowserCompositorOverlayCandidateValidator>())); |
} else if (capabilities.gpu.surfaceless) { |
GLenum target = GL_TEXTURE_2D; |
@@ -350,6 +350,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
make_scoped_ptr(new GpuSurfacelessBrowserCompositorOutputSurface( |
context_provider, shared_worker_context_provider_, |
data->surface_id, compositor->vsync_manager(), |
+ compositor->task_runner().get(), |
CreateOverlayCandidateValidator(compositor->widget()), target, |
format, BrowserGpuMemoryBufferManager::current())); |
} else { |
@@ -360,7 +361,8 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
#endif |
surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface( |
context_provider, shared_worker_context_provider_, |
- compositor->vsync_manager(), std::move(validator))); |
+ compositor->vsync_manager(), compositor->task_runner().get(), |
+ std::move(validator))); |
} |
} |
@@ -385,7 +387,8 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
new cc::OnscreenDisplayClient( |
std::move(surface), manager, HostSharedBitmapManager::current(), |
BrowserGpuMemoryBufferManager::current(), |
- compositor->GetRendererSettings(), compositor->task_runner())); |
+ compositor->GetRendererSettings(), compositor->task_runner(), |
+ compositor->surface_id_allocator()->id_namespace())); |
scoped_ptr<cc::SurfaceDisplayOutputSurface> output_surface( |
new cc::SurfaceDisplayOutputSurface( |