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

Unified Diff: components/scheduler/renderer/renderer_scheduler_impl_unittest.cc

Issue 1303353003: scheduler: Disable expensive timers during main thread user input (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments. Created 5 years, 4 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: components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
diff --git a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc b/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
index 4585b35ce91f019c9cb8ad9b5254c6c0a5932ad2..09a8438f10f80b1134b3571596803813cf9cb9c5 100644
--- a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
+++ b/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
@@ -138,6 +138,7 @@ void AnticipationTestTask(RendererSchedulerImpl* scheduler,
}
*is_anticipated_after = scheduler->IsHighPriorityWorkAnticipated();
}
+
}; // namespace
class RendererSchedulerImplForTest : public RendererSchedulerImpl {
@@ -618,33 +619,35 @@ TEST_F(RendererSchedulerImplTest, TestCompositorPolicy_DidAnimateForInput) {
std::string("I1")));
}
-TEST_F(RendererSchedulerImplTest,
- TestCompositorPolicy_TimersOnlyRunWhenIdle_MainThreadOnCriticalPath) {
+TEST_F(
+ RendererSchedulerImplTest,
+ TestCompositorPolicy_ExpensiveTimersDontRunWhenMainThreadOnCriticalPath) {
std::vector<std::string> run_order;
- PostTestTasks(&run_order, "C1 T1");
- scheduler_->DidAnimateForInputOnCompositorThread();
- scheduler_->WillBeginFrame(cc::BeginFrameArgs::Create(
- BEGINFRAME_FROM_HERE, clock_->NowTicks(), base::TimeTicks(),
- base::TimeDelta::FromMilliseconds(16), cc::BeginFrameArgs::NORMAL));
- scheduler_->DidCommitFrameToCompositor(); // Starts Idle Period
+ // Simulate a bunch of expensive timer tasks
+ for (int i = 0; i < 10; i++) {
+ timer_task_runner_->PostTask(
+ FROM_HERE, base::Bind(&base::SimpleTestTickClock::Advance,
+ base::Unretained(clock_.get()),
+ base::TimeDelta::FromMilliseconds(500)));
+ }
RunUntilIdle();
- EXPECT_THAT(run_order,
- testing::ElementsAre(std::string("C1"), std::string("T1")));
+ // Timers should now be disabled during main thread user userinteractions.
+ PostTestTasks(&run_order, "C1 T1");
- // End the idle period.
- clock_->Advance(base::TimeDelta::FromMilliseconds(500));
scheduler_->DidAnimateForInputOnCompositorThread();
scheduler_->WillBeginFrame(cc::BeginFrameArgs::Create(
BEGINFRAME_FROM_HERE, clock_->NowTicks(), base::TimeTicks(),
base::TimeDelta::FromMilliseconds(16), cc::BeginFrameArgs::NORMAL));
-
- run_order.clear();
- PostTestTasks(&run_order, "C1 T1");
RunUntilIdle();
EXPECT_THAT(run_order, testing::ElementsAre(std::string("C1")));
+ clock_->Advance(priority_escalation_after_input_duration() * 2);
+
+ run_order.clear();
+ RunUntilIdle();
+ EXPECT_THAT(run_order, testing::ElementsAre(std::string("T1")));
}
TEST_F(RendererSchedulerImplTest,
« no previous file with comments | « components/scheduler/renderer/renderer_scheduler_impl.cc ('k') | components/scheduler/renderer/task_cost_estimator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698