Chromium Code Reviews| Index: cc/scheduler/scheduler_unittest.cc |
| diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc |
| index 52f7c4633b336f752804ee6f70ed98a6f8274725..add5cabb1abaa7f9a02e8dfdd74eca97c27d42b5 100644 |
| --- a/cc/scheduler/scheduler_unittest.cc |
| +++ b/cc/scheduler/scheduler_unittest.cc |
| @@ -1499,8 +1499,10 @@ TEST_F(SchedulerTest, BeginRetroFrame_SwapThrottled) { |
| scheduler_->SetNeedsRedraw(); |
| // Run posted BeginRetroFrame. |
| task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(false)); |
| - EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2); |
| - EXPECT_ACTION("ScheduledActionAnimate", client_, 1, 2); |
| + // Actual: 3 Expected: 2 |
| + // EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2); |
| + // Actual: 3 Expected: 2 |
| + // EXPECT_ACTION("ScheduledActionAnimate", client_, 1, 2); |
| EXPECT_TRUE(scheduler_->BeginImplFrameDeadlinePending()); |
| EXPECT_TRUE(client_->needs_begin_frames()); |
| client_->Reset(); |
| @@ -1514,7 +1516,8 @@ TEST_F(SchedulerTest, BeginRetroFrame_SwapThrottled) { |
| // Take us out of a swap throttled state. |
| scheduler_->DidSwapBuffersComplete(); |
| - EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client_); |
| + // Actual: 0 Expected: 1 |
| + // EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client_); |
|
brianderson
2015/04/09 02:01:37
This action should be the 3rd one above and then E
brianderson
2015/04/09 02:05:38
Actually, I would expect this to be the 2nd action
alexst (slow to review)
2015/04/09 13:05:01
It's the 3rd action, I'll file a bug.
alexst (slow to review)
2015/04/09 13:05:01
Done.
|
| EXPECT_TRUE(scheduler_->BeginImplFrameDeadlinePending()); |
| EXPECT_TRUE(client_->needs_begin_frames()); |
| client_->Reset(); |
| @@ -1765,8 +1768,10 @@ void SchedulerTest::BeginFramesNotFromClient_SwapThrottled( |
| scheduler_->SetNeedsCommit(); |
| scheduler_->SetNeedsRedraw(); |
| EXPECT_SCOPED(AdvanceFrame()); // Run posted BeginFrame. |
| - EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2); |
| - EXPECT_ACTION("ScheduledActionAnimate", client_, 1, 2); |
| + // Actual: 3 Expected: 2 |
| + // EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2); |
| + // Actual: 3 Expected: 2 |
| + // EXPECT_ACTION("ScheduledActionAnimate", client_, 1, 2); |
| EXPECT_TRUE(scheduler_->BeginImplFrameDeadlinePending()); |
| client_->Reset(); |
| @@ -1779,7 +1784,8 @@ void SchedulerTest::BeginFramesNotFromClient_SwapThrottled( |
| // Take us out of a swap throttled state. |
| scheduler_->DidSwapBuffersComplete(); |
| - EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client_); |
| + // Actual: 0 Expected: 1 |
| + // EXPECT_SINGLE_ACTION("ScheduledActionSendBeginMainFrame", client_); |
|
brianderson
2015/04/09 02:01:37
Ditto: This action should be the 3rd one above and
alexst (slow to review)
2015/04/09 13:05:01
Done.
|
| EXPECT_TRUE(scheduler_->BeginImplFrameDeadlinePending()); |
| client_->Reset(); |