Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4575)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/scheduler/scheduler_state_machine_unittest.cc

Issue 164373012: Remove options to disable deadline scheduling (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
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
« no previous file with comments | « cc/scheduler/scheduler_state_machine.cc ('k') | cc/scheduler/scheduler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e3963f23c0bdbdbc9aead0089dff408019d62d17..daad727aee9db98899db35d7da6a811288ec667d 100644
--- a/cc/scheduler/scheduler_state_machine_unittest.cc
+++ b/cc/scheduler/scheduler_state_machine_unittest.cc
@@ -276,11 +276,10 @@ TEST(SchedulerStateMachineTest,
EXPECT_TRUE(state.RedrawPending());
}
-void TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit(
- bool deadline_scheduling_enabled) {
+TEST(SchedulerStateMachineTest,
+ TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit) {
SchedulerSettings scheduler_settings;
scheduler_settings.maximum_number_of_failed_draws_before_draw_is_forced_ = 1;
- scheduler_settings.deadline_scheduling_enabled = deadline_scheduling_enabled;
StateMachine state(scheduler_settings);
state.SetCanStart();
state.UpdateState(state.NextAction());
@@ -290,16 +289,10 @@ void TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit(
// Start a commit.
state.SetNeedsCommit();
- if (!deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting());
- if (deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
+ EXPECT_ACTION_UPDATE_STATE(
+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
EXPECT_TRUE(state.CommitPending());
@@ -333,27 +326,11 @@ void TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit(
SchedulerStateMachine::ACTION_DRAW_AND_SWAP_FORCED);
}
-TEST(SchedulerStateMachineTest,
- TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit) {
- bool deadline_scheduling_enabled = false;
- TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit(
- deadline_scheduling_enabled);
-}
-
-TEST(SchedulerStateMachineTest,
- TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit_Deadline) {
- bool deadline_scheduling_enabled = true;
- TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit(
- deadline_scheduling_enabled);
-}
-
-void TestFailedDrawsDoNotRestartForcedDraw(
- bool deadline_scheduling_enabled) {
+TEST(SchedulerStateMachineTest, TestFailedDrawsDoNotRestartForcedDraw) {
SchedulerSettings scheduler_settings;
int draw_limit = 1;
scheduler_settings.maximum_number_of_failed_draws_before_draw_is_forced_ =
draw_limit;
- scheduler_settings.deadline_scheduling_enabled = deadline_scheduling_enabled;
scheduler_settings.impl_side_painting = true;
StateMachine state(scheduler_settings);
state.SetCanStart();
@@ -364,16 +341,10 @@ void TestFailedDrawsDoNotRestartForcedDraw(
// Start a commit.
state.SetNeedsCommit();
- if (!deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting());
- if (deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
+ EXPECT_ACTION_UPDATE_STATE(
+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
EXPECT_TRUE(state.CommitPending());
@@ -418,20 +389,6 @@ void TestFailedDrawsDoNotRestartForcedDraw(
SchedulerStateMachine::FORCED_REDRAW_STATE_WAITING_FOR_ACTIVATION);
}
-TEST(SchedulerStateMachineTest,
- TestFailedDrawsDoNotRestartForcedDraw) {
- bool deadline_scheduling_enabled = false;
- TestFailedDrawsDoNotRestartForcedDraw(
- deadline_scheduling_enabled);
-}
-
-TEST(SchedulerStateMachineTest,
- TestFailedDrawsDoNotRestartForcedDraw_Deadline) {
- bool deadline_scheduling_enabled = true;
- TestFailedDrawsDoNotRestartForcedDraw(
- deadline_scheduling_enabled);
-}
-
TEST(SchedulerStateMachineTest, TestFailedDrawIsRetriedInNextBeginImplFrame) {
SchedulerSettings default_scheduler_settings;
StateMachine state(default_scheduler_settings);
@@ -1091,9 +1048,8 @@ TEST(SchedulerStateMachineTest,
state.NextAction());
}
-void TestContextLostWhileCommitInProgress(bool deadline_scheduling_enabled) {
+TEST(SchedulerStateMachineTest, TestContextLostWhileCommitInProgress) {
SchedulerSettings scheduler_settings;
- scheduler_settings.deadline_scheduling_enabled = deadline_scheduling_enabled;
StateMachine state(scheduler_settings);
state.SetCanStart();
state.UpdateState(state.NextAction());
@@ -1103,18 +1059,12 @@ void TestContextLostWhileCommitInProgress(bool deadline_scheduling_enabled) {
// Get a commit in flight.
state.SetNeedsCommit();
- if (!deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
// Set damage and expect a draw.
state.SetNeedsRedraw(true);
state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting());
- if (deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
+ EXPECT_ACTION_UPDATE_STATE(
+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
state.OnBeginImplFrameDeadline();
EXPECT_ACTION_UPDATE_STATE(
@@ -1160,20 +1110,9 @@ void TestContextLostWhileCommitInProgress(bool deadline_scheduling_enabled) {
EXPECT_EQ(SchedulerStateMachine::ACTION_NONE, state.NextAction());
}
-TEST(SchedulerStateMachineTest, TestContextLostWhileCommitInProgress) {
- bool deadline_scheduling_enabled = false;
- TestContextLostWhileCommitInProgress(deadline_scheduling_enabled);
-}
-
-TEST(SchedulerStateMachineTest, TestContextLostWhileCommitInProgress_Deadline) {
- bool deadline_scheduling_enabled = true;
- TestContextLostWhileCommitInProgress(deadline_scheduling_enabled);
-}
-
-void TestContextLostWhileCommitInProgressAndAnotherCommitRequested(
- bool deadline_scheduling_enabled) {
+TEST(SchedulerStateMachineTest,
+ TestContextLostWhileCommitInProgressAndAnotherCommitRequested) {
SchedulerSettings scheduler_settings;
- scheduler_settings.deadline_scheduling_enabled = deadline_scheduling_enabled;
StateMachine state(scheduler_settings);
state.SetCanStart();
state.UpdateState(state.NextAction());
@@ -1183,19 +1122,13 @@ void TestContextLostWhileCommitInProgressAndAnotherCommitRequested(
// Get a commit in flight.
state.SetNeedsCommit();
- if (!deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
// Set damage and expect a draw.
state.SetNeedsRedraw(true);
state.OnBeginImplFrame(BeginFrameArgs::CreateForTesting());
- if (deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
+ EXPECT_ACTION_UPDATE_STATE(
+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
state.OnBeginImplFrameDeadline();
EXPECT_ACTION_UPDATE_STATE(
@@ -1259,20 +1192,6 @@ void TestContextLostWhileCommitInProgressAndAnotherCommitRequested(
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
}
-TEST(SchedulerStateMachineTest,
- TestContextLostWhileCommitInProgressAndAnotherCommitRequested) {
- bool deadline_scheduling_enabled = false;
- TestContextLostWhileCommitInProgressAndAnotherCommitRequested(
- deadline_scheduling_enabled);
-}
-
-TEST(SchedulerStateMachineTest,
- TestContextLostWhileCommitInProgressAndAnotherCommitRequested_Deadline) {
- bool deadline_scheduling_enabled = true;
- TestContextLostWhileCommitInProgressAndAnotherCommitRequested(
- deadline_scheduling_enabled);
-}
-
TEST(SchedulerStateMachineTest, TestFinishAllRenderingWhileContextLost) {
SchedulerSettings default_scheduler_settings;
StateMachine state(default_scheduler_settings);
@@ -1488,9 +1407,8 @@ TEST(SchedulerStateMachineTest, TestImmediateFinishCommit) {
state.CommitState());
}
-void TestImmediateFinishCommitDuringCommit(bool deadline_scheduling_enabled) {
+TEST(SchedulerStateMachineTest, TestImmediateFinishCommitDuringCommit) {
SchedulerSettings scheduler_settings;
- scheduler_settings.deadline_scheduling_enabled = deadline_scheduling_enabled;
StateMachine state(scheduler_settings);
state.SetCanStart();
state.UpdateState(state.NextAction());
@@ -1500,18 +1418,12 @@ void TestImmediateFinishCommitDuringCommit(bool deadline_scheduling_enabled) {
// Start a normal commit.
state.SetNeedsCommit();
- if (!deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
// Schedule a readback, commit it, draw it.
state.SetNeedsForcedCommitForReadback();
- if (deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
+ EXPECT_ACTION_UPDATE_STATE(
+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
state.FinishCommit();
EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_READY_TO_COMMIT,
@@ -1531,21 +1443,8 @@ void TestImmediateFinishCommitDuringCommit(bool deadline_scheduling_enabled) {
<< *state.AsValue();
}
-TEST(SchedulerStateMachineTest, TestImmediateFinishCommitDuringCommit) {
- bool deadline_scheduling_enabled = false;
- TestImmediateFinishCommitDuringCommit(deadline_scheduling_enabled);
-}
-
-TEST(SchedulerStateMachineTest,
- TestImmediateFinishCommitDuringCommit_Deadline) {
- bool deadline_scheduling_enabled = true;
- TestImmediateFinishCommitDuringCommit(deadline_scheduling_enabled);
-}
-
-void ImmediateBeginMainFrameAbortedWhileInvisible(
- bool deadline_scheduling_enabled) {
+TEST(SchedulerStateMachineTest, ImmediateBeginMainFrameAbortedWhileInvisible) {
SchedulerSettings scheduler_settings;
- scheduler_settings.deadline_scheduling_enabled = deadline_scheduling_enabled;
StateMachine state(scheduler_settings);
state.SetCanStart();
state.UpdateState(state.NextAction());
@@ -1554,18 +1453,12 @@ void ImmediateBeginMainFrameAbortedWhileInvisible(
state.SetCanDraw(true);
state.SetNeedsCommit();
- if (!deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
state.SetNeedsCommit();
state.SetNeedsForcedCommitForReadback();
- if (deadline_scheduling_enabled) {
- EXPECT_ACTION_UPDATE_STATE(
- SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
- }
+ EXPECT_ACTION_UPDATE_STATE(
+ SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
state.FinishCommit();
EXPECT_EQ(SchedulerStateMachine::COMMIT_STATE_READY_TO_COMMIT,
@@ -1593,20 +1486,6 @@ void ImmediateBeginMainFrameAbortedWhileInvisible(
EXPECT_TRUE(state.NeedsCommit());
}
-TEST(SchedulerStateMachineTest,
- ImmediateBeginMainFrameAbortedWhileInvisible) {
- bool deadline_scheduling_enabled = false;
- ImmediateBeginMainFrameAbortedWhileInvisible(
- deadline_scheduling_enabled);
-}
-
-TEST(SchedulerStateMachineTest,
- ImmediateBeginMainFrameAbortedWhileInvisible_Deadline) {
- bool deadline_scheduling_enabled = true;
- ImmediateBeginMainFrameAbortedWhileInvisible(
- deadline_scheduling_enabled);
-}
-
TEST(SchedulerStateMachineTest, ImmediateFinishCommitWhileCantDraw) {
SchedulerSettings default_scheduler_settings;
StateMachine state(default_scheduler_settings);
@@ -1730,10 +1609,8 @@ TEST(SchedulerStateMachineTest, AcquireTexturesWithAbort) {
EXPECT_FALSE(state.PendingDrawsShouldBeAborted());
}
-TEST(SchedulerStateMachineTest,
- TestTriggerDeadlineEarlyAfterAbortedCommit) {
+TEST(SchedulerStateMachineTest, TestTriggerDeadlineEarlyAfterAbortedCommit) {
SchedulerSettings settings;
- settings.deadline_scheduling_enabled = true;
settings.impl_side_painting = true;
StateMachine state(settings);
state.SetCanStart();
@@ -1767,7 +1644,6 @@ TEST(SchedulerStateMachineTest,
TEST(SchedulerStateMachineTest, TestTriggerDeadlineEarlyForSmoothness) {
SchedulerSettings settings;
- settings.deadline_scheduling_enabled = true;
settings.impl_side_painting = true;
StateMachine state(settings);
state.SetCanStart();
« no previous file with comments | « cc/scheduler/scheduler_state_machine.cc ('k') | cc/scheduler/scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698