Unified BeginFrame scheduling

content/browser/compositor/delegated_frame_host.h

Index: content/browser/compositor/delegated_frame_host.h
diff --git a/content/browser/compositor/delegated_frame_host.h b/content/browser/compositor/delegated_frame_host.h
index 493b2b2c75eba24a38971f99df6dce179313fbbe..ee81a96864d158dc865d069b3849eaec4dc95428 100644
--- a/content/browser/compositor/delegated_frame_host.h
+++ b/content/browser/compositor/delegated_frame_host.h
@@ -17,13 +17,13 @@
 #include "content/public/browser/render_process_host.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_observer.h"
-#include "ui/compositor/compositor_vsync_manager.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_owner_delegate.h"
 #include "ui/gfx/rect_conversions.h"
 
 namespace cc {
 class SurfaceFactory;
+struct BeginFrameArgs;
 }
 
 namespace media {
@@ -72,7 +72,6 @@ class CONTENT_EXPORT DelegatedFrameHostClient {
 // the ui::Compositor associated with its DelegatedFrameHostClient.
 class CONTENT_EXPORT DelegatedFrameHost
     : public ui::CompositorObserver,
-      public ui::CompositorVSyncManager::Observer,
       public ui::LayerOwnerDelegate,
       public ImageTransportFactoryObserver,
       public DelegatedFrameEvictorClient,
@@ -112,6 +111,7 @@ class CONTENT_EXPORT DelegatedFrameHost
       scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber);
   void EndFrameSubscription();
   bool HasFrameSubscriber() const { return frame_subscriber_; }
+  void UpdateVSyncParameters(const cc::BeginFrameArgs& args);
 
   // Exposed for tests.
   cc::DelegatedFrameProvider* FrameProviderForTesting() const {
@@ -152,10 +152,6 @@ class CONTENT_EXPORT DelegatedFrameHost
   virtual void OnCompositingLockStateChanged(
       ui::Compositor* compositor) OVERRIDE;
 
-  // Overridden from ui::CompositorVSyncManager::Observer:
-  virtual void OnUpdateVSyncParameters(base::TimeTicks timebase,
-                                       base::TimeDelta interval) OVERRIDE;
-
   // Overridden from ui::LayerOwnerObserver:
   virtual void OnLayerRecreated(ui::Layer* old_layer,
                                 ui::Layer* new_layer) OVERRIDE;
@@ -235,9 +231,6 @@ class CONTENT_EXPORT DelegatedFrameHost
 
   std::vector<base::Closure> on_compositing_did_commit_callbacks_;
 
-  // The vsync manager we are observing for changes, if any.
-  scoped_refptr<ui::CompositorVSyncManager> vsync_manager_;
-
   // The current VSync timebase and interval. These are zero until the first
   // call to OnUpdateVSyncParameters().
   base::TimeTicks vsync_timebase_;