Index: cc/test/begin_frame_args_test.cc |
diff --git a/cc/test/begin_frame_args_test.cc b/cc/test/begin_frame_args_test.cc |
index 8b4dfd3bd97ccb73b11c93653deb11220b76e2c1..d3e1fd3deb87680096bddab654f6a403e6a2d5aa 100644 |
--- a/cc/test/begin_frame_args_test.cc |
+++ b/cc/test/begin_frame_args_test.cc |
@@ -12,15 +12,20 @@ |
namespace cc { |
BeginFrameArgs CreateBeginFrameArgsForTesting( |
- BeginFrameArgs::CreationLocation location) { |
- return CreateBeginFrameArgsForTesting(location, base::TimeTicks::Now()); |
+ BeginFrameArgs::CreationLocation location, |
+ uint64_t source_id, |
+ uint64_t sequence_number) { |
+ return CreateBeginFrameArgsForTesting(location, source_id, sequence_number, |
+ base::TimeTicks::Now()); |
} |
BeginFrameArgs CreateBeginFrameArgsForTesting( |
BeginFrameArgs::CreationLocation location, |
+ uint64_t source_id, |
+ uint64_t sequence_number, |
base::TimeTicks frame_time) { |
return BeginFrameArgs::Create( |
- location, frame_time, |
+ location, source_id, sequence_number, frame_time, |
frame_time + BeginFrameArgs::DefaultInterval() - |
BeginFrameArgs::DefaultEstimatedParentDrawTime(), |
BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL); |
@@ -28,40 +33,51 @@ BeginFrameArgs CreateBeginFrameArgsForTesting( |
BeginFrameArgs CreateBeginFrameArgsForTesting( |
BeginFrameArgs::CreationLocation location, |
+ uint64_t source_id, |
+ uint64_t sequence_number, |
int64_t frame_time, |
int64_t deadline, |
int64_t interval) { |
- return BeginFrameArgs::Create( |
- location, base::TimeTicks::FromInternalValue(frame_time), |
- base::TimeTicks::FromInternalValue(deadline), |
- base::TimeDelta::FromInternalValue(interval), BeginFrameArgs::NORMAL); |
+ return BeginFrameArgs::Create(location, source_id, sequence_number, |
+ base::TimeTicks::FromInternalValue(frame_time), |
+ base::TimeTicks::FromInternalValue(deadline), |
+ base::TimeDelta::FromInternalValue(interval), |
+ BeginFrameArgs::NORMAL); |
} |
BeginFrameArgs CreateBeginFrameArgsForTesting( |
BeginFrameArgs::CreationLocation location, |
+ uint64_t source_id, |
+ uint64_t sequence_number, |
int64_t frame_time, |
int64_t deadline, |
int64_t interval, |
BeginFrameArgs::BeginFrameArgsType type) { |
- return BeginFrameArgs::Create( |
- location, base::TimeTicks::FromInternalValue(frame_time), |
- base::TimeTicks::FromInternalValue(deadline), |
- base::TimeDelta::FromInternalValue(interval), type); |
+ return BeginFrameArgs::Create(location, source_id, sequence_number, |
+ base::TimeTicks::FromInternalValue(frame_time), |
+ base::TimeTicks::FromInternalValue(deadline), |
+ base::TimeDelta::FromInternalValue(interval), |
+ type); |
} |
BeginFrameArgs CreateBeginFrameArgsForTesting( |
BeginFrameArgs::CreationLocation location, |
+ uint64_t source_id, |
+ uint64_t sequence_number, |
base::SimpleTestTickClock* now_src) { |
base::TimeTicks now = now_src->NowTicks(); |
return BeginFrameArgs::Create( |
- location, now, now + BeginFrameArgs::DefaultInterval() - |
- BeginFrameArgs::DefaultEstimatedParentDrawTime(), |
+ location, source_id, sequence_number, now, |
+ now + BeginFrameArgs::DefaultInterval() - |
+ BeginFrameArgs::DefaultEstimatedParentDrawTime(), |
BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL); |
} |
bool operator==(const BeginFrameArgs& lhs, const BeginFrameArgs& rhs) { |
- return (lhs.type == rhs.type) && (lhs.frame_time == rhs.frame_time) && |
- (lhs.deadline == rhs.deadline) && (lhs.interval == rhs.interval); |
+ return (lhs.type == rhs.type) && (lhs.source_id == rhs.source_id) && |
+ (lhs.sequence_number == rhs.sequence_number) && |
+ (lhs.frame_time == rhs.frame_time) && (lhs.deadline == rhs.deadline) && |
+ (lhs.interval == rhs.interval); |
} |
::std::ostream& operator<<(::std::ostream& os, const BeginFrameArgs& args) { |
@@ -71,6 +87,7 @@ bool operator==(const BeginFrameArgs& lhs, const BeginFrameArgs& rhs) { |
void PrintTo(const BeginFrameArgs& args, ::std::ostream* os) { |
*os << "BeginFrameArgs(" << BeginFrameArgs::TypeToString(args.type) << ", " |
+ << args.source_id << ", " << args.sequence_number << ", " |
<< args.frame_time.ToInternalValue() << ", " |
<< args.deadline.ToInternalValue() << ", " |
<< args.interval.InMicroseconds() << "us)"; |