diff options
| author | Sami Kyostila <skyostil@google.com> | 2015-10-06 01:45:00 +0100 |
|---|---|---|
| committer | Sami Kyostila <skyostil@google.com> | 2015-10-06 00:46:50 +0000 |
| commit | edfcd0fe451d9365379c9ade6fc60afdd3394555 (patch) | |
| tree | 8284c0eb0bf39b3bbbd77aa5213b8f85ba43f3d6 | |
| parent | d3344e774b536b7f0ae9a40d507679baf0280d4f (diff) | |
| download | chromium_src-edfcd0fe451d9365379c9ade6fc60afdd3394555.zip chromium_src-edfcd0fe451d9365379c9ade6fc60afdd3394555.tar.gz chromium_src-edfcd0fe451d9365379c9ade6fc60afdd3394555.tar.bz2 | |
scheduler: Disable blocking of expensive timers
Disable blocking expensive timers during user gestures as the amount of
idle time is currently being under-estimated and this is causing some
breakage in some touch/mouse drag use cases.
BUG=529245
TBR=alexclarke@chromium.org
Review URL: https://codereview.chromium.org/1372233004
Cr-Commit-Position: refs/heads/master@{#352049}
(cherry picked from commit e62b1fef98264ada8ae8b48c3aed9f0ebb65f86b)
Review URL: https://codereview.chromium.org/1380943005 .
Cr-Commit-Position: refs/branch-heads/2490@{#499}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
| -rw-r--r-- | components/scheduler/renderer/renderer_scheduler_impl.cc | 1 | ||||
| -rw-r--r-- | components/scheduler/renderer/renderer_scheduler_impl_unittest.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/scheduler/renderer/renderer_scheduler_impl.cc b/components/scheduler/renderer/renderer_scheduler_impl.cc index 4b56531..bc86404 100644 --- a/components/scheduler/renderer/renderer_scheduler_impl.cc +++ b/components/scheduler/renderer/renderer_scheduler_impl.cc @@ -472,7 +472,6 @@ void RendererSchedulerImpl::UpdatePolicyLocked(UpdateType update_type) { case Policy::COMPOSITOR_CRITICAL_PATH_PRIORITY: compositor_queue_priority = TaskQueue::HIGH_PRIORITY; loading_queue_priority = TaskQueue::DISABLED_PRIORITY; - timer_queue_priority = TaskQueue::DISABLED_PRIORITY; break; case Policy::TOUCHSTART_PRIORITY: compositor_queue_priority = TaskQueue::HIGH_PRIORITY; diff --git a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc b/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc index c651486..5e2d1d5 100644 --- a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc +++ b/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc @@ -619,9 +619,10 @@ TEST_F(RendererSchedulerImplTest, TestCompositorPolicy_DidAnimateForInput) { std::string("I1"))); } +// TODO(skyostil): Re-enable once timer blocking is re-enabled. TEST_F( RendererSchedulerImplTest, - TestCompositorPolicy_ExpensiveTimersDontRunWhenMainThreadOnCriticalPath) { + DISABLED_TestCompositorPolicy_ExpensiveTimersDontRunWhenMainThreadOnCriticalPath) { std::vector<std::string> run_order; // Simulate a bunch of expensive timer tasks |