| 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 eb8a14234b2397409326c32545034ec7b0619c1d..6c18abd5658a88aeab470101c313aee1e0722c81 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.cc
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc
|
| @@ -477,13 +477,11 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
|
|
|
| std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source;
|
| if (!compositor->GetRendererSettings().disable_display_vsync) {
|
| - begin_frame_source.reset(new cc::DelayBasedBeginFrameSource(
|
| - base::MakeUnique<cc::DelayBasedTimeSource>(
|
| - compositor->task_runner().get())));
|
| + begin_frame_source.reset(
|
| + new cc::DelayBasedBeginFrameSource(compositor->task_runner().get()));
|
| } else {
|
| - begin_frame_source.reset(new cc::BackToBackBeginFrameSource(
|
| - base::MakeUnique<cc::DelayBasedTimeSource>(
|
| - compositor->task_runner().get())));
|
| + begin_frame_source.reset(
|
| + new cc::BackToBackBeginFrameSource(compositor->task_runner().get()));
|
| }
|
|
|
| std::unique_ptr<BrowserCompositorOutputSurface> display_output_surface;
|
| @@ -665,7 +663,9 @@ void GpuProcessTransportFactory::RemoveCompositor(ui::Compositor* compositor) {
|
| #endif
|
| }
|
|
|
| -bool GpuProcessTransportFactory::DoesCreateTestContexts() { return false; }
|
| +bool GpuProcessTransportFactory::DoesCreateTestContexts() {
|
| + return false;
|
| +}
|
|
|
| uint32_t GpuProcessTransportFactory::GetImageTextureTarget(
|
| gfx::BufferFormat format,
|
| @@ -873,7 +873,7 @@ void GpuProcessTransportFactory::OnLostMainThreadSharedContext() {
|
| // the same share group.
|
| scoped_refptr<cc::ContextProvider> lost_shared_main_thread_contexts =
|
| shared_main_thread_contexts_;
|
| - shared_main_thread_contexts_ = NULL;
|
| + shared_main_thread_contexts_ = NULL;
|
|
|
| std::unique_ptr<display_compositor::GLHelper> lost_gl_helper =
|
| std::move(gl_helper_);
|
| @@ -883,7 +883,7 @@ void GpuProcessTransportFactory::OnLostMainThreadSharedContext() {
|
|
|
| // Kill things that use the shared context before killing the shared context.
|
| lost_gl_helper.reset();
|
| - lost_shared_main_thread_contexts = NULL;
|
| + lost_shared_main_thread_contexts = NULL;
|
| }
|
|
|
| scoped_refptr<cc::VulkanInProcessContextProvider>
|
|
|