Unified BeginFrame scheduling

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index a59880e6a98cec1506666c278943ce2fdaa17069..ed2ae2e178e188e4e5c10b2ce12b3b68a38df6ff 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -17,7 +17,6 @@
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/resources/texture_mailbox.h"
-#include "cc/trees/layer_tree_settings.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 #include "content/browser/frame_host/frame_tree.h"
@@ -61,7 +60,6 @@
 #include "ui/base/hit_test.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ui_base_types.h"
-#include "ui/compositor/compositor_vsync_manager.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
@@ -452,6 +450,8 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host)
 #endif
       has_snapped_to_boundary_(false),
       touch_editing_client_(NULL),
+      needs_begin_frame_(false),
+      begin_frame_scheduling_is_enabled_(false),
       weak_ptr_factory_(this) {
   host_->SetView(this);
   window_observer_.reset(new WindowObserver(this));
@@ -465,11 +465,24 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host)
   bool overscroll_enabled = base::CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0";
   SetOverscrollControllerEnabled(overscroll_enabled);
+
+#if !defined(OS_CHROMEOS)
+  begin_frame_scheduling_is_enabled_ = true;
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, RenderWidgetHostView implementation:
 
+bool RenderWidgetHostViewAura::OnMessageReceived(const IPC::Message& msg) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAura, msg)
+  IPC_MESSAGE_HANDLER(ViewHostMsg_SetNeedsBeginFrame, OnSetNeedsBeginFrame)
+  IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
 void RenderWidgetHostViewAura::InitAsChild(
     gfx::NativeView parent_view) {
   window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
@@ -872,6 +885,14 @@ void RenderWidgetHostViewAura::Destroy() {
   // Beware, this function is not called on all destruction paths. It will
   // implicitly end up calling ~RenderWidgetHostViewAura though, so all
   // destruction/cleanup code should happen there, not here.
+
+  // Remove observation from Compositor in here because we can't access
+  // to compositor in destructor.
+  if (needs_begin_frame_ && GetCompositor()) {
+    GetCompositor()->RemoveBeginFrameObserver(this);
+    needs_begin_frame_ = false;
+  }
+
   in_shutdown_ = true;
   delete window_;
 }
@@ -2127,9 +2148,30 @@ void RenderWidgetHostViewAura::OnHostMoved(const aura::WindowTreeHost* host,
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// ui::CompositorBeginFrameObserver implementation:
+void RenderWidgetHostViewAura::OnSendBeginFrame(
+    const cc::BeginFrameArgs& args) {
+  DCHECK(begin_frame_scheduling_is_enabled_);
+  DCHECK(host_);
+  TRACE_EVENT0("cc", "RenderWidgetHostViewAura::OnSendBeginFrame");
+
+  delegated_frame_host_->UpdateVSyncParameters(args);
+
+  host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args));
+
+  last_begin_frame_args_ = args;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, private:
 
 RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
+  // When we are using unified BeginFrame(--enable-begin-frame-scheduling),
+  // |needs_begin_frame_| always be false in here. We can't remove
+  // observation from Compositor in this function because |window_| is already
+  // removed from window tree host.
+  DCHECK(!needs_begin_frame_);
+
   if (touch_editing_client_)
     touch_editing_client_->OnViewDestroyed();
 
@@ -2394,6 +2436,13 @@ void RenderWidgetHostViewAura::AddedToRootWindow() {
 #endif
 
   delegated_frame_host_->AddedToWindow();
+
+  // When this RWHV is added to new root window, this RWHV should be added to
+  // the new compositor.
+  if (needs_begin_frame_) {
+    DCHECK(begin_frame_scheduling_is_enabled_);
+    GetCompositor()->AddBeginFrameObserver(this, last_begin_frame_args_);
+  }
 }
 
 void RenderWidgetHostViewAura::RemovingFromRootWindow() {
@@ -2413,6 +2462,13 @@ void RenderWidgetHostViewAura::RemovingFromRootWindow() {
   if (legacy_render_widget_host_HWND_)
     legacy_render_widget_host_HWND_->UpdateParent(::GetDesktopWindow());
 #endif
+
+  // When this RWHV is removed from current root window, this RWHV should be
+  // removed from the current compositor which will be removed.
+  if (needs_begin_frame_) {
+    DCHECK(begin_frame_scheduling_is_enabled_);
+    GetCompositor()->RemoveBeginFrameObserver(this);
+  }
 }
 
 void RenderWidgetHostViewAura::DetachFromInputMethod() {
@@ -2454,6 +2510,25 @@ SkColorType RenderWidgetHostViewAura::PreferredReadbackFormat() {
   return kN32_SkColorType;
 }
 
+void RenderWidgetHostViewAura::OnSetNeedsBeginFrame(bool enabled) {
+  DCHECK(begin_frame_scheduling_is_enabled_);
+  DCHECK(GetCompositor());
+
+  if (needs_begin_frame_ == enabled)
+    return;
+
+  TRACE_EVENT1("cc",
+               "RenderWidgetHostViewAura::OnSetNeedsBeginFrame",
+               "enabled",
+               enabled);
+  if (enabled)
+    GetCompositor()->AddBeginFrameObserver(this, last_begin_frame_args_);
+  else
+    GetCompositor()->RemoveBeginFrameObserver(this);
+
+  needs_begin_frame_ = enabled;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // DelegatedFrameHost, public: