Unified BeginFrame scheduling

content/browser/compositor/delegated_frame_host.cc

Index: content/browser/compositor/delegated_frame_host.cc
diff --git a/content/browser/compositor/delegated_frame_host.cc b/content/browser/compositor/delegated_frame_host.cc
index f943dd2ded246a9a5493b894aab2a602a4c15656..0b2e2fcd877f0207ae7f4fc1217004128e5aa3bf 100644
--- a/content/browser/compositor/delegated_frame_host.cc
+++ b/content/browser/compositor/delegated_frame_host.cc
@@ -6,6 +6,7 @@
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
+#include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/copy_output_request.h"
@@ -830,6 +831,11 @@ void DelegatedFrameHost::CopyFromCompositingSurfaceHasResultForVideo(
                                      finished_callback);
 }
 
+void DelegatedFrameHost::UpdateVSyncParameters(const cc::BeginFrameArgs& args) {
+  vsync_timebase_ = args.frame_time;
+  vsync_interval_ = args.interval;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // DelegatedFrameHost, ui::CompositorObserver implementation:
 
@@ -874,16 +880,6 @@ void DelegatedFrameHost::OnCompositingLockStateChanged(
   }
 }
 
-void DelegatedFrameHost::OnUpdateVSyncParameters(
-    base::TimeTicks timebase,
-    base::TimeDelta interval) {
-  vsync_timebase_ = timebase;
-  vsync_interval_ = interval;
-  RenderWidgetHostImpl* host = client_->GetHost();
-  if (client_->IsVisible())
-    host->UpdateVSyncParameters(timebase, interval);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, ImageTransportFactoryObserver implementation:
 
@@ -907,8 +903,6 @@ DelegatedFrameHost::~DelegatedFrameHost() {
     surface_factory_->Destroy(surface_id_);
   if (resource_collection_.get())
     resource_collection_->SetClient(NULL);
-
-  DCHECK(!vsync_manager_.get());
 }
 
 void DelegatedFrameHost::RunOnCommitCallbacks() {
@@ -933,12 +927,6 @@ void DelegatedFrameHost::AddOnCommitCallbackAndDisableLocks(
 }
 
 void DelegatedFrameHost::AddedToWindow() {
-  ui::Compositor* compositor = client_->GetCompositor();
-  if (compositor) {
-    DCHECK(!vsync_manager_.get());
-    vsync_manager_ = compositor->vsync_manager();
-    vsync_manager_->AddObserver(this);
-  }
 }
 
 void DelegatedFrameHost::RemovingFromWindow() {
@@ -948,11 +936,6 @@ void DelegatedFrameHost::RemovingFromWindow() {
   ui::Compositor* compositor = client_->GetCompositor();
   if (compositor && compositor->HasObserver(this))
     compositor->RemoveObserver(this);
-
-  if (vsync_manager_.get()) {
-    vsync_manager_->RemoveObserver(this);
-    vsync_manager_ = NULL;
-  }
 }
 
 void DelegatedFrameHost::LockResources() {