| Index: third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc
|
| diff --git a/components/scheduler/base/task_queue_impl.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc
|
| similarity index 96%
|
| rename from components/scheduler/base/task_queue_impl.cc
|
| rename to third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc
|
| index 7d684fb000c3aac28cd4fa0087eedc8cbb1f1232..02f5cef63fd6d4e0bf78028c66cfaef0c708a1f0 100644
|
| --- a/components/scheduler/base/task_queue_impl.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc
|
| @@ -2,14 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/scheduler/base/task_queue_impl.h"
|
| +#include "platform/scheduler/base/task_queue_impl.h"
|
|
|
| #include "base/trace_event/blame_context.h"
|
| -#include "components/scheduler/base/task_queue_manager.h"
|
| -#include "components/scheduler/base/task_queue_manager_delegate.h"
|
| -#include "components/scheduler/base/time_domain.h"
|
| -#include "components/scheduler/base/work_queue.h"
|
| +#include "platform/scheduler/base/task_queue_manager.h"
|
| +#include "platform/scheduler/base/task_queue_manager_delegate.h"
|
| +#include "platform/scheduler/base/time_domain.h"
|
| +#include "platform/scheduler/base/work_queue.h"
|
|
|
| +namespace blink {
|
| namespace scheduler {
|
| namespace internal {
|
|
|
| @@ -223,8 +224,8 @@ void TaskQueueImpl::PushOntoDelayedIncomingQueueFromMainThread(
|
| // Schedule a later call to MoveReadyDelayedTasksToDelayedWorkQueue.
|
| base::TimeTicks delayed_run_time = pending_task.delayed_run_time;
|
| main_thread_only().delayed_incoming_queue.push(std::move(pending_task));
|
| - main_thread_only().time_domain->ScheduleDelayedWork(
|
| - this, delayed_run_time, now);
|
| + main_thread_only().time_domain->ScheduleDelayedWork(this, delayed_run_time,
|
| + now);
|
| TraceQueueSize(false);
|
| }
|
|
|
| @@ -233,12 +234,11 @@ void TaskQueueImpl::PushOntoDelayedIncomingQueueLocked(Task pending_task) {
|
|
|
| int thread_hop_task_sequence_number =
|
| any_thread().task_queue_manager->GetNextSequenceNumber();
|
| - PushOntoImmediateIncomingQueueLocked(Task(
|
| - FROM_HERE,
|
| - base::Bind(&TaskQueueImpl::ScheduleDelayedWorkTask, this,
|
| - base::Passed(&pending_task)),
|
| - base::TimeTicks(), thread_hop_task_sequence_number, false,
|
| - thread_hop_task_sequence_number));
|
| + PushOntoImmediateIncomingQueueLocked(
|
| + Task(FROM_HERE, base::Bind(&TaskQueueImpl::ScheduleDelayedWorkTask, this,
|
| + base::Passed(&pending_task)),
|
| + base::TimeTicks(), thread_hop_task_sequence_number, false,
|
| + thread_hop_task_sequence_number));
|
| }
|
|
|
| void TaskQueueImpl::PushOntoImmediateIncomingQueueLocked(Task pending_task) {
|
| @@ -258,8 +258,7 @@ void TaskQueueImpl::ScheduleDelayedWorkTask(Task pending_task) {
|
| base::TimeTicks delayed_run_time = pending_task.delayed_run_time;
|
| main_thread_only().delayed_incoming_queue.push(std::move(pending_task));
|
| main_thread_only().time_domain->ScheduleDelayedWork(
|
| - this, delayed_run_time,
|
| - main_thread_only().time_domain->Now());
|
| + this, delayed_run_time, main_thread_only().time_domain->Now());
|
| }
|
|
|
| void TaskQueueImpl::SetQueueEnabled(bool enabled) {
|
| @@ -580,7 +579,7 @@ void TaskQueueImpl::AsValueInto(base::trace_event::TracedValue* state) const {
|
| (main_thread_only().delayed_incoming_queue.top().delayed_run_time -
|
| main_thread_only().time_domain->CreateLazyNow().Now());
|
| state->SetDouble("delay_to_next_task_ms",
|
| - delay_to_next_task.InMillisecondsF());
|
| + delay_to_next_task.InMillisecondsF());
|
| }
|
| if (verbose_tracing_enabled) {
|
| state->BeginArray("immediate_incoming_queue");
|
| @@ -715,3 +714,4 @@ void TaskQueueImpl::TaskAsValueInto(const Task& task,
|
|
|
| } // namespace internal
|
| } // namespace scheduler
|
| +} // namespace blink
|
|
|