[Reland] Dont post delayed DoWork for disabled queues.

third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.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/base/task_queue_manager.h"
 
 #include <queue>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 212 matching lines @@
     any_thread().immediate_do_work_posted_count++;
   }
 
   TRACE_EVENT0(disabled_by_default_tracing_category_,
                "TaskQueueManager::MaybeScheduleImmediateWorkLocked::PostTask");
   delegate_->PostTask(from_here, immediate_do_work_closure_);
 }
 
 void TaskQueueManager::MaybeScheduleDelayedWork(
     const tracked_objects::Location& from_here,
-    base::TimeTicks now,
-    base::TimeDelta delay) {
+    LazyNow* lazy_now,
+    base::TimeTicks run_time) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
-  DCHECK_GE(delay, base::TimeDelta());
   {
     base::AutoLock lock(any_thread_lock_);
 
     // Unless we're nested, don't post a delayed DoWork if there's an immediate
     // DoWork in flight or we're inside a DoWork. We can rely on DoWork posting
     // a delayed continuation as needed.
     if (!any_thread().is_nested &&
         (any_thread().immediate_do_work_posted_count > 0 ||
          any_thread().do_work_running_count == 1)) {
       return;
     }
   }
 
   // De-duplicate DoWork posts.
-  base::TimeTicks run_time = now + delay;
   if (next_scheduled_delayed_do_work_time_ <= run_time &&
       !next_scheduled_delayed_do_work_time_.is_null())
     return;
 
+  cancelable_delayed_do_work_closure_.Reset(delayed_do_work_closure_);
+
+  base::TimeDelta delay =
+      std::max(base::TimeDelta(), run_time - lazy_now->Now());
+  next_scheduled_delayed_do_work_time_ = lazy_now->Now() + delay;
+
   TRACE_EVENT1(disabled_by_default_tracing_category_,
                "TaskQueueManager::MaybeScheduleDelayedWork::PostDelayedTask",
                "delay_ms", delay.InMillisecondsF());
 
   cancelable_delayed_do_work_closure_.Reset(delayed_do_work_closure_);
   next_scheduled_delayed_do_work_time_ = run_time;
   delegate_->PostDelayedTask(
       from_here, cancelable_delayed_do_work_closure_.callback(), delay);
 }
 
+void TaskQueueManager::CancelDelayedWork(base::TimeTicks run_time) {
+  DCHECK(main_thread_checker_.CalledOnValidThread());
+  if (next_scheduled_delayed_do_work_time_ != run_time)
+    return;
+
+  cancelable_delayed_do_work_closure_.Cancel();
+  next_scheduled_delayed_do_work_time_ = base::TimeTicks();
+}
+
 void TaskQueueManager::DoWork(bool delayed) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   TRACE_EVENT1(tracing_category_, "TaskQueueManager::DoWork", "delayed",
                delayed);
 
   LazyNow lazy_now(real_time_domain()->CreateLazyNow());
   bool is_nested = delegate_->IsNested();
   if (!is_nested)
     queues_to_delete_.clear();
 
@@ skipping 415 matching lines @@
   for (const scoped_refptr<internal::TaskQueueImpl>& queue : queues_) {
     TimeDomain* time_domain = queue->GetTimeDomain();
     if (time_domain_now.find(time_domain) == time_domain_now.end())
       time_domain_now.insert(std::make_pair(time_domain, time_domain->Now()));
     queue->SweepCanceledDelayedTasks(time_domain_now[time_domain]);
   }
 }
 
 }  // namespace scheduler
 }  // namespace blink