| Index: third_party/WebKit/Source/platform/scheduler/child/idle_helper.cc
|
| diff --git a/components/scheduler/child/idle_helper.cc b/third_party/WebKit/Source/platform/scheduler/child/idle_helper.cc
|
| similarity index 88%
|
| rename from components/scheduler/child/idle_helper.cc
|
| rename to third_party/WebKit/Source/platform/scheduler/child/idle_helper.cc
|
| index 0f6c82f6ac862f60b84045be223a6dbcbdc8a80b..406b9598ad81fbbedfe67b11905675c9b9881d8b 100644
|
| --- a/components/scheduler/child/idle_helper.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/child/idle_helper.cc
|
| @@ -2,17 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/scheduler/child/idle_helper.h"
|
| +#include "platform/scheduler/child/idle_helper.h"
|
|
|
| #include "base/time/time.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "base/trace_event/trace_event_argument.h"
|
| -#include "components/scheduler/base/real_time_domain.h"
|
| -#include "components/scheduler/base/task_queue.h"
|
| -#include "components/scheduler/base/task_queue_manager.h"
|
| -#include "components/scheduler/child/scheduler_helper.h"
|
| -#include "components/scheduler/child/scheduler_tqm_delegate.h"
|
| +#include "platform/scheduler/base/real_time_domain.h"
|
| +#include "public/platform/scheduler/base/task_queue.h"
|
| +#include "platform/scheduler/base/task_queue_manager.h"
|
| +#include "platform/scheduler/child/scheduler_helper.h"
|
| +#include "platform/scheduler/child/scheduler_tqm_delegate.h"
|
|
|
| +namespace blink {
|
| namespace scheduler {
|
|
|
| IdleHelper::IdleHelper(
|
| @@ -57,11 +58,9 @@ IdleHelper::~IdleHelper() {
|
| helper_->RemoveTaskObserver(this);
|
| }
|
|
|
| -IdleHelper::Delegate::Delegate() {
|
| -}
|
| +IdleHelper::Delegate::Delegate() {}
|
|
|
| -IdleHelper::Delegate::~Delegate() {
|
| -}
|
| +IdleHelper::Delegate::~Delegate() {}
|
|
|
| scoped_refptr<SingleThreadIdleTaskRunner> IdleHelper::IdleTaskRunner() {
|
| helper_->CheckOnValidThread();
|
| @@ -198,8 +197,7 @@ void IdleHelper::EndIdlePeriod() {
|
| base::TimeTicks());
|
| }
|
|
|
| -void IdleHelper::WillProcessTask(const base::PendingTask& pending_task) {
|
| -}
|
| +void IdleHelper::WillProcessTask(const base::PendingTask& pending_task) {}
|
|
|
| void IdleHelper::DidProcessTask(const base::PendingTask& pending_task) {
|
| helper_->CheckOnValidThread();
|
| @@ -334,11 +332,9 @@ IdleHelper::State::State(SchedulerHelper* helper,
|
| tracing_category_(tracing_category),
|
| disabled_by_default_tracing_category_(
|
| disabled_by_default_tracing_category),
|
| - idle_period_tracing_name_(idle_period_tracing_name) {
|
| -}
|
| + idle_period_tracing_name_(idle_period_tracing_name) {}
|
|
|
| -IdleHelper::State::~State() {
|
| -}
|
| +IdleHelper::State::~State() {}
|
|
|
| IdleHelper::IdlePeriodState IdleHelper::State::idle_period_state() const {
|
| helper_->CheckOnValidThread();
|
| @@ -367,8 +363,8 @@ void IdleHelper::State::UpdateState(IdlePeriodState new_state,
|
| base::TimeTicks now(optional_now.is_null()
|
| ? helper_->scheduler_tqm_delegate()->NowTicks()
|
| : optional_now);
|
| - TraceEventIdlePeriodStateChange(
|
| - new_state, running_idle_task_for_tracing_, idle_period_deadline_, now);
|
| + TraceEventIdlePeriodStateChange(new_state, running_idle_task_for_tracing_,
|
| + idle_period_deadline_, now);
|
| }
|
|
|
| idle_period_state_ = new_state;
|
| @@ -389,9 +385,9 @@ void IdleHelper::State::TraceIdleIdleTaskStart() {
|
| bool is_tracing;
|
| TRACE_EVENT_CATEGORY_GROUP_ENABLED(tracing_category_, &is_tracing);
|
| if (is_tracing) {
|
| - TraceEventIdlePeriodStateChange(
|
| - idle_period_state_, true, idle_period_deadline_,
|
| - base::TimeTicks::Now());
|
| + TraceEventIdlePeriodStateChange(idle_period_state_, true,
|
| + idle_period_deadline_,
|
| + base::TimeTicks::Now());
|
| }
|
| }
|
|
|
| @@ -401,9 +397,9 @@ void IdleHelper::State::TraceIdleIdleTaskEnd() {
|
| bool is_tracing;
|
| TRACE_EVENT_CATEGORY_GROUP_ENABLED(tracing_category_, &is_tracing);
|
| if (is_tracing) {
|
| - TraceEventIdlePeriodStateChange(
|
| - idle_period_state_, false, idle_period_deadline_,
|
| - base::TimeTicks::Now());
|
| + TraceEventIdlePeriodStateChange(idle_period_state_, false,
|
| + idle_period_deadline_,
|
| + base::TimeTicks::Now());
|
| }
|
| }
|
|
|
| @@ -422,40 +418,35 @@ void IdleHelper::State::TraceEventIdlePeriodStateChange(
|
| running_idle_task_for_tracing_ = false;
|
| if (!idle_period_deadline_.is_null() && now > idle_period_deadline_) {
|
| TRACE_EVENT_ASYNC_STEP_INTO_WITH_TIMESTAMP0(
|
| - tracing_category_, idle_period_tracing_name_, this,
|
| - "DeadlineOverrun",
|
| - std::max(idle_period_deadline_,
|
| - last_idle_task_trace_time_).ToInternalValue());
|
| + tracing_category_, idle_period_tracing_name_, this, "DeadlineOverrun",
|
| + std::max(idle_period_deadline_, last_idle_task_trace_time_)
|
| + .ToInternalValue());
|
| }
|
| }
|
|
|
| if (IsInIdlePeriod(new_state)) {
|
| if (!idle_period_trace_event_started_) {
|
| idle_period_trace_event_started_ = true;
|
| - TRACE_EVENT_ASYNC_BEGIN1(
|
| - tracing_category_, idle_period_tracing_name_, this,
|
| - "idle_period_length_ms", (new_deadline - now).ToInternalValue());
|
| + TRACE_EVENT_ASYNC_BEGIN1(tracing_category_, idle_period_tracing_name_,
|
| + this, "idle_period_length_ms",
|
| + (new_deadline - now).ToInternalValue());
|
| }
|
|
|
| if (new_running_idle_task) {
|
| last_idle_task_trace_time_ = now;
|
| running_idle_task_for_tracing_ = true;
|
| - TRACE_EVENT_ASYNC_STEP_INTO0(
|
| - tracing_category_, idle_period_tracing_name_, this,
|
| - "RunningIdleTask");
|
| + TRACE_EVENT_ASYNC_STEP_INTO0(tracing_category_, idle_period_tracing_name_,
|
| + this, "RunningIdleTask");
|
| } else if (new_state == IdlePeriodState::IN_SHORT_IDLE_PERIOD) {
|
| - TRACE_EVENT_ASYNC_STEP_INTO0(
|
| - tracing_category_, idle_period_tracing_name_, this,
|
| - "ShortIdlePeriod");
|
| + TRACE_EVENT_ASYNC_STEP_INTO0(tracing_category_, idle_period_tracing_name_,
|
| + this, "ShortIdlePeriod");
|
| } else if (IsInLongIdlePeriod(new_state) &&
|
| - new_state != IdlePeriodState::IN_LONG_IDLE_PERIOD_PAUSED) {
|
| - TRACE_EVENT_ASYNC_STEP_INTO0(
|
| - tracing_category_, idle_period_tracing_name_, this,
|
| - "LongIdlePeriod");
|
| + new_state != IdlePeriodState::IN_LONG_IDLE_PERIOD_PAUSED) {
|
| + TRACE_EVENT_ASYNC_STEP_INTO0(tracing_category_, idle_period_tracing_name_,
|
| + this, "LongIdlePeriod");
|
| } else if (new_state == IdlePeriodState::IN_LONG_IDLE_PERIOD_PAUSED) {
|
| - TRACE_EVENT_ASYNC_STEP_INTO0(
|
| - tracing_category_, idle_period_tracing_name_, this,
|
| - "LongIdlePeriodPaused");
|
| + TRACE_EVENT_ASYNC_STEP_INTO0(tracing_category_, idle_period_tracing_name_,
|
| + this, "LongIdlePeriodPaused");
|
| }
|
| } else if (idle_period_trace_event_started_) {
|
| idle_period_trace_event_started_ = false;
|
| @@ -484,3 +475,4 @@ const char* IdleHelper::IdlePeriodStateToString(
|
| }
|
|
|
| } // namespace scheduler
|
| +} // namespace blink
|
|
|