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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/scheduler/scheduler_unittest.cc

Issue 1229573004: cc: Simplify and rename MainThreadIsInHighLatency logic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ignoreFirstDraws4
Patch Set: Update naming and conventions Created 5 years, 5 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
« cc/scheduler/scheduler_state_machine.cc ('K') | « cc/scheduler/scheduler_state_machine.cc ('k') | cc/test/scheduler_test_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler/scheduler_unittest.cc
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
index 9323be623b4c9a201d3ffcf254140727e18bffa6..e6d36c487e7c2197b5b6c09dfe5d743e35f04a62 100644
--- a/cc/scheduler/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc
@@ -1299,11 +1299,11 @@ void SchedulerTest::CheckMainFrameSkippedAfterLateCommit(
bool expect_send_begin_main_frame) {
// Impl thread hits deadline before commit finishes.
scheduler_->SetNeedsCommit();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_SCOPED(AdvanceFrame());
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
scheduler_->NotifyBeginMainFrameStarted();
scheduler_->NotifyReadyToCommit();
scheduler_->NotifyReadyToActivate();
@@ -1312,16 +1312,16 @@ void SchedulerTest::CheckMainFrameSkippedAfterLateCommit(
EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client_, 2, 5);
EXPECT_ACTION("ScheduledActionCommit", client_, 3, 5);
EXPECT_ACTION("ScheduledActionActivateSyncTree", client_, 4, 5);
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
client_->Reset();
scheduler_->SetNeedsCommit();
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_SCOPED(AdvanceFrame());
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
EXPECT_EQ(expect_send_begin_main_frame,
- scheduler_->MainThreadIsInHighLatencyMode());
+ scheduler_->MainThreadMissedLastDeadline());
EXPECT_EQ(expect_send_begin_main_frame,
client_->HasAction("ScheduledActionSendBeginMainFrame"));
}
@@ -1419,7 +1419,7 @@ void SchedulerTest::ImplFrameSkippedAfterLateSwapAck_MainThreadMakesDeadline(
client_->Reset();
scheduler_->SetNeedsCommit();
scheduler_->SetNeedsRedraw();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
EXPECT_ACTION("SetNeedsBeginFrames(true)", client_, 0, 4);
EXPECT_ACTION("WillBeginImplFrame", client_, 1, 4);
@@ -1430,7 +1430,7 @@ void SchedulerTest::ImplFrameSkippedAfterLateSwapAck_MainThreadMakesDeadline(
scheduler_->NotifyBeginMainFrameStarted();
scheduler_->NotifyReadyToCommit();
scheduler_->NotifyReadyToActivate();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
EXPECT_ACTION("ScheduledActionCommit", client_, 0, 4);
EXPECT_ACTION("ScheduledActionActivateSyncTree", client_, 1, 4);
@@ -1445,12 +1445,12 @@ void SchedulerTest::ImplFrameSkippedAfterLateSwapAck_MainThreadMakesDeadline(
client_->Reset();
scheduler_->SetNeedsCommit();
scheduler_->SetNeedsRedraw();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
// Verify that we skip the BeginImplFrame
EXPECT_NO_ACTION(client_);
EXPECT_FALSE(scheduler_->BeginImplFrameDeadlinePending());
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
// Verify that we do not perform any actions after we are no longer
// swap throttled.
@@ -1469,7 +1469,7 @@ void SchedulerTest::ImplFrameSkippedAfterLateSwapAck_MainThreadMakesDeadline(
// Verify that we start the next BeginImplFrame and continue normally
// after having just skipped a BeginImplFrame.
client_->Reset();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
EXPECT_ACTION("WillBeginImplFrame", client_, 0, 3);
EXPECT_ACTION("ScheduledActionAnimate", client_, 1, 3);
@@ -1553,14 +1553,14 @@ TEST_F(SchedulerTest,
// Draw and swap for first BeginFrame
client_->Reset();
scheduler_->SetNeedsRedraw();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
EXPECT_ACTION("SetNeedsBeginFrames(true)", client_, 0, 3);
EXPECT_ACTION("WillBeginImplFrame", client_, 1, 3);
EXPECT_ACTION("ScheduledActionAnimate", client_, 2, 3);
client_->Reset();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
EXPECT_SINGLE_ACTION("ScheduledActionDrawAndSwapIfPossible", client_);
@@ -1571,12 +1571,12 @@ TEST_F(SchedulerTest,
// BeginImplFrame puts the impl thread in high latency mode.
client_->Reset();
scheduler_->SetNeedsRedraw();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
// Verify that we skip the BeginImplFrame
EXPECT_NO_ACTION(client_);
EXPECT_FALSE(scheduler_->BeginImplFrameDeadlinePending());
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
// Verify that we do not perform any actions after we are no longer
// swap throttled.
@@ -1588,7 +1588,7 @@ TEST_F(SchedulerTest,
// Verify that we start the next BeginImplFrame and continue normally
// after having just skipped a BeginImplFrame.
client_->Reset();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2);
EXPECT_ACTION("ScheduledActionAnimate", client_, 1, 2);
@@ -1607,7 +1607,7 @@ void SchedulerTest::ImplFrameIsNotSkippedAfterLateSwapAck() {
// Draw and swap for first BeginFrame
client_->Reset();
scheduler_->SetNeedsCommit();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
EXPECT_ACTION("SetNeedsBeginFrames(true)", client_, 0, 3);
EXPECT_ACTION("WillBeginImplFrame", client_, 1, 3);
@@ -1617,7 +1617,7 @@ void SchedulerTest::ImplFrameIsNotSkippedAfterLateSwapAck() {
scheduler_->NotifyBeginMainFrameStarted();
scheduler_->NotifyReadyToCommit();
scheduler_->NotifyReadyToActivate();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
EXPECT_ACTION("ScheduledActionCommit", client_, 0, 4);
EXPECT_ACTION("ScheduledActionActivateSyncTree", client_, 1, 4);
@@ -1631,11 +1631,11 @@ void SchedulerTest::ImplFrameIsNotSkippedAfterLateSwapAck() {
// puts the impl thread in high latency mode.
client_->Reset();
scheduler_->SetNeedsCommit();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
EXPECT_SINGLE_ACTION("WillBeginImplFrame", client_);
EXPECT_TRUE(scheduler_->BeginImplFrameDeadlinePending());
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
client_->Reset();
scheduler_->DidSwapBuffersComplete();
@@ -1716,18 +1716,18 @@ TEST_F(SchedulerTest,
client_->SetAutomaticSwapAck(false);
// Impl thread hits deadline before commit finishes to make
- // MainThreadIsInHighLatencyMode true
+ // MainThreadMissedLastDeadline true
client_->Reset();
scheduler_->SetNeedsCommit();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_SCOPED(AdvanceFrame());
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
scheduler_->NotifyBeginMainFrameStarted();
scheduler_->NotifyReadyToCommit();
scheduler_->NotifyReadyToActivate();
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_ACTION("SetNeedsBeginFrames(true)", client_, 0, 5);
EXPECT_ACTION("WillBeginImplFrame", client_, 1, 5);
@@ -1738,9 +1738,9 @@ TEST_F(SchedulerTest,
// Draw and swap for first commit, start second commit.
client_->Reset();
scheduler_->SetNeedsCommit();
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_SCOPED(AdvanceFrame());
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
scheduler_->NotifyBeginMainFrameStarted();
scheduler_->NotifyReadyToCommit();
@@ -1757,9 +1757,9 @@ TEST_F(SchedulerTest,
// to put the impl thread in a high latency mode.
client_->Reset();
scheduler_->SetNeedsCommit();
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_SCOPED(AdvanceFrame());
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2);
@@ -1768,7 +1768,7 @@ TEST_F(SchedulerTest,
// swap ack backpressure, not because of latency recovery.
EXPECT_FALSE(client_->HasAction("ScheduledActionSendBeginMainFrame"));
EXPECT_FALSE(client_->HasAction("ScheduledActionDrawAndSwapIfPossible"));
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_TRUE(scheduler_->WasSwapThrottledAtLastBeginFrame());
// Lower estimates so that the scheduler will attempt latency recovery.
@@ -1784,12 +1784,12 @@ TEST_F(SchedulerTest,
// Previous commit request is still outstanding.
EXPECT_TRUE(scheduler_->NeedsCommit());
SendNextBeginFrame();
- EXPECT_TRUE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_TRUE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_TRUE(scheduler_->WasSwapThrottledAtLastBeginFrame());
scheduler_->DidSwapBuffersComplete();
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_ACTION("WillBeginImplFrame", client_, 0, 3);
EXPECT_ACTION("ScheduledActionAnimate", client_, 1, 3);
EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client_, 2, 3);
@@ -1798,12 +1798,12 @@ TEST_F(SchedulerTest,
client_->Reset();
// Previous commit request is still outstanding.
EXPECT_TRUE(scheduler_->NeedsCommit());
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
scheduler_->DidSwapBuffersComplete();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_NO_ACTION(client_);
@@ -1811,16 +1811,16 @@ TEST_F(SchedulerTest,
client_->Reset();
// Previous commit request is still outstanding.
EXPECT_TRUE(scheduler_->NeedsCommit());
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
SendNextBeginFrame();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
scheduler_->NotifyBeginMainFrameStarted();
scheduler_->NotifyReadyToCommit();
scheduler_->NotifyReadyToActivate();
task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
scheduler_->DidSwapBuffersComplete();
- EXPECT_FALSE(scheduler_->MainThreadIsInHighLatencyMode());
+ EXPECT_FALSE(scheduler_->MainThreadMissedLastDeadline());
EXPECT_ACTION("WillBeginImplFrame", client_, 0, 6);
EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client_, 1, 6);
« cc/scheduler/scheduler_state_machine.cc ('K') | « cc/scheduler/scheduler_state_machine.cc ('k') | cc/test/scheduler_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698