Decouple BrowserCompositorOutputSurface from BeginFrameSource.

content/browser/compositor/gpu_browser_compositor_output_surface.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/output_surface_frame.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/reflector_impl.h"
 #include "content/browser/compositor/reflector_texture.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 
 namespace content {
 
 GpuBrowserCompositorOutputSurface::GpuBrowserCompositorOutputSurface(
     scoped_refptr<ContextProviderCommandBuffer> context,
-    scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
-    cc::SyntheticBeginFrameSource* begin_frame_source,
+    const UpdateVSyncParametersCallback& update_vsync_parameters_callback,
     std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
         overlay_candidate_validator)
     : BrowserCompositorOutputSurface(std::move(context),
-                                     std::move(vsync_manager),
-                                     begin_frame_source,
+                                     update_vsync_parameters_callback,
                                      std::move(overlay_candidate_validator)),
       weak_ptr_factory_(this) {
   if (capabilities_.uses_default_gl_framebuffer) {
     capabilities_.flipped_output_surface =
         context_provider()->ContextCapabilities().flips_vertically;
   }
 }
 
-GpuBrowserCompositorOutputSurface::~GpuBrowserCompositorOutputSurface() =
-    default;
+GpuBrowserCompositorOutputSurface::~GpuBrowserCompositorOutputSurface() {
+  GetCommandBufferProxy()->SetUpdateVSyncParametersCallback(

[danakj, 2016/12/02 22:47:07]

I think this still has value. As it's the one who set up the connection, it
should tear it down.

[stanisc, 2016/12/03 01:02:20]

Done.

+      UpdateVSyncParametersCallback());
+}
 
 void GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(
     const std::vector<ui::LatencyInfo>& latency_info,
     gfx::SwapResult result,
     const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) {
   RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
   client_->DidReceiveSwapBuffersAck();
 }
 
 void GpuBrowserCompositorOutputSurface::OnReflectorChanged() {
   if (!reflector_) {
     reflector_texture_.reset();
   } else {
     reflector_texture_.reset(new ReflectorTexture(context_provider()));
     reflector_->OnSourceTextureMailboxUpdated(reflector_texture_->mailbox());
   }
 }
 
 void GpuBrowserCompositorOutputSurface::BindToClient(
     cc::OutputSurfaceClient* client) {
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
 
   GetCommandBufferProxy()->SetSwapBuffersCompletionCallback(
       base::Bind(&GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted,
                  weak_ptr_factory_.GetWeakPtr()));
-  GetCommandBufferProxy()->SetUpdateVSyncParametersCallback(base::Bind(
-      &GpuBrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu,
-      weak_ptr_factory_.GetWeakPtr()));
+  GetCommandBufferProxy()->SetUpdateVSyncParametersCallback(
+      update_vsync_parameters_callback_);
 }
 
 void GpuBrowserCompositorOutputSurface::EnsureBackbuffer() {}
 
 void GpuBrowserCompositorOutputSurface::DiscardBackbuffer() {
   context_provider()->ContextGL()->DiscardBackbufferCHROMIUM();
 }
 
 void GpuBrowserCompositorOutputSurface::BindFramebuffer() {
   context_provider()->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
@@ skipping 57 matching lines @@
   ContextProviderCommandBuffer* provider_command_buffer =
       static_cast<content::ContextProviderCommandBuffer*>(
           context_provider_.get());
   gpu::CommandBufferProxyImpl* command_buffer_proxy =
       provider_command_buffer->GetCommandBufferProxy();
   DCHECK(command_buffer_proxy);
   return command_buffer_proxy;
 }
 
 }  // namespace content