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 4b95f99c8a47d84a745d236770b6b3ab9c1cff5e..9580d14f098c1c557907478a79592b7bc26d075e 100644 |
--- a/cc/scheduler/scheduler_state_machine_unittest.cc |
+++ b/cc/scheduler/scheduler_state_machine_unittest.cc |
@@ -11,11 +11,6 @@ |
EXPECT_EQ(action, state.NextAction()) << *state.AsValue(); \ |
if (action == SchedulerStateMachine::ACTION_DRAW_AND_SWAP_IF_POSSIBLE || \ |
action == SchedulerStateMachine::ACTION_DRAW_AND_SWAP_FORCED) { \ |
- if (SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW == \ |
- state.CommitState() && \ |
- SchedulerStateMachine::OUTPUT_SURFACE_ACTIVE != \ |
- state.output_surface_state()) \ |
- return; \ |
EXPECT_EQ(SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_INSIDE_DEADLINE, \ |
state.begin_impl_frame_state()) \ |
<< *state.AsValue(); \ |
@@ -43,8 +38,7 @@ const SchedulerStateMachine::BeginImplFrameState all_begin_impl_frame_states[] = |
const SchedulerStateMachine::CommitState all_commit_states[] = { |
SchedulerStateMachine::COMMIT_STATE_IDLE, |
SchedulerStateMachine::COMMIT_STATE_FRAME_IN_PROGRESS, |
- SchedulerStateMachine::COMMIT_STATE_READY_TO_COMMIT, |
- SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, }; |
+ SchedulerStateMachine::COMMIT_STATE_READY_TO_COMMIT, }; |
// Exposes the protected state fields of the SchedulerStateMachine for testing |
class StateMachine : public SchedulerStateMachine { |
@@ -82,7 +76,7 @@ class StateMachine : public SchedulerStateMachine { |
void SetNeedsForcedRedrawForTimeout(bool b) { |
forced_redraw_state_ = FORCED_REDRAW_STATE_WAITING_FOR_COMMIT; |
- commit_state_ = COMMIT_STATE_WAITING_FOR_FIRST_DRAW; |
+ active_tree_needs_first_draw_ = true; |
} |
bool NeedsForcedRedrawForTimeout() const { |
return forced_redraw_state_ != FORCED_REDRAW_STATE_IDLE; |
@@ -90,7 +84,7 @@ class StateMachine : public SchedulerStateMachine { |
void SetNeedsForcedRedrawForReadback() { |
readback_state_ = READBACK_STATE_WAITING_FOR_DRAW_AND_READBACK; |
- commit_state_ = COMMIT_STATE_WAITING_FOR_FIRST_DRAW; |
+ active_tree_needs_first_draw_ = true; |
} |
bool NeedsForcedRedrawForReadback() const { |
@@ -322,11 +316,19 @@ void TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit( |
// continue the commit as usual. |
state.FinishCommit(); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
+ if (!deadline_scheduling_enabled) { |
+ EXPECT_ACTION_UPDATE_STATE( |
+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME); |
+ } |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE); |
EXPECT_TRUE(state.RedrawPending()); |
// The redraw should be forced at the end of the next BeginImplFrame. |
state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting()); |
+ if (deadline_scheduling_enabled) { |
+ EXPECT_ACTION_UPDATE_STATE( |
+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME); |
+ } |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE); |
state.OnBeginImplFrameDeadline(); |
EXPECT_ACTION_UPDATE_STATE( |
@@ -549,19 +551,14 @@ TEST(SchedulerStateMachineTest, TestNextActionDrawsOnBeginImplFrame) { |
} |
} |
- // When in BeginImplFrame deadline we should always draw for SetNeedsRedraw or |
- // SetNeedsForcedRedrawForReadback have been called... except if we're |
- // ready to commit, in which case we expect a commit first. |
+ // When in BeginImplFrame deadline we should always draw for SetNeedsRedraw |
+ // except if we're ready to commit, in which case we expect a commit first. |
+ // SetNeedsForcedRedrawForReadback should take precedence over all and |
+ // issue a readback. |
for (size_t i = 0; i < num_commit_states; ++i) { |
for (size_t j = 0; j < 2; ++j) { |
bool request_readback = j; |
- // Skip invalid states |
- if (request_readback && |
- (SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW != |
- all_commit_states[i])) |
- continue; |
- |
StateMachine state(default_scheduler_settings); |
state.SetCanStart(); |
state.UpdateState(state.NextAction()); |
@@ -578,15 +575,11 @@ TEST(SchedulerStateMachineTest, TestNextActionDrawsOnBeginImplFrame) { |
} |
SchedulerStateMachine::Action expected_action; |
- if (all_commit_states[i] == |
- SchedulerStateMachine::COMMIT_STATE_READY_TO_COMMIT) { |
+ if (request_readback) { |
+ expected_action = SchedulerStateMachine::ACTION_DRAW_AND_READBACK; |
+ } else if (all_commit_states[i] == |
+ SchedulerStateMachine::COMMIT_STATE_READY_TO_COMMIT) { |
expected_action = SchedulerStateMachine::ACTION_COMMIT; |
- } else if (request_readback) { |
- if (all_commit_states[i] == |
- SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW) |
- expected_action = SchedulerStateMachine::ACTION_DRAW_AND_READBACK; |
- else |
- expected_action = SchedulerStateMachine::ACTION_NONE; |
} else { |
expected_action = |
SchedulerStateMachine::ACTION_DRAW_AND_SWAP_IF_POSSIBLE; |
@@ -595,13 +588,13 @@ TEST(SchedulerStateMachineTest, TestNextActionDrawsOnBeginImplFrame) { |
// Case 1: needs_commit=false. |
EXPECT_NE(state.BeginImplFrameNeeded(), request_readback) |
<< *state.AsValue(); |
- EXPECT_EQ(expected_action, state.NextAction()) << *state.AsValue(); |
+ EXPECT_EQ(state.NextAction(), expected_action) << *state.AsValue(); |
// Case 2: needs_commit=true. |
state.SetNeedsCommit(); |
EXPECT_NE(state.BeginImplFrameNeeded(), request_readback) |
<< *state.AsValue(); |
- EXPECT_EQ(expected_action, state.NextAction()) << *state.AsValue(); |
+ EXPECT_EQ(state.NextAction(), expected_action) << *state.AsValue(); |
} |
} |
} |
@@ -672,8 +665,6 @@ TEST(SchedulerStateMachineTest, |
state.UpdateState(state.NextAction()); |
state.CreateAndInitializeOutputSurfaceWithActivatedCommit(); |
- state.SetCommitState( |
- SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW); |
state.SetActiveTreeNeedsFirstDraw(true); |
state.SetNeedsCommit(); |
state.SetNeedsRedraw(true); |
@@ -744,20 +735,20 @@ TEST(SchedulerStateMachineTest, TestsetNeedsCommitIsNotLost) { |
state.begin_impl_frame_state()); |
EXPECT_EQ(SchedulerStateMachine::ACTION_COMMIT, state.NextAction()); |
- // Commit and make sure we draw on next BeginImplFrame |
+ // Finish the commit, then make sure we start the next commit immediately |
+ // and draw on the next BeginImplFrame. |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
+ EXPECT_ACTION_UPDATE_STATE( |
+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE); |
+ |
state.OnBeginImplFrameDeadline(); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
- EXPECT_ACTION_UPDATE_STATE( |
- SchedulerStateMachine::ACTION_DRAW_AND_SWAP_IF_POSSIBLE); |
- state.DidDrawIfPossibleCompleted(DrawSwapReadbackResult::DRAW_SUCCESS); |
- // Verify that another commit will start immediately after draw. |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_ACTION_UPDATE_STATE( |
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME); |
+ SchedulerStateMachine::ACTION_DRAW_AND_SWAP_IF_POSSIBLE); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE); |
+ state.DidDrawIfPossibleCompleted(DrawSwapReadbackResult::DRAW_SUCCESS); |
} |
TEST(SchedulerStateMachineTest, TestFullCycle) { |
@@ -788,8 +779,7 @@ TEST(SchedulerStateMachineTest, TestFullCycle) { |
// Commit. |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_TRUE(state.needs_redraw()); |
// Expect to do nothing until BeginImplFrame deadline |
@@ -839,8 +829,7 @@ TEST(SchedulerStateMachineTest, TestFullCycleWithCommitRequestInbetween) { |
// First commit. |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_TRUE(state.needs_redraw()); |
// Expect to do nothing until BeginImplFrame deadline. |
@@ -1134,8 +1123,7 @@ void TestContextLostWhileCommitInProgress(bool deadline_scheduling_enabled) { |
// We will abort the draw when the output surface is lost if we are |
// waiting for the first draw to unblock the main thread. |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_SWAP_ABORT); |
// Expect to begin context recreation only in BEGIN_IMPL_FRAME_STATE_IDLE |
@@ -1213,8 +1201,7 @@ void TestContextLostWhileCommitInProgressAndAnotherCommitRequested( |
// Finish the frame, and commit. |
state.FinishCommit(); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
// Because the output surface is missing, we expect the draw to abort. |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_SWAP_ABORT); |
@@ -1286,8 +1273,6 @@ TEST(SchedulerStateMachineTest, TestFinishAllRenderingWhileContextLost) { |
state.DidLoseOutputSurface(); |
// Ask a forced redraw for readback and verify it ocurrs. |
- state.SetCommitState( |
- SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW); |
state.SetNeedsForcedRedrawForReadback(); |
state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_READBACK); |
@@ -1314,8 +1299,6 @@ TEST(SchedulerStateMachineTest, TestFinishAllRenderingWhileContextLost) { |
SchedulerStateMachine::ACTION_BEGIN_OUTPUT_SURFACE_CREATION); |
// Ask a readback and verify it occurs. |
- state.SetCommitState( |
- SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW); |
state.SetNeedsForcedRedrawForReadback(); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_READBACK); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE); |
@@ -1385,8 +1368,7 @@ TEST(SchedulerStateMachineTest, TestFinishCommitWhenCommitInProgress) { |
EXPECT_EQ(SchedulerStateMachine::ACTION_COMMIT, state.NextAction()); |
state.UpdateState(state.NextAction()); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_SWAP_ABORT); |
} |
@@ -1405,8 +1387,7 @@ TEST(SchedulerStateMachineTest, TestFinishCommitWhenForcedCommitInProgress) { |
state.FinishCommit(); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_READBACK); |
// When the readback interrupts the normal commit, we should not get |
@@ -1475,8 +1456,7 @@ TEST(SchedulerStateMachineTest, TestImmediateFinishCommit) { |
state.CommitState()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_READBACK); |
state.DidDrawIfPossibleCompleted(DrawSwapReadbackResult::DRAW_SUCCESS); |
@@ -1518,8 +1498,7 @@ void TestImmediateFinishCommitDuringCommit(bool deadline_scheduling_enabled) { |
state.CommitState()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_READBACK); |
state.DidDrawIfPossibleCompleted(DrawSwapReadbackResult::DRAW_SUCCESS); |
@@ -1572,8 +1551,7 @@ void ImmediateBeginMainFrameAbortedWhileInvisible( |
state.CommitState()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_READBACK); |
state.DidDrawIfPossibleCompleted(DrawSwapReadbackResult::DRAW_SUCCESS); |
@@ -1628,8 +1606,7 @@ TEST(SchedulerStateMachineTest, ImmediateFinishCommitWhileCantDraw) { |
state.CommitState()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); |
- EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_WAITING_FOR_FIRST_DRAW, |
- state.CommitState()); |
+ EXPECT_TRUE(state.active_tree_needs_first_draw()); |
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_READBACK); |
state.DidDrawIfPossibleCompleted(DrawSwapReadbackResult::DRAW_SUCCESS); |