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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/scheduler/scheduler_unittest.cc

Issue 16863005: cc: Add BeginFrameArgs (Closed) Base URL: http://git.chromium.org/chromium/src.git@nofrc12
Patch Set: Created 7 years, 6 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
« cc/scheduler/scheduler.cc ('K') | « cc/scheduler/scheduler_state_machine_unittest.cc ('k') | cc/test/fake_layer_tree_host_impl_client.h » ('j') | content/browser/android/content_view_core_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler/scheduler_unittest.cc
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
index bc7d5758155cc507d751ebcbcb07945a5504a918..6ceb00dc09ca21c93a1dfce8bc3652ee849aee33 100644
--- a/cc/scheduler/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc
@@ -166,7 +166,7 @@ TEST(SchedulerTest, RequestCommit) {
client.Reset();
// BeginFrame should draw.
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
EXPECT_ACTION("SetNeedsBeginFrameOnImplThread", client, 1, 2);
EXPECT_FALSE(client.needs_begin_frame());
@@ -201,7 +201,7 @@ TEST(SchedulerTest, RequestCommitAfterBeginFrameSentToMainThread) {
client.Reset();
// Tick should draw but then begin another frame.
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_TRUE(client.needs_begin_frame());
EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
EXPECT_ACTION("ScheduledActionSendBeginFrameToMainThread", client, 1, 2);
@@ -209,7 +209,7 @@ TEST(SchedulerTest, RequestCommitAfterBeginFrameSentToMainThread) {
// Go back to quiescent state and verify we no longer request BeginFrames.
scheduler->FinishCommit();
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_FALSE(client.needs_begin_frame());
}
@@ -230,7 +230,7 @@ TEST(SchedulerTest, TextureAcquisitionCausesCommitInsteadOfDraw) {
EXPECT_TRUE(client.needs_begin_frame());
client.Reset();
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
EXPECT_ACTION("SetNeedsBeginFrameOnImplThread", client, 1, 2);
EXPECT_FALSE(scheduler->RedrawPending());
@@ -254,7 +254,7 @@ TEST(SchedulerTest, TextureAcquisitionCausesCommitInsteadOfDraw) {
// No draw happens since the textures are acquired by the main thread.
client.Reset();
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_SINGLE_ACTION("SetNeedsBeginFrameOnImplThread", client);
EXPECT_TRUE(scheduler->RedrawPending());
EXPECT_TRUE(client.needs_begin_frame());
@@ -268,7 +268,7 @@ TEST(SchedulerTest, TextureAcquisitionCausesCommitInsteadOfDraw) {
// Now we can draw again after the commit happens.
client.Reset();
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
EXPECT_ACTION("SetNeedsBeginFrameOnImplThread", client, 1, 2);
EXPECT_FALSE(scheduler->RedrawPending());
@@ -315,7 +315,7 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
client.Reset();
// Once compositor draw complete, the delayed texture acquisition fires.
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 3);
EXPECT_ACTION("ScheduledActionAcquireLayerTexturesForMainThread",
client,
@@ -396,12 +396,12 @@ TEST(SchedulerTest, RequestRedrawInsideDraw) {
EXPECT_TRUE(client.needs_begin_frame());
EXPECT_EQ(0, client.num_draws());
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(1, client.num_draws());
EXPECT_TRUE(scheduler->RedrawPending());
EXPECT_TRUE(client.needs_begin_frame());
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(2, client.num_draws());
EXPECT_FALSE(scheduler->RedrawPending());
EXPECT_FALSE(client.needs_begin_frame());
@@ -425,7 +425,7 @@ TEST(SchedulerTest, RequestRedrawInsideFailedDraw) {
EXPECT_EQ(0, client.num_draws());
// Fail the draw.
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(1, client.num_draws());
// We have a commit pending and the draw failed, and we didn't lose the redraw
@@ -435,7 +435,7 @@ TEST(SchedulerTest, RequestRedrawInsideFailedDraw) {
EXPECT_TRUE(client.needs_begin_frame());
// Fail the draw again.
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(2, client.num_draws());
EXPECT_TRUE(scheduler->CommitPending());
EXPECT_TRUE(scheduler->RedrawPending());
@@ -443,7 +443,7 @@ TEST(SchedulerTest, RequestRedrawInsideFailedDraw) {
// Draw successfully.
client.SetDrawWillHappen(true);
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(3, client.num_draws());
EXPECT_TRUE(scheduler->CommitPending());
EXPECT_FALSE(scheduler->RedrawPending());
@@ -488,13 +488,13 @@ TEST(SchedulerTest, RequestCommitInsideDraw) {
EXPECT_EQ(0, client.num_draws());
EXPECT_TRUE(client.needs_begin_frame());
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(1, client.num_draws());
EXPECT_TRUE(scheduler->CommitPending());
EXPECT_TRUE(client.needs_begin_frame());
scheduler->FinishCommit();
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(2, client.num_draws());;
EXPECT_FALSE(scheduler->RedrawPending());
EXPECT_FALSE(scheduler->CommitPending());
@@ -519,7 +519,7 @@ TEST(SchedulerTest, RequestCommitInsideFailedDraw) {
EXPECT_EQ(0, client.num_draws());
// Fail the draw.
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(1, client.num_draws());
// We have a commit pending and the draw failed, and we didn't lose the commit
@@ -529,7 +529,7 @@ TEST(SchedulerTest, RequestCommitInsideFailedDraw) {
EXPECT_TRUE(client.needs_begin_frame());
// Fail the draw again.
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(2, client.num_draws());
EXPECT_TRUE(scheduler->CommitPending());
EXPECT_TRUE(scheduler->RedrawPending());
@@ -537,7 +537,7 @@ TEST(SchedulerTest, RequestCommitInsideFailedDraw) {
// Draw successfully.
client.SetDrawWillHappen(true);
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(3, client.num_draws());
EXPECT_TRUE(scheduler->CommitPending());
EXPECT_FALSE(scheduler->RedrawPending());
@@ -559,7 +559,7 @@ TEST(SchedulerTest, NoSwapWhenDrawFails) {
EXPECT_EQ(0, client.num_draws());
// Draw successfully, this starts a new frame.
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(1, client.num_draws());
scheduler->SetNeedsRedraw();
@@ -568,7 +568,7 @@ TEST(SchedulerTest, NoSwapWhenDrawFails) {
// Fail to draw, this should not start a frame.
client.SetDrawWillHappen(false);
- scheduler->BeginFrame(base::TimeTicks::Now());
+ scheduler->BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
EXPECT_EQ(2, client.num_draws());
}
« cc/scheduler/scheduler.cc ('K') | « cc/scheduler/scheduler_state_machine_unittest.cc ('k') | cc/test/fake_layer_tree_host_impl_client.h » ('j') | content/browser/android/content_view_core_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698