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;
 
+BeginFrameArgs::BeginFrameArgs(const BeginFrameArgs& other) = default;
+
 BeginFrameArgs::BeginFrameArgs()
     : frame_time(base::TimeTicks()),
       deadline(base::TimeTicks()),
       interval(base::TimeDelta::FromMicroseconds(-1)),
       sequence_number(kInvalidFrameNumber),
       source_id(0),
+      ready_to_activate_time(base::TimeTicks()),
+      ready_to_activate_source_frame_number(0),
       type(BeginFrameArgs::INVALID),
       on_critical_path(true) {}
 
 BeginFrameArgs::BeginFrameArgs(uint32_t source_id,
                                uint64_t sequence_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),
+      // TODO: copy these
+      // ready_to_activate_time(ready_to_activate_time),
+      // ready_to_activate_source_frame_number(ready_to_activate_source_frame_number),
       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,
                                       base::TimeTicks frame_time,
                                       base::TimeTicks deadline,
@@ skipping 25 matching lines @@
   state->SetString("subtype", TypeToString(type));
   state->SetInteger("source_id", source_id);
   state->SetInteger("sequence_number", sequence_number);
   state->SetDouble("frame_time_us", frame_time.ToInternalValue());
   state->SetDouble("deadline_us", deadline.ToInternalValue());
   state->SetDouble("interval_us", interval.InMicroseconds());
 #ifndef NDEBUG
   state->SetString("created_from", created_from.ToString());
 #endif
   state->SetBoolean("on_critical_path", on_critical_path);
+  // TODO
+  // state->SetDouble("ready_to_activate_time_us",
+  // ready_to_activate_time.ToInternalValue());
+  // state->SetInteger("ready_to_activate_source_frame_number",
+  // ready_to_activate_source_frame_number);
 }
 
 // This is a hard-coded deadline adjustment that assumes 60Hz, to be used in
 // cases where a good estimated draw time is not known. Using 1/3 of the vsync
 // as the default adjustment gives the Browser the last 1/3 of a frame to
 // produce output, the Renderer Impl thread the middle 1/3 of a frame to produce
 // ouput, and the Renderer Main thread the first 1/3 of a frame to produce
 // output.
 base::TimeDelta BeginFrameArgs::DefaultEstimatedParentDrawTime() {
   return base::TimeDelta::FromMicroseconds(16666 / 3);
@@ skipping 24 matching lines @@
 }
 
 // static
 BeginFrameAck BeginFrameAck::CreateManualAckWithDamage() {
   return BeginFrameAck(BeginFrameArgs::kManualSourceId,
                        BeginFrameArgs::kStartingFrameNumber,
                        BeginFrameArgs::kInvalidFrameNumber, 0, true);
 }
 
 }  // namespace cc