Resume a backgrounded renderer that was purged and suspended

third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/scheduler/renderer/renderer_scheduler_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 460 matching lines @@
     return;
 
   MainThreadOnly().renderer_backgrounded = false;
   MainThreadOnly().renderer_suspended = false;
 
   base::TimeTicks now = tick_clock()->NowTicks();
   MainThreadOnly().foreground_main_thread_load_tracker.Resume(now);
   MainThreadOnly().background_main_thread_load_tracker.Pause(now);
 
   suspend_timers_when_backgrounded_closure_.Cancel();
-  ResumeTimerQueueWhenForegrounded();
+  ResumeTimerQueueWhenForegroundedOrResumed();
 }
 
 void RendererSchedulerImpl::OnAudioStateChanged() {
   bool is_audio_playing = false;
   for (WebViewSchedulerImpl* web_view_scheduler :
        MainThreadOnly().web_view_schedulers) {
     is_audio_playing = is_audio_playing || web_view_scheduler->IsAudioPlaying();
   }
 
   if (is_audio_playing == MainThreadOnly().is_audio_playing)
@@ skipping 11 matching lines @@
   DCHECK(MainThreadOnly().renderer_backgrounded);
   if (helper_.IsShutdown())
     return;
   suspend_timers_when_backgrounded_closure_.Cancel();
   // TODO(hajimehoshi): We might need to suspend not only timer queue but also
   // e.g. loading tasks or postMessage.
   MainThreadOnly().renderer_suspended = true;
   SuspendTimerQueueWhenBackgrounded();
 }
 
+void RendererSchedulerImpl::ResumeRenderer() {

[Sami, 2016/10/06 13:10:09]

Could you please add a test for this in RendererSchedulerImplTest?

[tasak, 2016/10/07 05:31:26]

Done.

+  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;
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"),
                "RendererSchedulerImpl::EndIdlePeriod");
   helper_.CheckOnValidThread();
   idle_helper_.EndIdlePeriod();
 }
 
 void RendererSchedulerImpl::EndIdlePeriodForTesting(
@@ skipping 890 matching lines @@
 
 void RendererSchedulerImpl::SuspendTimerQueueWhenBackgrounded() {
   DCHECK(MainThreadOnly().renderer_backgrounded);
   if (MainThreadOnly().timer_queue_suspended_when_backgrounded)
     return;
 
   MainThreadOnly().timer_queue_suspended_when_backgrounded = true;
   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;
 
   MainThreadOnly().timer_queue_suspended_when_backgrounded = false;
   ForceUpdatePolicy();
 }
 
 void RendererSchedulerImpl::ResetForNavigationLocked() {
   helper_.CheckOnValidThread();
   any_thread_lock_.AssertAcquired();
@@ skipping 218 matching lines @@
     case v8::PERFORMANCE_LOAD:
       return "load";
     default:
       NOTREACHED();
       return nullptr;
   }
 }
 
 }  // namespace scheduler
 }  // namespace blink