| Index: cc/output/begin_frame_args.cc
|
| diff --git a/cc/output/begin_frame_args.cc b/cc/output/begin_frame_args.cc
|
| index 7ef2c4842ac4b30610a7acd9dd416f5f5270fc8a..37cfdd2939688ad3b7f8dceb44d1d1afa5f872c5 100644
|
| --- a/cc/output/begin_frame_args.cc
|
| +++ b/cc/output/begin_frame_args.cc
|
| @@ -25,25 +25,31 @@ const char* BeginFrameArgs::TypeToString(BeginFrameArgsType type) {
|
| }
|
|
|
| BeginFrameArgs::BeginFrameArgs()
|
| - : frame_time(base::TimeTicks()),
|
| + : source_id(0),
|
| + sequence_number(0),
|
| + frame_time(base::TimeTicks()),
|
| deadline(base::TimeTicks()),
|
| interval(base::TimeDelta::FromMicroseconds(-1)),
|
| type(BeginFrameArgs::INVALID),
|
| - on_critical_path(true) {
|
| -}
|
| + on_critical_path(true) {}
|
|
|
| -BeginFrameArgs::BeginFrameArgs(base::TimeTicks frame_time,
|
| +BeginFrameArgs::BeginFrameArgs(uint64_t source_id,
|
| + uint64_t sequence_number,
|
| + base::TimeTicks frame_time,
|
| base::TimeTicks deadline,
|
| base::TimeDelta interval,
|
| BeginFrameArgs::BeginFrameArgsType type)
|
| - : frame_time(frame_time),
|
| + : source_id(source_id),
|
| + sequence_number(sequence_number),
|
| + frame_time(frame_time),
|
| deadline(deadline),
|
| interval(interval),
|
| type(type),
|
| - on_critical_path(true) {
|
| -}
|
| + on_critical_path(true) {}
|
|
|
| BeginFrameArgs BeginFrameArgs::Create(BeginFrameArgs::CreationLocation location,
|
| + uint64_t source_id,
|
| + uint64_t sequence_number,
|
| base::TimeTicks frame_time,
|
| base::TimeTicks deadline,
|
| base::TimeDelta interval,
|
| @@ -51,9 +57,11 @@ BeginFrameArgs BeginFrameArgs::Create(BeginFrameArgs::CreationLocation location,
|
| DCHECK_NE(type, BeginFrameArgs::INVALID);
|
| DCHECK_NE(type, BeginFrameArgs::BEGIN_FRAME_ARGS_TYPE_MAX);
|
| #ifdef NDEBUG
|
| - return BeginFrameArgs(frame_time, deadline, interval, type);
|
| + return BeginFrameArgs(source_id, sequence_number, frame_time, deadline,
|
| + interval, type);
|
| #else
|
| - BeginFrameArgs args = BeginFrameArgs(frame_time, deadline, interval, type);
|
| + BeginFrameArgs args(source_id, sequence_number, frame_time, deadline,
|
| + interval, type);
|
| args.created_from = location;
|
| return args;
|
| #endif
|
| @@ -70,6 +78,8 @@ BeginFrameArgs::AsValue() const {
|
| void BeginFrameArgs::AsValueInto(base::trace_event::TracedValue* state) const {
|
| state->SetString("type", "BeginFrameArgs");
|
| 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());
|
| @@ -93,4 +103,22 @@ base::TimeDelta BeginFrameArgs::DefaultInterval() {
|
| return base::TimeDelta::FromMicroseconds(16666);
|
| }
|
|
|
| +BeginFrameAck::BeginFrameAck()
|
| + : source_id(0),
|
| + sequence_number(0),
|
| + has_updates(false),
|
| + oldest_incorporated_frame(0),
|
| + remaining_frames(0) {}
|
| +
|
| +BeginFrameAck::BeginFrameAck(uint64_t source_id,
|
| + uint64_t sequence_number,
|
| + bool has_updates,
|
| + uint64_t oldest_incorporated_frame,
|
| + uint32_t remaining_frames)
|
| + : source_id(source_id),
|
| + sequence_number(sequence_number),
|
| + has_updates(has_updates),
|
| + oldest_incorporated_frame(oldest_incorporated_frame),
|
| + remaining_frames(remaining_frames) {}
|
| +
|
| } // namespace cc
|
|
|