| Index: cc/scheduler/scheduler_state_machine_unittest.cc
|
| diff --git a/cc/scheduler/scheduler_state_machine_unittest.cc b/cc/scheduler/scheduler_state_machine_unittest.cc
|
| index 87f3019a05b75173399599d0699b04b054fcf8fd..4d7ef3fc1ce473c49e6bf55f5f48f6aaf42ef7e3 100644
|
| --- a/cc/scheduler/scheduler_state_machine_unittest.cc
|
| +++ b/cc/scheduler/scheduler_state_machine_unittest.cc
|
| @@ -1956,71 +1956,6 @@ TEST(SchedulerStateMachineTest, ReportIfNotDrawing) {
|
| EXPECT_FALSE(state.PendingDrawsShouldBeAborted());
|
| }
|
|
|
| -TEST(SchedulerStateMachineTest, ReportIfNotDrawingFromAcquiredTextures) {
|
| - SchedulerSettings default_scheduler_settings;
|
| - StateMachine state(default_scheduler_settings);
|
| - state.SetCanStart();
|
| - state.UpdateState(state.NextAction());
|
| - state.CreateAndInitializeOutputSurfaceWithActivatedCommit();
|
| - state.SetCanDraw(true);
|
| - state.SetVisible(true);
|
| - EXPECT_FALSE(state.PendingDrawsShouldBeAborted());
|
| -
|
| - state.SetMainThreadNeedsLayerTextures();
|
| - EXPECT_ACTION_UPDATE_STATE(
|
| - SchedulerStateMachine::ACTION_ACQUIRE_LAYER_TEXTURES_FOR_MAIN_THREAD);
|
| - EXPECT_TRUE(state.PendingDrawsShouldBeAborted());
|
| -
|
| - state.SetNeedsCommit();
|
| - state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting());
|
| - EXPECT_ACTION_UPDATE_STATE(
|
| - SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
|
| - EXPECT_TRUE(state.PendingDrawsShouldBeAborted());
|
| -
|
| - EXPECT_EQ(SchedulerStateMachine::ACTION_NONE, state.NextAction());
|
| -
|
| - state.NotifyBeginMainFrameStarted();
|
| - state.NotifyReadyToCommit();
|
| - EXPECT_TRUE(state.PendingDrawsShouldBeAborted());
|
| -
|
| - EXPECT_EQ(SchedulerStateMachine::ACTION_COMMIT, state.NextAction());
|
| -
|
| - state.UpdateState(state.NextAction());
|
| - EXPECT_FALSE(state.PendingDrawsShouldBeAborted());
|
| -}
|
| -
|
| -TEST(SchedulerStateMachineTest, AcquireTexturesWithAbort) {
|
| - SchedulerSettings default_scheduler_settings;
|
| - StateMachine state(default_scheduler_settings);
|
| - state.SetCanStart();
|
| - state.UpdateState(state.NextAction());
|
| - state.DidCreateAndInitializeOutputSurface();
|
| - state.SetCanDraw(true);
|
| - state.SetVisible(true);
|
| -
|
| - state.SetMainThreadNeedsLayerTextures();
|
| - EXPECT_EQ(
|
| - SchedulerStateMachine::ACTION_ACQUIRE_LAYER_TEXTURES_FOR_MAIN_THREAD,
|
| - state.NextAction());
|
| - state.UpdateState(state.NextAction());
|
| - EXPECT_TRUE(state.PendingDrawsShouldBeAborted());
|
| -
|
| - EXPECT_EQ(SchedulerStateMachine::ACTION_NONE, state.NextAction());
|
| -
|
| - state.SetNeedsCommit();
|
| - EXPECT_EQ(SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME,
|
| - state.NextAction());
|
| - state.UpdateState(state.NextAction());
|
| - EXPECT_TRUE(state.PendingDrawsShouldBeAborted());
|
| -
|
| - EXPECT_EQ(SchedulerStateMachine::ACTION_NONE, state.NextAction());
|
| -
|
| - state.BeginMainFrameAborted(true);
|
| -
|
| - EXPECT_EQ(SchedulerStateMachine::ACTION_NONE, state.NextAction());
|
| - EXPECT_FALSE(state.PendingDrawsShouldBeAborted());
|
| -}
|
| -
|
| TEST(SchedulerStateMachineTest, TestTriggerDeadlineEarlyAfterAbortedCommit) {
|
| SchedulerSettings settings;
|
| settings.impl_side_painting = true;
|
|
|