Change VirtualTimePolicy::PAUSE_IF_NETWORK_FETCHES_PENDING

components/scheduler/renderer/web_view_scheduler_impl.cc

Index: components/scheduler/renderer/web_view_scheduler_impl.cc
diff --git a/components/scheduler/renderer/web_view_scheduler_impl.cc b/components/scheduler/renderer/web_view_scheduler_impl.cc
index da4e80b30b6fdcd2655f330e39d74d0bfb386137..bc3ee789696e3f6da489dd33d2080709469d3243 100644
--- a/components/scheduler/renderer/web_view_scheduler_impl.cc
+++ b/components/scheduler/renderer/web_view_scheduler_impl.cc
@@ -5,6 +5,7 @@
 #include "components/scheduler/renderer/web_view_scheduler_impl.h"
 
 #include "base/logging.h"
+#include "components/scheduler/base/real_time_domain.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"
@@ -21,13 +22,14 @@ WebViewSchedulerImpl::WebViewSchedulerImpl(
     blink::WebView* web_view,
     RendererSchedulerImpl* renderer_scheduler,
     bool disable_background_timer_throttling)
-    : virtual_time_pump_policy_(TaskQueue::PumpPolicy::AUTO),
-      web_view_(web_view),
+    : web_view_(web_view),
       renderer_scheduler_(renderer_scheduler),
       virtual_time_policy_(VirtualTimePolicy::ADVANCE),
       page_visible_(true),
       disable_background_timer_throttling_(disable_background_timer_throttling),
-      allow_virtual_time_to_advance_(true) {
+      allow_virtual_time_to_advance_(true),
+      have_seen_loading_task_(false),
+      virtual_time_(false) {
   renderer_scheduler->AddWebViewScheduler(this);
 }
 
@@ -38,8 +40,6 @@ WebViewSchedulerImpl::~WebViewSchedulerImpl() {
     frame_scheduler->DetachFromWebViewScheduler();
   }
   renderer_scheduler_->RemoveWebViewScheduler(this);
-  if (virtual_time_domain_)
-    renderer_scheduler_->UnregisterTimeDomain(virtual_time_domain_.get());
 }
 
 void WebViewSchedulerImpl::setPageVisible(bool page_visible) {
@@ -83,34 +83,25 @@ void WebViewSchedulerImpl::AddConsoleWarning(const std::string& message) {
 }
 
 void WebViewSchedulerImpl::enableVirtualTime() {
-  // If we've already switched to virtual time then we don't need to do
-  // anything more.
-  if (virtual_time_domain_.get())
+  if (virtual_time_)
     return;
 
-  virtual_time_domain_.reset(new AutoAdvancingVirtualTimeDomain(
-      renderer_scheduler_->tick_clock()->NowTicks()));
-  renderer_scheduler_->RegisterTimeDomain(virtual_time_domain_.get());
-
-  virtual_time_domain_->SetCanAdvanceVirtualTime(
+  virtual_time_ = true;
+  renderer_scheduler_->virtual_time_domain()->SetCanAdvanceVirtualTime(
       allow_virtual_time_to_advance_);
 
-  for (WebFrameSchedulerImpl* frame_scheduler : frame_schedulers_) {
-    frame_scheduler->OnVirtualTimeDomainChanged();
-  }
+  renderer_scheduler_->EnableVirtualTime();
 }
 
 void WebViewSchedulerImpl::setAllowVirtualTimeToAdvance(
     bool allow_virtual_time_to_advance) {
-  if (allow_virtual_time_to_advance_ == allow_virtual_time_to_advance)
-    return;
-
   allow_virtual_time_to_advance_ = allow_virtual_time_to_advance;
 
-  if (virtual_time_domain_) {
-    virtual_time_domain_->SetCanAdvanceVirtualTime(
-        allow_virtual_time_to_advance);
-  }
+  if (!virtual_time_)
+    return;
+
+  renderer_scheduler_->virtual_time_domain()->SetCanAdvanceVirtualTime(
+      allow_virtual_time_to_advance);
 }
 
 bool WebViewSchedulerImpl::virtualTimeAllowedToAdvance() const {
@@ -119,6 +110,7 @@ bool WebViewSchedulerImpl::virtualTimeAllowedToAdvance() const {
 
 void WebViewSchedulerImpl::DidStartLoading(unsigned long identifier) {
   pending_loads_.insert(identifier);
+  have_seen_loading_task_ = true;
 
   if (virtual_time_policy_ !=
       VirtualTimePolicy::PAUSE_IF_NETWORK_FETCHES_PENDING) {
@@ -154,7 +146,11 @@ void WebViewSchedulerImpl::setVirtualTimePolicy(VirtualTimePolicy policy) {
       break;
 
     case VirtualTimePolicy::PAUSE_IF_NETWORK_FETCHES_PENDING:
-      setAllowVirtualTimeToAdvance(pending_loads_.size() == 0);
+      // We pause virtual time until we've seen a loading task posted, because
+      // otherwise we could advance virtual time arbitarially far before the

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

typo: arbitrarily

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

Done.

+      // first load arrives.
+      setAllowVirtualTimeToAdvance(pending_loads_.size() == 0 &&
+                                   have_seen_loading_task_);
       break;
   }
 }