| Index: cc/scheduler/scheduler_unittest.cc
|
| diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
|
| index f4027bf4a112fdea5eee4b2138fc928d1ea5b38f..367c5dd29d404c9ca0e73834bbc06d9bf6cc9ba6 100644
|
| --- a/cc/scheduler/scheduler_unittest.cc
|
| +++ b/cc/scheduler/scheduler_unittest.cc
|
| @@ -40,7 +40,7 @@ void InitializeOutputSurfaceAndFirstCommit(Scheduler* scheduler) {
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| scheduler->OnBeginImplFrameDeadline();
|
| // We need another BeginImplFrame so Scheduler calls
|
| - // SetNeedsBeginImplFrame(false).
|
| + // SetNeedsBeginFrame(false).
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| scheduler->OnBeginImplFrameDeadline();
|
| }
|
| @@ -100,11 +100,15 @@ class FakeSchedulerClient : public SchedulerClient {
|
| }
|
|
|
| // SchedulerClient implementation.
|
| - virtual void SetNeedsBeginImplFrame(bool enable) OVERRIDE {
|
| - actions_.push_back("SetNeedsBeginImplFrame");
|
| + virtual void SetNeedsBeginFrame(bool enable) OVERRIDE {
|
| + actions_.push_back("SetNeedsBeginFrame");
|
| states_.push_back(scheduler_->StateAsValue().release());
|
| needs_begin_impl_frame_ = enable;
|
| }
|
| + virtual void WillBeginImplFrame(const BeginFrameArgs& args) OVERRIDE {
|
| + actions_.push_back("WillBeginImplFrame");
|
| + states_.push_back(scheduler_->StateAsValue().release());
|
| + }
|
| virtual void ScheduledActionSendBeginMainFrame() OVERRIDE {
|
| actions_.push_back("ScheduledActionSendBeginMainFrame");
|
| states_.push_back(scheduler_->StateAsValue().release());
|
| @@ -221,11 +225,12 @@ TEST(SchedulerTest, RequestCommit) {
|
| client.Reset();
|
| scheduler->SetNeedsCommit();
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
| client.Reset();
|
|
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client);
|
| + EXPECT_ACTION("WillBeginImplFrame", client, 0, 2);
|
| + EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client, 1, 2);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| client.Reset();
|
| @@ -233,7 +238,7 @@ TEST(SchedulerTest, RequestCommit) {
|
| // If we don't swap on the deadline, we need to request another
|
| // BeginImplFrame.
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_EQ(client.num_actions_(), 0);
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| client.Reset();
|
| @@ -247,28 +252,27 @@ TEST(SchedulerTest, RequestCommit) {
|
|
|
| // BeginImplFrame should prepare the draw.
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| client.Reset();
|
|
|
| // BeginImplFrame deadline should draw.
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
|
| - EXPECT_ACTION("SetNeedsBeginImplFrame", client, 1, 2);
|
| + EXPECT_SINGLE_ACTION("ScheduledActionDrawAndSwapIfPossible", client);
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| client.Reset();
|
|
|
| - // The following BeginImplFrame deadline should SetNeedsBeginImplFrame(false)
|
| + // The following BeginImplFrame deadline should SetNeedsBeginFrame(false)
|
| // to avoid excessive toggles.
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
|
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
| EXPECT_FALSE(client.needs_begin_impl_frame());
|
| client.Reset();
|
| }
|
| @@ -287,11 +291,12 @@ TEST(SchedulerTest, RequestCommitAfterBeginMainFrameSent) {
|
|
|
| // SetNeedsCommit should begin the frame.
|
| scheduler->SetNeedsCommit();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
|
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client);
|
| + EXPECT_ACTION("WillBeginImplFrame", client, 0, 2);
|
| + EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client, 1, 2);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| @@ -309,8 +314,7 @@ TEST(SchedulerTest, RequestCommitAfterBeginMainFrameSent) {
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
|
| - EXPECT_ACTION("SetNeedsBeginImplFrame", client, 1, 2);
|
| + EXPECT_SINGLE_ACTION("ScheduledActionDrawAndSwapIfPossible", client);
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| // Because we just swapped, the Scheduler should also request the next
|
| @@ -321,7 +325,8 @@ TEST(SchedulerTest, RequestCommitAfterBeginMainFrameSent) {
|
| // Since another commit is needed, the next BeginImplFrame should initiate
|
| // the second commit.
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client);
|
| + EXPECT_ACTION("WillBeginImplFrame", client, 0, 2);
|
| + EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client, 1, 2);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
|
|
| @@ -333,8 +338,7 @@ TEST(SchedulerTest, RequestCommitAfterBeginMainFrameSent) {
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
|
| - EXPECT_ACTION("SetNeedsBeginImplFrame", client, 1, 2);
|
| + EXPECT_SINGLE_ACTION("ScheduledActionDrawAndSwapIfPossible", client);
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| client.Reset();
|
| @@ -360,28 +364,27 @@ TEST(SchedulerTest, TextureAcquisitionCausesCommitInsteadOfDraw) {
|
| client.Reset();
|
| scheduler->SetNeedsRedraw();
|
| EXPECT_TRUE(scheduler->RedrawPending());
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
|
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
|
| - EXPECT_ACTION("SetNeedsBeginImplFrame", client, 1, 2);
|
| + EXPECT_SINGLE_ACTION("ScheduledActionDrawAndSwapIfPossible", client);
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_FALSE(scheduler->RedrawPending());
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
|
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_FALSE(scheduler->RedrawPending());
|
| EXPECT_FALSE(client.needs_begin_impl_frame());
|
| @@ -395,17 +398,17 @@ TEST(SchedulerTest, TextureAcquisitionCausesCommitInsteadOfDraw) {
|
| client.Reset();
|
| scheduler->SetNeedsRedraw();
|
| EXPECT_TRUE(scheduler->RedrawPending());
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
|
|
| // No draw happens since the textures are acquired by the main thread.
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_EQ(0, client.num_actions_());
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_TRUE(scheduler->RedrawPending());
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| @@ -416,7 +419,8 @@ TEST(SchedulerTest, TextureAcquisitionCausesCommitInsteadOfDraw) {
|
|
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client);
|
| + EXPECT_ACTION("WillBeginImplFrame", client, 0, 2);
|
| + EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client, 1, 2);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| // Commit will release the texture.
|
| @@ -430,8 +434,7 @@ TEST(SchedulerTest, TextureAcquisitionCausesCommitInsteadOfDraw) {
|
| // Now we can draw again after the commit happens.
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
|
| - EXPECT_ACTION("SetNeedsBeginImplFrame", client, 1, 2);
|
| + EXPECT_SINGLE_ACTION("ScheduledActionDrawAndSwapIfPossible", client);
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_FALSE(scheduler->RedrawPending());
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| @@ -439,11 +442,11 @@ TEST(SchedulerTest, TextureAcquisitionCausesCommitInsteadOfDraw) {
|
| // Make sure we stop requesting BeginImplFrames if we don't swap.
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
| EXPECT_FALSE(client.needs_begin_impl_frame());
|
| }
|
|
|
| @@ -460,7 +463,7 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
|
|
|
| client.Reset();
|
| scheduler->SetNeedsCommit();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
|
|
| client.Reset();
|
| scheduler->SetMainThreadNeedsLayerTextures();
|
| @@ -469,15 +472,16 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
|
|
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client);
|
| + EXPECT_ACTION("WillBeginImplFrame", client, 0, 2);
|
| + EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client, 1, 2);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_EQ(0, client.num_actions_());
|
|
|
| // Although the compositor cannot draw because textures are locked by main
|
| - // thread, we continue requesting SetNeedsBeginImplFrame in anticipation of
|
| + // thread, we continue requesting SetNeedsBeginFrame in anticipation of
|
| // the unlock.
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
|
|
| @@ -495,15 +499,14 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
|
| // No implicit commit is expected.
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 3);
|
| + EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
|
| EXPECT_ACTION(
|
| - "ScheduledActionAcquireLayerTexturesForMainThread", client, 1, 3);
|
| - EXPECT_ACTION("SetNeedsBeginImplFrame", client, 2, 3);
|
| + "ScheduledActionAcquireLayerTexturesForMainThread", client, 1, 2);
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
|
|
| @@ -511,11 +514,11 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
|
| // thread.
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
| EXPECT_FALSE(client.needs_begin_impl_frame());
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| @@ -523,12 +526,13 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
|
| // the textures.
|
| client.Reset();
|
| scheduler->SetNeedsCommit();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
|
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client);
|
| + EXPECT_ACTION("WillBeginImplFrame", client, 0, 2);
|
| + EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client, 1, 2);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
|
|
| @@ -542,8 +546,7 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
|
|
|
| // Verify we draw on the next BeginImplFrame deadline
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
|
| - EXPECT_ACTION("SetNeedsBeginImplFrame", client, 1, 2);
|
| + EXPECT_SINGLE_ACTION("ScheduledActionDrawAndSwapIfPossible", client);
|
| EXPECT_TRUE(client.needs_begin_impl_frame());
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| @@ -585,7 +588,8 @@ TEST(SchedulerTest, VisibilitySwitchWithTextureAcquisition) {
|
| // for a new frame in order to escape a deadlock.
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client);
|
| + EXPECT_ACTION("WillBeginImplFrame", client, 0, 2);
|
| + EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client, 1, 2);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| }
|
|
|
| @@ -942,7 +946,7 @@ TEST(SchedulerTest, ManageTiles) {
|
| // the deadline task.
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| // On the deadline, he actions should have occured in the right order.
|
| @@ -969,7 +973,7 @@ TEST(SchedulerTest, ManageTiles) {
|
| // the deadline task.
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| // Draw. The draw will trigger SetNeedsManageTiles, and
|
| @@ -989,11 +993,11 @@ TEST(SchedulerTest, ManageTiles) {
|
| // We need a BeginImplFrame where we don't swap to go idle.
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| - EXPECT_SINGLE_ACTION("SetNeedsBeginImplFrame", client);
|
| + EXPECT_SINGLE_ACTION("SetNeedsBeginFrame", client);
|
| EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
|
| EXPECT_EQ(0, client.num_draws());
|
|
|
| @@ -1009,7 +1013,7 @@ TEST(SchedulerTest, ManageTiles) {
|
| // BeginImplFrame. There will be no draw, only ManageTiles.
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
| client.Reset();
|
| scheduler->OnBeginImplFrameDeadline();
|
| @@ -1035,7 +1039,7 @@ TEST(SchedulerTest, ManageTilesOncePerFrame) {
|
| scheduler->SetNeedsRedraw();
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| EXPECT_TRUE(scheduler->ManageTilesPending());
|
| @@ -1056,7 +1060,7 @@ TEST(SchedulerTest, ManageTilesOncePerFrame) {
|
| scheduler->SetNeedsRedraw();
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| client.Reset();
|
| @@ -1078,7 +1082,7 @@ TEST(SchedulerTest, ManageTilesOncePerFrame) {
|
| scheduler->SetNeedsRedraw();
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| EXPECT_TRUE(scheduler->ManageTilesPending());
|
| @@ -1100,7 +1104,7 @@ TEST(SchedulerTest, ManageTilesOncePerFrame) {
|
| scheduler->SetNeedsRedraw();
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| EXPECT_TRUE(scheduler->ManageTilesPending());
|
| @@ -1118,7 +1122,7 @@ TEST(SchedulerTest, ManageTilesOncePerFrame) {
|
| scheduler->SetNeedsRedraw();
|
| client.Reset();
|
| scheduler->BeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_EQ(client.num_actions_(), 0);
|
| + EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
|
| EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
|
|
|
| client.Reset();
|
|
|