Unified BeginFrame scheduling

content/browser/renderer_host/render_widget_host_view_mac.h

Index: content/browser/renderer_host/render_widget_host_view_mac.h
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 16368ff58b4cdc0aaaa2251a4bc6e8636ff3b102..97a4967f9c8a04a6d3a9206fc4a2046697846bb1 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -17,6 +17,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
+#include "cc/scheduler/begin_frame_manager.h"
 #include "content/browser/compositor/browser_compositor_view_mac.h"
 #include "content/browser/compositor/delegated_frame_host.h"
 #include "content/browser/renderer_host/compositing_iosurface_layer_mac.h"
@@ -221,7 +222,9 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
       public IPC::Sender,
       public SoftwareFrameManagerClient,
       public CompositingIOSurfaceLayerClient,
-      public gfx::DisplayObserver {
+      public gfx::DisplayObserver,
+      public cc::BeginFrameManager::Observer,
+      public DisplayLinkMac::Observer {
  public:
   // The view will associate itself with the given widget. The native view must
   // be hooked up immediately to the view hierarchy, or else when it is
@@ -359,6 +362,13 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   virtual void OnDisplayMetricsChanged(const gfx::Display& display,
                                        uint32_t metrics) OVERRIDE;
 
+  // cc::BeginFrameManager::Observer implementation.
+  virtual void OnSendBeginFrame(const cc::BeginFrameArgs& args) OVERRIDE;
+
+  // DisplayLinkMac::Observer implementation.
+  virtual void OnVSync(base::TimeTicks timebase,
+                       base::TimDelta interval) OVERRIDE;
+
   // Forwards the mouse event to the renderer.
   void ForwardMouseEvent(const blink::WebMouseEvent& event);
 
@@ -585,6 +595,9 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   // Send updated vsync parameters to the renderer.
   void SendVSyncParametersToRenderer();
 
+  // Called when RenderWidget want to get BeginFrame message.
+  void OnSetNeedsBeginFrame(bool enabled);
+
   // The associated view. This is weak and is inserted into the view hierarchy
   // to own this RenderWidgetHostViewMac object. Set to nil at the start of the
   // destructor.
@@ -632,6 +645,17 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   // Subscriber that listens to frame presentation events.
   scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
 
+  // True when corresponding RenderWidget needs BeginFrame.
+  bool needs_begin_frame_;
+
+  // True when --enable-begin-frame-scheduling is used.
+  bool begin_frame_scheduling_is_enabled_;
+
+  // Pass |last_begin_frame_args_| to BeginFrameManager when |this| is added
+  // as its observer. With this, BeginFrameManager can determine whether latest
+  // BeginFrameArgs is used immediately or not.
+  cc::BeginFrameArgs last_begin_frame_args_;
+
   base::WeakPtrFactory<RenderWidgetHostViewMac>
       software_frame_weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);