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 478b0cb425e400dbc1bee559cec349c7d2dc0052..cba93eae90358792d1681d3eaca54ce703e0ea05 100644 |
--- a/content/browser/compositor/gpu_process_transport_factory.cc |
+++ b/content/browser/compositor/gpu_process_transport_factory.cc |
@@ -187,15 +187,7 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface( |
output_surface_proxy_, |
CreateSoftwareOutputDevice(compositor), |
per_compositor_data_[compositor]->surface_id, |
- &output_surface_map_, |
- compositor->vsync_manager())); |
- } else { |
- display_surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface( |
- context_provider, |
- per_compositor_data_[compositor]->surface_id, |
- &output_surface_map_, |
- compositor->vsync_manager(), |
- CreateOverlayCandidateValidator(compositor->widget()))); |
+ &output_surface_map_)); |
} |
scoped_ptr<OnscreenDisplayClient> display_client(new OnscreenDisplayClient( |
display_surface.Pass(), manager, compositor->task_runner())); |
@@ -227,8 +219,7 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface( |
output_surface_proxy_, |
CreateSoftwareOutputDevice(compositor), |
per_compositor_data_[compositor]->surface_id, |
- &output_surface_map_, |
- compositor->vsync_manager())); |
+ &output_surface_map_)); |
return surface.PassAs<cc::OutputSurface>(); |
} |
@@ -239,7 +230,6 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface( |
context_provider, |
per_compositor_data_[compositor]->surface_id, |
&output_surface_map_, |
- compositor->vsync_manager(), |
CreateOverlayCandidateValidator(compositor->widget()), |
GL_RGB8_OES)); |
} |
@@ -249,7 +239,6 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface( |
context_provider, |
per_compositor_data_[compositor]->surface_id, |
&output_surface_map_, |
- compositor->vsync_manager(), |
CreateOverlayCandidateValidator(compositor->widget()))); |
if (data->reflector.get()) |