| Index: third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
|
| diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
|
| index 5f5473e063b6fb024c50bfca4320a751adce8db6..37f8c836e9d5c59ba64f09fa91be3d8b9f053a74 100644
|
| --- a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
|
| @@ -473,7 +473,7 @@ void RendererSchedulerImpl::OnRendererForegrounded() {
|
| MainThreadOnly().background_main_thread_load_tracker.Pause(now);
|
|
|
| suspend_timers_when_backgrounded_closure_.Cancel();
|
| - ResumeTimerQueueWhenForegrounded();
|
| + ResumeTimerQueueWhenForegroundedOrResumed();
|
| }
|
|
|
| void RendererSchedulerImpl::SuspendRenderer() {
|
| @@ -488,6 +488,16 @@ void RendererSchedulerImpl::SuspendRenderer() {
|
| SuspendTimerQueueWhenBackgrounded();
|
| }
|
|
|
| +void RendererSchedulerImpl::ResumeRenderer() {
|
| + helper_.CheckOnValidThread();
|
| + DCHECK(MainThreadOnly().renderer_backgrounded);
|
| + if (helper_.IsShutdown())
|
| + return;
|
| + suspend_timers_when_backgrounded_closure_.Cancel();
|
| + MainThreadOnly().renderer_suspended = false;
|
| + ResumeTimerQueueWhenForegroundedOrResumed();
|
| +}
|
| +
|
| void RendererSchedulerImpl::EndIdlePeriod() {
|
| if (MainThreadOnly().in_idle_period_for_testing)
|
| return;
|
| @@ -1364,8 +1374,10 @@ void RendererSchedulerImpl::SuspendTimerQueueWhenBackgrounded() {
|
| ForceUpdatePolicy();
|
| }
|
|
|
| -void RendererSchedulerImpl::ResumeTimerQueueWhenForegrounded() {
|
| - DCHECK(!MainThreadOnly().renderer_backgrounded);
|
| +void RendererSchedulerImpl::ResumeTimerQueueWhenForegroundedOrResumed() {
|
| + DCHECK(!MainThreadOnly().renderer_backgrounded ||
|
| + (MainThreadOnly().renderer_backgrounded &&
|
| + !MainThreadOnly().renderer_suspended));
|
| if (!MainThreadOnly().timer_queue_suspended_when_backgrounded)
|
| return;
|
|
|
|
|