Change VirtualTimePolicy::PAUSE_IF_NETWORK_FETCHES_PENDING

components/scheduler/renderer/renderer_scheduler_impl.cc

Index: components/scheduler/renderer/renderer_scheduler_impl.cc
diff --git a/components/scheduler/renderer/renderer_scheduler_impl.cc b/components/scheduler/renderer/renderer_scheduler_impl.cc
index 00a0426706bab6c32a24201a7c7061c3c84bf0a9..e074d7ecf9f14ec07facb250374b0c74b773de57 100644
--- a/components/scheduler/renderer/renderer_scheduler_impl.cc
+++ b/components/scheduler/renderer/renderer_scheduler_impl.cc
@@ -16,6 +16,7 @@
 #include "components/scheduler/base/task_queue_selector.h"
 #include "components/scheduler/base/virtual_time_domain.h"
 #include "components/scheduler/child/scheduler_tqm_delegate.h"
+#include "components/scheduler/renderer/auto_advancing_virtual_time_domain.h"
 #include "components/scheduler/renderer/web_view_scheduler_impl.h"
 #include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
 
@@ -96,6 +97,9 @@ RendererSchedulerImpl::~RendererSchedulerImpl() {
         &MainThreadOnly().timer_task_cost_estimator);
   }
 
+  if (virtual_time_domain_)
+    UnregisterTimeDomain(virtual_time_domain_.get());
+
   // Ensure the renderer scheduler was shut down explicitly, because otherwise
   // we could end up having stale pointers to the Blink heap which has been
   // terminated by this point.
@@ -138,6 +142,7 @@ RendererSchedulerImpl::MainThreadOnly::MainThreadOnly(
       begin_frame_not_expected_soon(false),
       expensive_task_blocking_allowed(true),
       in_idle_period_for_testing(false),
+      use_virtual_time(false),
       rail_mode_observer(nullptr) {}
 
 RendererSchedulerImpl::MainThreadOnly::~MainThreadOnly() {}
@@ -201,7 +206,9 @@ scoped_refptr<TaskQueue> RendererSchedulerImpl::NewLoadingTaskRunner(
     const char* name) {
   helper_.CheckOnValidThread();
   scoped_refptr<TaskQueue> loading_task_queue(helper_.NewTaskQueue(
-      TaskQueue::Spec(name).SetShouldMonitorQuiescence(true)));
+      TaskQueue::Spec(name).SetShouldMonitorQuiescence(true).SetTimeDomain(
+          MainThreadOnly().use_virtual_time ? virtual_time_domain()
+                                            : nullptr)));
   loading_task_runners_.insert(loading_task_queue);
   loading_task_queue->SetQueueEnabled(
       MainThreadOnly().current_policy.loading_queue_policy.is_enabled);
@@ -222,7 +229,10 @@ scoped_refptr<TaskQueue> RendererSchedulerImpl::NewTimerTaskRunner(
   scoped_refptr<TaskQueue> timer_task_queue(
       helper_.NewTaskQueue(TaskQueue::Spec(name)
                                .SetShouldMonitorQuiescence(true)
-                               .SetShouldReportWhenExecutionBlocked(true)));
+                               .SetShouldReportWhenExecutionBlocked(true)
+                               .SetTimeDomain(MainThreadOnly().use_virtual_time

[Sami, 2016/07/29 14:05:50]

Could you add a TODO here to make these use ApplyTaskQueuePolicy() so we don't
need keep repeating everything?

[alex clarke (OOO till 29th), 2016/07/29 14:42:16]

Done.

+                                                  ? virtual_time_domain()
+                                                  : nullptr)));
   timer_task_runners_.insert(timer_task_queue);
   timer_task_queue->SetQueueEnabled(
       MainThreadOnly().current_policy.timer_queue_policy.is_enabled);
@@ -241,7 +251,10 @@ scoped_refptr<TaskQueue> RendererSchedulerImpl::NewUnthrottledTaskRunner(
     const char* name) {
   helper_.CheckOnValidThread();
   scoped_refptr<TaskQueue> unthrottled_task_queue(helper_.NewTaskQueue(
-      TaskQueue::Spec(name).SetShouldMonitorQuiescence(true)));
+      TaskQueue::Spec(name).SetShouldMonitorQuiescence(true).SetTimeDomain(
+          MainThreadOnly().use_virtual_time ? virtual_time_domain()
+                                            : nullptr)));
+  unthrottled_task_runners_.insert(unthrottled_task_queue);
   return unthrottled_task_queue;
 }
 
