| Index: cc/output/begin_frame_args.cc
|
| diff --git a/cc/output/begin_frame_args.cc b/cc/output/begin_frame_args.cc
|
| index 0be93180f8783aa699fa618e19a2ddc1374a7c47..5744d9dbe843d8e7fff46927f25c4536ddc4090c 100644
|
| --- a/cc/output/begin_frame_args.cc
|
| +++ b/cc/output/begin_frame_args.cc
|
| @@ -41,12 +41,19 @@ BeginFrameArgs::BeginFrameArgs(base::TimeTicks frame_time,
|
| type(type) {
|
| }
|
|
|
| -BeginFrameArgs BeginFrameArgs::Create(base::TimeTicks frame_time,
|
| +BeginFrameArgs BeginFrameArgs::Create(BeginFrameArgs::CreationLocation location,
|
| + base::TimeTicks frame_time,
|
| base::TimeTicks deadline,
|
| base::TimeDelta interval,
|
| BeginFrameArgs::BeginFrameArgsType type) {
|
| DCHECK_NE(type, BeginFrameArgs::INVALID);
|
| +#ifdef NDEBUG
|
| return BeginFrameArgs(frame_time, deadline, interval, type);
|
| +#else
|
| + BeginFrameArgs args = BeginFrameArgs(frame_time, deadline, interval, type);
|
| + args.created_from = location;
|
| + return args;
|
| +#endif
|
| }
|
|
|
| scoped_refptr<base::debug::ConvertableToTraceFormat> BeginFrameArgs::AsValue()
|
| @@ -63,6 +70,9 @@ void BeginFrameArgs::AsValueInto(base::debug::TracedValue* state) const {
|
| 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
|
| }
|
|
|
| // This is a hard-coded deadline adjustment that assumes 60Hz, to be used in
|
|
|