Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: cc/test/begin_frame_args_test.cc

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/begin_frame_args_test.h ('k') | cc/test/fake_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1c4b236f0ac6a95fdeb35b385510160507fc5c7d..f70d0c57086bc632408c2249e2a0ed6367c3ab48 100644
--- a/cc/test/begin_frame_args_test.cc
+++ b/cc/test/begin_frame_args_test.cc
@@ -16,9 +16,8 @@ BeginFrameArgs CreateBeginFrameArgsForTesting() {
BeginFrameArgs CreateBeginFrameArgsForTesting(base::TimeTicks frame_time) {
return BeginFrameArgs::Create(
- frame_time,
- frame_time + (BeginFrameArgs::DefaultInterval() / 2),
- BeginFrameArgs::DefaultInterval());
+ frame_time, frame_time + (BeginFrameArgs::DefaultInterval() / 2),
+ BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL);
}
BeginFrameArgs CreateBeginFrameArgsForTesting(int64 frame_time,
@@ -26,47 +25,47 @@ BeginFrameArgs CreateBeginFrameArgsForTesting(int64 frame_time,
int64 interval) {
return BeginFrameArgs::Create(base::TimeTicks::FromInternalValue(frame_time),
base::TimeTicks::FromInternalValue(deadline),
- base::TimeDelta::FromInternalValue(interval));
+ base::TimeDelta::FromInternalValue(interval),
+ BeginFrameArgs::NORMAL);
}
-BeginFrameArgs CreateTypedBeginFrameArgsForTesting(
+BeginFrameArgs CreateBeginFrameArgsForTesting(
int64 frame_time,
int64 deadline,
int64 interval,
BeginFrameArgs::BeginFrameArgsType type) {
- return BeginFrameArgs::CreateTyped(
- base::TimeTicks::FromInternalValue(frame_time),
- base::TimeTicks::FromInternalValue(deadline),
- base::TimeDelta::FromInternalValue(interval),
- type);
+ return BeginFrameArgs::Create(base::TimeTicks::FromInternalValue(frame_time),
+ base::TimeTicks::FromInternalValue(deadline),
+ base::TimeDelta::FromInternalValue(interval),
+ type);
}
BeginFrameArgs CreateExpiredBeginFrameArgsForTesting() {
base::TimeTicks now = gfx::FrameTime::Now();
- return BeginFrameArgs::Create(now,
- now - BeginFrameArgs::DefaultInterval(),
- BeginFrameArgs::DefaultInterval());
+ return BeginFrameArgs::Create(now, now - BeginFrameArgs::DefaultInterval(),
+ BeginFrameArgs::DefaultInterval(),
+ BeginFrameArgs::NORMAL);
}
BeginFrameArgs CreateBeginFrameArgsForTesting(
scoped_refptr<TestNowSource> now_src) {
base::TimeTicks now = now_src->Now();
- return BeginFrameArgs::Create(now,
- now + (BeginFrameArgs::DefaultInterval() / 2),
- BeginFrameArgs::DefaultInterval());
+ return BeginFrameArgs::Create(
+ now, now + (BeginFrameArgs::DefaultInterval() / 2),
+ BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL);
}
BeginFrameArgs CreateExpiredBeginFrameArgsForTesting(
scoped_refptr<TestNowSource> now_src) {
base::TimeTicks now = now_src->Now();
- return BeginFrameArgs::Create(now,
- now - BeginFrameArgs::DefaultInterval(),
- BeginFrameArgs::DefaultInterval());
+ return BeginFrameArgs::Create(now, now - BeginFrameArgs::DefaultInterval(),
+ BeginFrameArgs::DefaultInterval(),
+ BeginFrameArgs::NORMAL);
}
bool operator==(const BeginFrameArgs& lhs, const BeginFrameArgs& rhs) {
- return (lhs.frame_time == rhs.frame_time) && (lhs.deadline == rhs.deadline) &&
- (lhs.interval == rhs.interval);
+ return (lhs.type == rhs.type) && (lhs.frame_time == rhs.frame_time) &&
+ (lhs.deadline == rhs.deadline) && (lhs.interval == rhs.interval);
}
::std::ostream& operator<<(::std::ostream& os, const BeginFrameArgs& args) {
@@ -75,7 +74,8 @@ bool operator==(const BeginFrameArgs& lhs, const BeginFrameArgs& rhs) {
}
void PrintTo(const BeginFrameArgs& args, ::std::ostream* os) {
- *os << "BeginFrameArgs(" << args.frame_time.ToInternalValue() << ", "
+ *os << "BeginFrameArgs(" << BeginFrameArgs::TypeToString(args.type) << ", "
+ << args.frame_time.ToInternalValue() << ", "
<< args.deadline.ToInternalValue() << ", "
<< args.interval.InMicroseconds() << "us)";
}
« no previous file with comments | « cc/test/begin_frame_args_test.h ('k') | cc/test/fake_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698