Revert of Plumb activation time to main

cc/output/begin_frame_args.cc

 // Copyright 2013 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/output/begin_frame_args.h"
 
 #include "base/trace_event/trace_event_argument.h"
 
 namespace cc {
 
 const char* BeginFrameArgs::TypeToString(BeginFrameArgsType type) {
   switch (type) {
     case BeginFrameArgs::INVALID:
       return "INVALID";
     case BeginFrameArgs::NORMAL:
       return "NORMAL";
     case BeginFrameArgs::MISSED:
       return "MISSED";
     case BeginFrameArgs::BEGIN_FRAME_ARGS_TYPE_MAX:
       return "BEGIN_FRAME_ARGS_TYPE_MAX";
   }
   NOTREACHED();
   return "???";
 }
 
 constexpr uint64_t BeginFrameArgs::kInvalidFrameNumber;
 constexpr uint64_t BeginFrameArgs::kStartingFrameNumber;
-constexpr uint32_t BeginFrameArgs::kDefaultSourceFrameNumber;
-
-BeginFrameArgs::BeginFrameArgs(const BeginFrameArgs& other) = default;
-BeginFrameArgs::~BeginFrameArgs() = default;
 
 BeginFrameArgs::BeginFrameArgs()
     : frame_time(base::TimeTicks()),
       deadline(base::TimeTicks()),
       interval(base::TimeDelta::FromMicroseconds(-1)),
       sequence_number(kInvalidFrameNumber),
       source_id(0),
       type(BeginFrameArgs::INVALID),
       on_critical_path(true) {}
 
 BeginFrameArgs::BeginFrameArgs(uint32_t source_id,
                                uint64_t sequence_number,
-                               uint32_t source_frame_number,
                                base::TimeTicks frame_time,
                                base::TimeTicks deadline,
                                base::TimeDelta interval,
                                BeginFrameArgs::BeginFrameArgsType type)
     : frame_time(frame_time),
       deadline(deadline),
       interval(interval),
       sequence_number(sequence_number),
       source_id(source_id),
       type(type),
       on_critical_path(true) {
   DCHECK_LE(kStartingFrameNumber, sequence_number);
 }
 
 BeginFrameArgs BeginFrameArgs::Create(BeginFrameArgs::CreationLocation location,
                                       uint32_t source_id,
                                       uint64_t sequence_number,
-                                      uint32_t source_frame_number,
                                       base::TimeTicks frame_time,
                                       base::TimeTicks deadline,
                                       base::TimeDelta interval,
                                       BeginFrameArgs::BeginFrameArgsType type) {
   DCHECK_NE(type, BeginFrameArgs::INVALID);
   DCHECK_NE(type, BeginFrameArgs::BEGIN_FRAME_ARGS_TYPE_MAX);
 #ifdef NDEBUG
-  return BeginFrameArgs(source_id, sequence_number, source_frame_number,
-                        frame_time, deadline, interval, type);
+  return BeginFrameArgs(source_id, sequence_number, frame_time, deadline,
+                        interval, type);
 #else
-  BeginFrameArgs args =
-      BeginFrameArgs(source_id, sequence_number, source_frame_number,
-                     frame_time, deadline, interval, type);
+  BeginFrameArgs args = BeginFrameArgs(source_id, sequence_number, frame_time,
+                                       deadline, interval, type);
   args.created_from = location;
   return args;
 #endif
 }
 
 std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
 BeginFrameArgs::AsValue() const {
   std::unique_ptr<base::trace_event::TracedValue> state(
       new base::trace_event::TracedValue());
   AsValueInto(state.get());
@@ skipping 46 matching lines @@
 }
 
 // static
 BeginFrameAck BeginFrameAck::CreateManualAckWithDamage() {
   return BeginFrameAck(BeginFrameArgs::kManualSourceId,
                        BeginFrameArgs::kStartingFrameNumber,
                        BeginFrameArgs::kInvalidFrameNumber, true);
 }
 
 }  // namespace cc