Unified BeginFrame scheduling

cc/trees/single_thread_proxy.cc

Index: cc/trees/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index fe9c34f8e7b26a7d93d8524febcbf7e00736afc4..272f35a079463276ccfba140865d49eb10f84d37 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -25,7 +25,9 @@ scoped_ptr<Proxy> SingleThreadProxy::Create(
     LayerTreeHostSingleThreadClient* client,
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner) {
   return make_scoped_ptr(
-             new SingleThreadProxy(layer_tree_host, client, main_task_runner))
+             new SingleThreadProxy(layer_tree_host,
+                                   client,
+                                   main_task_runner))
       .PassAs<Proxy>();
 }
 
@@ -428,7 +430,7 @@ void SingleThreadProxy::DidSwapBuffersCompleteOnImplThread() {
 void SingleThreadProxy::BeginFrame(const BeginFrameArgs& args) {
   TRACE_EVENT0("cc", "SingleThreadProxy::BeginFrame");
   if (scheduler_on_impl_thread_)
-    scheduler_on_impl_thread_->BeginImplFrame(args);
+    scheduler_on_impl_thread_->BeginFrame(args);
 }
 
 void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
@@ -550,6 +552,15 @@ void SingleThreadProxy::DidCommitAndDrawFrame() {
   }
 }
 
+void SingleThreadProxy::SetAuthoritativeVSyncInterval(
+    base::TimeDelta interval) {
+  scheduler_on_impl_thread_->SetAuthoritativeVSyncInterval(interval);
+}
+
+void SingleThreadProxy::SetChildrenNeedBeginFrames(bool need_begin_frame) {
+  scheduler_on_impl_thread_->SetChildrenNeedBeginFrames(need_begin_frame);
+}
+
 bool SingleThreadProxy::CommitPendingForTesting() { return false; }
 
 void SingleThreadProxy::SetNeedsBeginFrame(bool enable) {
@@ -665,4 +676,8 @@ void SingleThreadProxy::DidBeginImplFrameDeadline() {
   layer_tree_host_impl_->ResetCurrentFrameTimeForNextFrame();
 }
 
+void SingleThreadProxy::SendBeginFrameToChildren(const BeginFrameArgs& args) {
+  layer_tree_host_->SendBeginFrameToChildren(args);
+}
+
 }  // namespace cc