@@ -263,6 +276,9 @@ void RendererSchedulerImpl::OnUnregisterTaskQueue(
              timer_task_runners_.end()) {
     task_queue->RemoveTaskObserver(&MainThreadOnly().timer_task_cost_estimator);
     timer_task_runners_.erase(task_queue);
+  } else if (unthrottled_task_runners_.find(task_queue) !=
+             unthrottled_task_runners_.end()) {
+    unthrottled_task_runners_.erase(task_queue);
   }
 }
 
@@ -863,6 +879,14 @@ void RendererSchedulerImpl::UpdatePolicyLocked(UpdateType update_type) {
       break;
   }
 
+  if (MainThreadOnly().use_virtual_time) {
+    new_policy.compositor_queue_policy.time_domain_type =
+        TimeDomainType::VIRTUAL;
+    new_policy.default_queue_policy.time_domain_type = TimeDomainType::VIRTUAL;
+    new_policy.loading_queue_policy.time_domain_type = TimeDomainType::VIRTUAL;
+    new_policy.timer_queue_policy.time_domain_type = TimeDomainType::VIRTUAL;
+  }
+
   MainThreadOnly().expensive_task_policy = expensive_task_policy;
 
   if (MainThreadOnly().timer_queue_suspend_count != 0 ||
@@ -951,11 +975,15 @@ void RendererSchedulerImpl::ApplyTaskQueuePolicy(
 
   if (old_task_queue_policy.time_domain_type !=
       new_task_queue_policy.time_domain_type) {
-    if (new_task_queue_policy.time_domain_type == TimeDomainType::THROTTLED) {
-      throttling_helper_->IncreaseThrottleRefCount(task_queue);
-    } else if (old_task_queue_policy.time_domain_type ==
-               TimeDomainType::THROTTLED) {
+    if (old_task_queue_policy.time_domain_type == TimeDomainType::THROTTLED) {
       throttling_helper_->DecreaseThrottleRefCount(task_queue);
+    } else if (new_task_queue_policy.time_domain_type ==
+               TimeDomainType::THROTTLED) {
+      throttling_helper_->IncreaseThrottleRefCount(task_queue);
+    } else if (new_task_queue_policy.time_domain_type ==
+               TimeDomainType::VIRTUAL) {
+      DCHECK(virtual_time_domain_);
+      task_queue->SetTimeDomain(virtual_time_domain_.get());
     }
   }
 }
@@ -1409,6 +1437,28 @@ void RendererSchedulerImpl::OnQueueingTimeForWindowEstimated(
                  queueing_time.InMillisecondsF());
 }
 
+AutoAdvancingVirtualTimeDomain* RendererSchedulerImpl::virtual_time_domain() {

[Sami, 2016/07/29 14:05:50]

nit: This should be called VirtualTimeDomain() since does a bit more than
returning a member.

[alex clarke (OOO till 29th), 2016/07/29 14:42:16]

Done.

+  if (!virtual_time_domain_) {
+    virtual_time_domain_.reset(
+        new AutoAdvancingVirtualTimeDomain(tick_clock()->NowTicks()));
+    RegisterTimeDomain(virtual_time_domain_.get());
+  }
+  return virtual_time_domain_.get();
+}
+
+void RendererSchedulerImpl::EnableVirtualTime() {
+  MainThreadOnly().use_virtual_time = true;
+
+  // The |unthrottled_task_runners_| are not actively managed by UpdatePolicy().
+  AutoAdvancingVirtualTimeDomain* time_domain = virtual_time_domain();
+  for (const scoped_refptr<TaskQueue>& task_queue : unthrottled_task_runners_)
+    task_queue->SetTimeDomain(time_domain);
+
+  throttling_helper_->EnableVirtualTime();
+
+  ForceUpdatePolicy();
+}
+
 // static
 const char* RendererSchedulerImpl::UseCaseToString(UseCase use_case) {
   switch (use_case) {