Index: third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc |
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc |
index f45c3c45a4e75fc1abe2d944d6633681d9279e4e..762f079bfccb32600c6b51b777f00741c92f19d8 100644 |
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc |
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc |
@@ -276,15 +276,11 @@ |
main_thread_only().delayed_incoming_queue.push(std::move(pending_task)); |
// If |pending_task| is at the head of the queue, then make sure a wakeup |
- // is requested if the queue is enabled. Note we still want to schedule a |
- // wakeup even if blocked by a fence, because we'd break throttling logic |
- // otherwise. |
- base::TimeTicks next_delayed_task = |
- main_thread_only().delayed_incoming_queue.top().delayed_run_time; |
- if (next_delayed_task == delayed_run_time && IsQueueEnabled()) { |
- LazyNow lazy_now(now); |
- main_thread_only().time_domain->ScheduleDelayedWork(this, delayed_run_time, |
- &lazy_now); |
+ // is requested. |
+ if (main_thread_only().delayed_incoming_queue.top().delayed_run_time == |
+ delayed_run_time) { |
+ main_thread_only().time_domain->ScheduleDelayedWork( |
+ this, pending_task.delayed_run_time, now); |
} |
TraceQueueSize(false); |
@@ -586,10 +582,9 @@ |
time_domain->RegisterQueue(this); |
if (!main_thread_only().delayed_incoming_queue.empty()) { |
- LazyNow lazy_now = time_domain->CreateLazyNow(); |
time_domain->ScheduleDelayedWork( |
this, main_thread_only().delayed_incoming_queue.top().delayed_run_time, |
- &lazy_now); |
+ time_domain->Now()); |
} |
} |
@@ -804,19 +799,10 @@ |
return; |
if (enable) { |
- if (!main_thread_only().delayed_incoming_queue.empty()) { |
- LazyNow lazy_now = main_thread_only().time_domain->CreateLazyNow(); |
- main_thread_only().time_domain->ScheduleDelayedWork( |
- this, |
- main_thread_only().delayed_incoming_queue.top().delayed_run_time, |
- &lazy_now); |
- } |
// Note the selector calls TaskQueueManager::OnTaskQueueEnabled which posts |
// a DoWork if needed. |
main_thread_only().task_queue_manager->selector_.EnableQueue(this); |
} else { |
- if (!main_thread_only().delayed_incoming_queue.empty()) |
- main_thread_only().time_domain->CancelDelayedWork(this); |
main_thread_only().task_queue_manager->selector_.DisableQueue(this); |
} |
} |
@@ -852,10 +838,9 @@ |
main_thread_only().time_domain->CancelDelayedWork(this); |
} else if (first_task_runtime != |
main_thread_only().delayed_incoming_queue.top().delayed_run_time) { |
- LazyNow lazy_now(now); |
main_thread_only().time_domain->ScheduleDelayedWork( |
this, main_thread_only().delayed_incoming_queue.top().delayed_run_time, |
- &lazy_now); |
+ main_thread_only().time_domain->Now()); |
} |
} |