Revert of Plumb activation time to main

cc/scheduler/begin_frame_source.cc

 // Copyright 2014 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/scheduler/begin_frame_source.h"
 
 #include <stddef.h>
 
 #include "base/atomic_sequence_num.h"
 #include "base/auto_reset.h"
@@ skipping 111 matching lines @@
 }
 
 bool BackToBackBeginFrameSource::IsThrottled() const {
   return false;
 }
 
 void BackToBackBeginFrameSource::OnTimerTick() {
   base::TimeTicks frame_time = time_source_->LastTickTime();
   base::TimeDelta default_interval = BeginFrameArgs::DefaultInterval();
   BeginFrameArgs args = BeginFrameArgs::Create(
-      BEGINFRAME_FROM_HERE, source_id(), next_sequence_number_,
-      BeginFrameArgs::kDefaultSourceFrameNumber, frame_time,
+      BEGINFRAME_FROM_HERE, source_id(), next_sequence_number_, frame_time,
       frame_time + default_interval, default_interval, BeginFrameArgs::NORMAL);
   next_sequence_number_++;
 
   // This must happen after getting the LastTickTime() from the time source.
   time_source_->SetActive(false);
 
   std::unordered_set<BeginFrameObserver*> pending_observers;
   pending_observers.swap(pending_begin_frame_observers_);
   DCHECK(!pending_observers.empty());
   for (BeginFrameObserver* obs : pending_observers)
@@ skipping 28 matching lines @@
     base::TimeDelta interval) {
   authoritative_interval_ = interval;
   OnUpdateVSyncParameters(last_timebase_, interval);
 }
 
 BeginFrameArgs DelayBasedBeginFrameSource::CreateBeginFrameArgs(
     base::TimeTicks frame_time,
     BeginFrameArgs::BeginFrameArgsType type) {
   uint64_t sequence_number = next_sequence_number_++;
   return BeginFrameArgs::Create(
-      BEGINFRAME_FROM_HERE, source_id(), sequence_number,
-      BeginFrameArgs::kDefaultSourceFrameNumber, frame_time,
+      BEGINFRAME_FROM_HERE, source_id(), sequence_number, frame_time,
       time_source_->NextTickTime(), time_source_->Interval(), type);
 }
 
 void DelayBasedBeginFrameSource::AddObserver(BeginFrameObserver* obs) {
   DCHECK(obs);
   DCHECK(observers_.find(obs) == observers_.end());
 
   observers_.insert(obs);
   obs->OnBeginFrameSourcePausedChanged(false);
   time_source_->SetActive(true);
@@ skipping 288 matching lines @@
   frame_active_ = false;
 
   BeginFrameAck ack(last_begin_frame_args_.source_id,
                     last_begin_frame_args_.sequence_number,
                     ack_tracker_.LatestConfirmedSequenceNumber(),
                     ack_tracker_.AnyObserversHadDamage());
   client_->OnDidFinishFrame(ack);
 }
 
 }  // namespace cc