cc/scheduler/scheduler_state_machine_unittest.cc - Issue 23907006: cc: Allow sending BeginMainFrame before draw or activation

Unified Diff: cc/scheduler/scheduler_state_machine_unittest.cc

Issue 23907006: cc: Allow sending BeginMainFrame before draw or activation (Closed) Base URL: http://git.chromium.org/chromium/src.git@schedDeadline3

Patch Set: rebase Created 6 years, 10 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

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 a297cf8a874067e55e4d7c3795f39052746bf4f8..17e617c944a0fa0eae4c4541b65f0ab8d1d28a68 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 {

@@ -84,7 +78,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;

@@ -92,7 +86,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 {

@@ -184,6 +178,61 @@ TEST(SchedulerStateMachineTest, TestNextActionBeginsMainFrameIfNeeded) {

}

+// start_commit_before_activate_enabled = true

+TEST(SchedulerStateMachineTest, StartCommitBeforeActivateEnabled) {

+ SchedulerSettings scheduler_settings;

+ scheduler_settings.impl_side_painting = true;

+ scheduler_settings.start_commit_before_activate_enabled = true;

+ StateMachine state(scheduler_settings);

+ state.SetCommitState(SchedulerStateMachine::COMMIT_STATE_IDLE);

+ state.SetCanStart();

+ state.UpdateState(state.NextAction());

+ state.CreateAndInitializeOutputSurfaceWithActivatedCommit();

+ state.SetNeedsRedraw(false);

+ state.SetVisible(true);

+ state.SetCanDraw(true);

+ state.SetNeedsCommit();

+ EXPECT_TRUE(state.BeginImplFrameNeeded());

+ // Commit to the pending tree.

+ state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting());

+ EXPECT_ACTION_UPDATE_STATE(

+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);

+ EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);

+ state.FinishCommit();

+ EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT);

+ EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);

+ state.OnBeginImplFrameDeadline();

+ EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);

+ // Verify that the next commit starts while there is still a pending tree.

+ state.SetNeedsCommit();

+ state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting());

+ EXPECT_ACTION_UPDATE_STATE(

+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);

+ EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);

+ // Verify the pending commit doesn't overwrite the pending

+ // tree until the pending tree has been activated.

+ state.FinishCommit();

+ EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);

+ // Verify NotifyReadyToActivate unblocks activation, draw, and

+ // commit in that order.

+ state.NotifyReadyToActivate();

+ EXPECT_ACTION_UPDATE_STATE(

+ SchedulerStateMachine::ACTION_ACTIVATE_PENDING_TREE);

+ EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);

+ EXPECT_TRUE(state.ShouldTriggerBeginImplFrameDeadlineEarly());

+ state.OnBeginImplFrameDeadline();

+ EXPECT_ACTION_UPDATE_STATE(

+ SchedulerStateMachine::ACTION_DRAW_AND_SWAP_IF_POSSIBLE);

+ EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT);

+ EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);

TEST(SchedulerStateMachineTest,

TestFailedDrawForAnimationCheckerboardSetsNeedsCommitAndDoesNotDrawAgain) {

SchedulerSettings default_scheduler_settings;

@@ -331,6 +380,8 @@ TEST(SchedulerStateMachineTest,

// The redraw should be forced at the end of the next BeginImplFrame.

state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting());

+ EXPECT_ACTION_UPDATE_STATE(

+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);

EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);

state.OnBeginImplFrameDeadline();

EXPECT_ACTION_UPDATE_STATE(

@@ -517,19 +568,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());

@@ -546,15 +592,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;

@@ -563,13 +605,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();

}

@@ -640,8 +682,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);

@@ -712,20 +752,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) {

@@ -756,8 +796,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

@@ -807,8 +846,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.

@@ -1095,8 +1133,7 @@ TEST(SchedulerStateMachineTest, TestContextLostWhileCommitInProgress) {

// 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

@@ -1157,8 +1194,7 @@ TEST(SchedulerStateMachineTest,

// 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);

@@ -1216,8 +1252,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);

@@ -1244,8 +1278,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);

@@ -1354,8 +1386,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);

}

@@ -1373,8 +1404,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

@@ -1442,8 +1472,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);

@@ -1478,8 +1507,7 @@ TEST(SchedulerStateMachineTest, TestImmediateFinishCommitDuringCommit) {

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);

@@ -1512,8 +1540,7 @@ TEST(SchedulerStateMachineTest, 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);

@@ -1553,8 +1580,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);

« cc/scheduler/scheduler_state_machine.cc ('K') | « cc/scheduler/scheduler_state_machine.cc ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | ui/compositor/compositor.cc » ('J')