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

Unified Diff: cc/scheduler/scheduler_unittest.cc

Issue 775143003: cc: Implement unified BeginFrame on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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
Index: cc/scheduler/scheduler_unittest.cc
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
index 50cc846c44114edffbc07dfdc6f0faf117b95299..3e0e30fae19f59b2420f961192bb8936e8c13164 100644
--- a/cc/scheduler/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc
@@ -530,10 +530,6 @@ TEST_F(SchedulerTest, RequestCommitAfterSetDeferCommit) {
scheduler_settings_.use_external_begin_frame_source = true;
SetUpScheduler(true);
- scheduler_->SetCanStart();
- scheduler_->SetVisible(true);
- scheduler_->SetCanDraw(true);
brianderson 2015/03/02 22:38:15 Why was this block removed?
simonhong 2015/03/03 22:54:12 This is just a clean up. Above three function call
-
scheduler_->SetDeferCommits(true);
scheduler_->SetNeedsCommit();
@@ -566,10 +562,6 @@ TEST_F(SchedulerTest, DeferCommitWithRedraw) {
scheduler_settings_.use_external_begin_frame_source = true;
SetUpScheduler(true);
- scheduler_->SetCanStart();
- scheduler_->SetVisible(true);
- scheduler_->SetCanDraw(true);
brianderson 2015/03/02 22:38:16 Why was this block removed?
simonhong 2015/03/03 22:54:12 ditto.
-
scheduler_->SetDeferCommits(true);
scheduler_->SetNeedsCommit();
@@ -2396,5 +2388,31 @@ TEST_F(SchedulerTest, SendBeginMainFrameNotExpectedSoon) {
client_->Reset();
}
+TEST_F(SchedulerTest, AuthoritativeVSyncInterval) {
+ SetUpScheduler(true);
+
+ base::TimeDelta initial_interval =
+ scheduler_->begin_impl_frame_args().interval;
+ base::TimeDelta authoritative_interval =
+ base::TimeDelta::FromMilliseconds(33);
+
+ scheduler_->SetNeedsCommit();
+ EXPECT_SCOPED(AdvanceFrame());
+
+ EXPECT_EQ(initial_interval, scheduler_->begin_impl_frame_args().interval);
+
+ scheduler_->NotifyBeginMainFrameStarted();
+ scheduler_->NotifyReadyToCommit();
+ task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
+
+ scheduler_->SetAuthoritativeVSyncInterval(authoritative_interval);
+
+ EXPECT_SCOPED(AdvanceFrame());
+
+ // At the next BeginFrame, authoritative interval is used.
+ EXPECT_EQ(authoritative_interval,
brianderson 2015/03/02 22:38:16 Can you also EXPECT_NE to initial_interval so it's
simonhong 2015/03/03 22:54:12 Done.
+ scheduler_->begin_impl_frame_args().interval);
+}
+
} // namespace
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698