Unified BeginFrame scheduling

content/browser/compositor/browser_compositor_output_surface.cc

Index: content/browser/compositor/browser_compositor_output_surface.cc
diff --git a/content/browser/compositor/browser_compositor_output_surface.cc b/content/browser/compositor/browser_compositor_output_surface.cc
index b0f826c06161536d61f5be6de65b9746c6df5d83..a7d02d67d4c99b5719ffca98ccd011e5c5947ee3 100644
--- a/content/browser/compositor/browser_compositor_output_surface.cc
+++ b/content/browser/compositor/browser_compositor_output_surface.cc
@@ -15,24 +15,20 @@ namespace content {
 BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
     const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
     int surface_id,
-    IDMap<BrowserCompositorOutputSurface>* output_surface_map,
-    const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
+    IDMap<BrowserCompositorOutputSurface>* output_surface_map)
     : OutputSurface(context_provider),
       surface_id_(surface_id),
-      output_surface_map_(output_surface_map),
-      vsync_manager_(vsync_manager) {
+      output_surface_map_(output_surface_map) {
   Initialize();
 }
 
 BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
     scoped_ptr<cc::SoftwareOutputDevice> software_device,
     int surface_id,
-    IDMap<BrowserCompositorOutputSurface>* output_surface_map,
-    const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
+    IDMap<BrowserCompositorOutputSurface>* output_surface_map)
     : OutputSurface(software_device.Pass()),
       surface_id_(surface_id),
-      output_surface_map_(output_surface_map),
-      vsync_manager_(vsync_manager) {
+      output_surface_map_(output_surface_map) {
   Initialize();
 }
 
@@ -44,7 +40,6 @@ BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() {
   if (!HasClient())
     return;
   output_surface_map_->Remove(surface_id_);
-  vsync_manager_->RemoveObserver(this);
 }
 
 void BrowserCompositorOutputSurface::Initialize() {
@@ -64,7 +59,6 @@ bool BrowserCompositorOutputSurface::BindToClient(
   output_surface_map_->AddWithID(this, surface_id_);
   if (reflector_)
     reflector_->OnSourceSurfaceReady(this);
-  vsync_manager_->AddObserver(this);
   return true;
 }
 
@@ -76,20 +70,12 @@ void BrowserCompositorOutputSurface::OnSwapBuffersComplete() {
 #endif
 }
 
-void BrowserCompositorOutputSurface::OnUpdateVSyncParameters(
-    base::TimeTicks timebase,
-    base::TimeDelta interval) {
-  DCHECK(CalledOnValidThread());
-  DCHECK(HasClient());
-  CommitVSyncParameters(timebase, interval);
-}
-
 void BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   DCHECK(CalledOnValidThread());
   DCHECK(HasClient());
-  vsync_manager_->UpdateVSyncParameters(timebase, interval);
+  CommitVSyncParameters(timebase, interval);
 }
 
 void BrowserCompositorOutputSurface::SetReflector(ReflectorImpl* reflector) {