Enable BeginFrame scheduling on aura

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 a3b43855b503ebd63b804d4971e6ec1b8085ed4b..491f63126d7ecfdba166aa44b8c0ab22077e461c 100644
--- a/content/browser/compositor/delegated_frame_host.h
+++ b/content/browser/compositor/delegated_frame_host.h
@@ -18,7 +18,6 @@
 #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/geometry/rect_conversions.h"
@@ -61,10 +60,6 @@ class CONTENT_EXPORT DelegatedFrameHostClient {
       int output_surface_id,
       const cc::CompositorFrameAck& ack) = 0;
   virtual void DelegatedFrameHostOnLostCompositorResources() = 0;
-
-  virtual void DelegatedFrameHostUpdateVSyncParameters(
-      const base::TimeTicks& timebase,
-      const base::TimeDelta& interval) = 0;
 };
 
 // The DelegatedFrameHost is used to host all of the RenderWidgetHostView state
@@ -73,7 +68,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,
@@ -99,6 +93,7 @@ class CONTENT_EXPORT DelegatedFrameHost
   gfx::Size GetRequestedRendererSize() const;
   void SetCompositor(ui::Compositor* compositor);
   void ResetCompositor();
+  void SetVSyncParameters(base::TimeTicks timebase, base::TimeDelta interval);

[brianderson, 2015/03/25 20:25:54]

Can we keep this UpdateVSyncParameters to keep it consistent with the rest of
the code and rename it everywhere as a separate patch all at once?

[danakj, 2015/03/25 20:31:19]

What other places are you thinking of? Update sounds like it's doing work, but
this is a simple setter. Maybe other places do things with these parameters?

   void CopyFromCompositingSurface(const gfx::Rect& src_subrect,
                                   const gfx::Size& output_size,
                                   ReadbackRequestCallback& callback,
@@ -158,10 +153,6 @@ class CONTENT_EXPORT DelegatedFrameHost
   void OnCompositingLockStateChanged(ui::Compositor* compositor) override;
   void OnCompositingShuttingDown(ui::Compositor* compositor) override;
 
-  // Overridden from ui::CompositorVSyncManager::Observer:
-  void OnUpdateVSyncParameters(base::TimeTicks timebase,
-                               base::TimeDelta interval) override;
-
   // Overridden from ui::LayerOwnerObserver:
   void OnLayerRecreated(ui::Layer* old_layer, ui::Layer* new_layer) override;
 
@@ -247,11 +238,8 @@ 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().
+  // call to UpdateVSyncParameters().
   base::TimeTicks vsync_timebase_;
   base::TimeDelta vsync_interval_;