Plumb activation time to main

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 07b5afa607a72b95240466e413a98e6d880c3ae8..0d3ebd0194272191fd192afd9296e3434bd010af 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -319,8 +319,11 @@ void SingleThreadProxy::OnCanDrawStateChanged(bool can_draw) {
 void SingleThreadProxy::NotifyReadyToActivate() {
   TRACE_EVENT0("cc", "SingleThreadProxy::NotifyReadyToActivate");
   DebugScopedSetImplThread impl(task_runner_provider_);
-  if (scheduler_on_impl_thread_)
-    scheduler_on_impl_thread_->NotifyReadyToActivate();
+  if (scheduler_on_impl_thread_) {
+    // The argument to NotifyReadyToActivate is the pending-tree for computing
+    // Activation time in ProxyImpl. However this is not applicable here.
+    scheduler_on_impl_thread_->NotifyReadyToActivate(-1);
+  }
 }
 
 void SingleThreadProxy::NotifyReadyToDraw() {
@@ -456,7 +459,8 @@ void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
 
   BeginFrameArgs begin_frame_args(BeginFrameArgs::Create(
       BEGINFRAME_FROM_HERE, BeginFrameArgs::kManualSourceId, 1,
-      frame_begin_time, base::TimeTicks(), BeginFrameArgs::DefaultInterval(),
+      BeginFrameArgs::kDefaultSourceFrameNumber, frame_begin_time,
+      base::TimeTicks(), BeginFrameArgs::DefaultInterval(),
       BeginFrameArgs::NORMAL));
 
   // Start the impl frame.