Revert of Dont post delayed DoWork for disabled queues.

third_party/WebKit/Source/platform/scheduler/base/time_domain.cc

 // Copyright 2015 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/base/time_domain.h"
 
 #include <set>
 
 #include "platform/scheduler/base/task_queue_impl.h"
 #include "platform/scheduler/base/task_queue_manager_delegate.h"
@@ skipping 36 matching lines @@
   // If no wakeup has been requested then bail out.
   if (!queue->heap_handle().IsValid())
     return;
 
   base::TimeTicks wake_up_time = queue->scheduled_time_domain_wakeup();
   DCHECK_NE(wake_up_time, base::TimeTicks());
 
   // O(log n)
   delayed_wakeup_queue_.erase(queue->heap_handle());
 
-  LazyNow destination_lazy_now = destination_time_domain->CreateLazyNow();
+  base::TimeTicks destination_now = destination_time_domain->Now();
   destination_time_domain->ScheduleDelayedWork(queue, wake_up_time,
-                                               &destination_lazy_now);
+                                               destination_now);
 }
 
 void TimeDomain::ScheduleDelayedWork(internal::TaskQueueImpl* queue,
                                      base::TimeTicks delayed_run_time,
-                                     LazyNow* lazy_now) {
+                                     base::TimeTicks now) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   // We only want to store a single wakeup per queue, so we need to remove any
   // previously registered wake up for |queue|.
   if (queue->heap_handle().IsValid()) {
     DCHECK_NE(queue->scheduled_time_domain_wakeup(), base::TimeTicks());
 
     // O(log n)
     delayed_wakeup_queue_.ChangeKey(queue->heap_handle(),
                                     {delayed_run_time, queue});
   } else {
     // O(log n)
     delayed_wakeup_queue_.insert({delayed_run_time, queue});
   }
 
   queue->set_scheduled_time_domain_wakeup(delayed_run_time);
 
   // If |queue| is the first wakeup then request the wakeup.
-  if (delayed_wakeup_queue_.min().queue == queue)
-    RequestWakeupAt(lazy_now, delayed_run_time);
+  if (delayed_wakeup_queue_.min().queue == queue) {
+    base::TimeDelta delay = std::max(base::TimeDelta(), delayed_run_time - now);
+    RequestWakeup(now, delay);
+  }
 
   if (observer_)
     observer_->OnTimeDomainHasDelayedWork(queue);
 }
 
-void TimeDomain::CancelDelayedWork(internal::TaskQueueImpl* queue) {
-  if (!queue->heap_handle().IsValid())
-    return;
-
-  DCHECK(!delayed_wakeup_queue_.empty());
-  base::TimeTicks prev_first_wakeup = delayed_wakeup_queue_.min().time;
-
-  // O(log n)
-  delayed_wakeup_queue_.erase(queue->heap_handle());
-
-  if (delayed_wakeup_queue_.empty()) {
-    CancelWakeupAt(prev_first_wakeup);
-  } else if (prev_first_wakeup != delayed_wakeup_queue_.min().time) {
-    LazyNow lazy_now = CreateLazyNow();
-    CancelWakeupAt(prev_first_wakeup);
-    RequestWakeupAt(&lazy_now, delayed_wakeup_queue_.min().time);
-  }
-}
-
 void TimeDomain::OnQueueHasImmediateWork(internal::TaskQueueImpl* queue) {
   if (observer_)
     observer_->OnTimeDomainHasImmediateWork(queue);
 }
 
 void TimeDomain::WakeupReadyDelayedQueues(LazyNow* lazy_now) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   // Wake up any queues with pending delayed work.  Note std::multipmap stores
   // the elements sorted by key, so the begin() iterator points to the earliest
   // queue to wakeup.
@@ skipping 40 matching lines @@
   if (!delayed_wakeup_queue_.empty()) {
     base::TimeDelta delay = delayed_wakeup_queue_.min().time - Now();
     state->SetDouble("next_delay_ms", delay.InMillisecondsF());
   }
   AsValueIntoInternal(state);
   state->EndDictionary();
 }
 
 }  // namespace scheduler
 }  // namespace blink