Decouple BrowserCompositorOutputSurface from BeginFrameSource.

content/browser/compositor/software_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/software_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/output_surface_frame.h"
 #include "cc/output/software_output_device.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "ui/events/latency_info.h"
 #include "ui/gfx/vsync_provider.h"
 
 namespace content {
 
 SoftwareBrowserCompositorOutputSurface::SoftwareBrowserCompositorOutputSurface(
     std::unique_ptr<cc::SoftwareOutputDevice> software_device,
-    const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
-    cc::SyntheticBeginFrameSource* begin_frame_source,
+    const UpdateVSyncParametersCallback& update_vsync_parameters_callback,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : BrowserCompositorOutputSurface(std::move(software_device),
-                                     vsync_manager,
-                                     begin_frame_source),
+                                     update_vsync_parameters_callback),
       task_runner_(std::move(task_runner)),
       weak_factory_(this) {}
 
 SoftwareBrowserCompositorOutputSurface::
     ~SoftwareBrowserCompositorOutputSurface() {
 }
 
 void SoftwareBrowserCompositorOutputSurface::BindToClient(
     cc::OutputSurfaceClient* client) {
   DCHECK(client);
@@ skipping 31 matching lines @@
         ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0, 0, swap_time, 1);
     latency.AddLatencyNumberWithTimestamp(
         ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0,
         swap_time, 1);
   }
   task_runner_->PostTask(FROM_HERE,
                          base::Bind(&RenderWidgetHostImpl::CompositorFrameDrawn,
                                     frame.latency_info));
 
   gfx::VSyncProvider* vsync_provider = software_device()->GetVSyncProvider();
-  if (vsync_provider) {
-    vsync_provider->GetVSyncParameters(base::Bind(
-        &BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu,
-        weak_factory_.GetWeakPtr()));
-  }
+  if (vsync_provider)
+    vsync_provider->GetVSyncParameters(update_vsync_parameters_callback_);
 
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&SoftwareBrowserCompositorOutputSurface::SwapBuffersCallback,
                  weak_factory_.GetWeakPtr()));
 }
 
 void SoftwareBrowserCompositorOutputSurface::SwapBuffersCallback() {
   client_->DidReceiveSwapBuffersAck();
 }
@@ skipping 18 matching lines @@
   return 0;
 }
 
 #if defined(OS_MACOSX)
 void SoftwareBrowserCompositorOutputSurface::SetSurfaceSuspendedForRecycle(
     bool suspended) {
 }
 #endif
 
 }  // namespace content