| 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 330aaa847d223f356bacfdaf755e2af49390d1f8..151ba009b06a47e5803aad4baa342618a7672dd1 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.cc
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc
|
| @@ -280,12 +280,13 @@
|
| scoped_ptr<BrowserCompositorOutputSurface> surface;
|
| if (!create_gpu_output_surface) {
|
| surface = make_scoped_ptr(new SoftwareBrowserCompositorOutputSurface(
|
| - CreateSoftwareOutputDevice(compositor.get())));
|
| + CreateSoftwareOutputDevice(compositor.get()),
|
| + compositor->vsync_manager()));
|
| } else {
|
| DCHECK(context_provider);
|
| if (!data->surface_id) {
|
| surface = make_scoped_ptr(new OffscreenBrowserCompositorOutputSurface(
|
| - context_provider,
|
| + context_provider, compositor->vsync_manager(),
|
| scoped_ptr<BrowserCompositorOverlayCandidateValidator>()));
|
| } else
|
| #if defined(USE_OZONE)
|
| @@ -293,14 +294,14 @@
|
| ->CanShowPrimaryPlaneAsOverlay()) {
|
| surface =
|
| make_scoped_ptr(new GpuSurfacelessBrowserCompositorOutputSurface(
|
| - context_provider, data->surface_id,
|
| + 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,
|
| + context_provider, compositor->vsync_manager(),
|
| CreateOverlayCandidateValidator(compositor->widget())));
|
| }
|
| }
|
|
|