Revert of Plumb activation time to main

cc/trees/single_thread_proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/single_thread_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/memory/ptr_util.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 301 matching lines @@
   TRACE_EVENT1("cc", "SingleThreadProxy::OnCanDrawStateChanged", "can_draw",
                can_draw);
   DCHECK(task_runner_provider_->IsImplThread());
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->SetCanDraw(can_draw);
 }
 
 void SingleThreadProxy::NotifyReadyToActivate() {
   TRACE_EVENT0("cc", "SingleThreadProxy::NotifyReadyToActivate");
   DebugScopedSetImplThread impl(task_runner_provider_);
-  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);
-  }
+  if (scheduler_on_impl_thread_)
+    scheduler_on_impl_thread_->NotifyReadyToActivate();
 }
 
 void SingleThreadProxy::NotifyReadyToDraw() {
   TRACE_EVENT0("cc", "SingleThreadProxy::NotifyReadyToDraw");
   DebugScopedSetImplThread impl(task_runner_provider_);
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->NotifyReadyToDraw();
 }
 
 void SingleThreadProxy::SetNeedsRedrawOnImplThread() {
@@ skipping 115 matching lines @@
   if (compositor_frame_sink_lost_) {
     RequestNewCompositorFrameSink();
     // RequestNewCompositorFrameSink could have synchronously created an output
     // surface, so check again before returning.
     if (compositor_frame_sink_lost_)
       return;
   }
 
   BeginFrameArgs begin_frame_args(BeginFrameArgs::Create(
       BEGINFRAME_FROM_HERE, BeginFrameArgs::kManualSourceId, 1,
-      BeginFrameArgs::kDefaultSourceFrameNumber, frame_begin_time,
-      base::TimeTicks(), BeginFrameArgs::DefaultInterval(),
+      frame_begin_time, base::TimeTicks(), BeginFrameArgs::DefaultInterval(),
       BeginFrameArgs::NORMAL));
 
   // Start the impl frame.
   {
     DebugScopedSetImplThread impl(task_runner_provider_);
     WillBeginImplFrame(begin_frame_args);
   }
 
   // Run the "main thread" and get it to commit.
   {
@@ skipping 318 matching lines @@
 void SingleThreadProxy::DidFinishImplFrame() {
   layer_tree_host_impl_->DidFinishImplFrame();
 #if DCHECK_IS_ON()
   DCHECK(inside_impl_frame_)
       << "DidFinishImplFrame called while not inside an impl frame!";
   inside_impl_frame_ = false;
 #endif
 }
 
 }  // namespace cc