| Index: components/scheduler/child/idle_helper.cc
|
| diff --git a/components/scheduler/child/idle_helper.cc b/components/scheduler/child/idle_helper.cc
|
| index dc58c88fd7f46866758f41b65049c2f3d0a489e9..054f70c5612d37c7d45493c94d17e78300424059 100644
|
| --- a/components/scheduler/child/idle_helper.cc
|
| +++ b/components/scheduler/child/idle_helper.cc
|
| @@ -359,11 +359,8 @@ void IdleHelper::State::UpdateState(IdlePeriodState new_state,
|
| TRACE_EVENT_CATEGORY_GROUP_ENABLED(tracing_category_, &is_tracing);
|
| if (is_tracing) {
|
| base::TimeTicks now(optional_now.is_null() ? helper_->Now() : optional_now);
|
| - base::TraceTicks trace_now = base::TraceTicks::Now();
|
| - idle_period_deadline_for_tracing_ = trace_now + (new_deadline - now);
|
| TraceEventIdlePeriodStateChange(
|
| - new_state, running_idle_task_for_tracing_,
|
| - idle_period_deadline_for_tracing_, trace_now);
|
| + new_state, running_idle_task_for_tracing_, idle_period_deadline_, now);
|
| }
|
|
|
| idle_period_state_ = new_state;
|
| @@ -385,8 +382,8 @@ void IdleHelper::State::TraceIdleIdleTaskStart() {
|
| TRACE_EVENT_CATEGORY_GROUP_ENABLED(tracing_category_, &is_tracing);
|
| if (is_tracing) {
|
| TraceEventIdlePeriodStateChange(
|
| - idle_period_state_, true, idle_period_deadline_for_tracing_,
|
| - base::TraceTicks::Now());
|
| + idle_period_state_, true, idle_period_deadline_,
|
| + base::TimeTicks::Now());
|
| }
|
| }
|
|
|
| @@ -397,16 +394,16 @@ void IdleHelper::State::TraceIdleIdleTaskEnd() {
|
| TRACE_EVENT_CATEGORY_GROUP_ENABLED(tracing_category_, &is_tracing);
|
| if (is_tracing) {
|
| TraceEventIdlePeriodStateChange(
|
| - idle_period_state_, false, idle_period_deadline_for_tracing_,
|
| - base::TraceTicks::Now());
|
| + idle_period_state_, false, idle_period_deadline_,
|
| + base::TimeTicks::Now());
|
| }
|
| }
|
|
|
| void IdleHelper::State::TraceEventIdlePeriodStateChange(
|
| IdlePeriodState new_state,
|
| bool new_running_idle_task,
|
| - base::TraceTicks new_deadline,
|
| - base::TraceTicks now) {
|
| + base::TimeTicks new_deadline,
|
| + base::TimeTicks now) {
|
| TRACE_EVENT2(disabled_by_default_tracing_category_, "SetIdlePeriodState",
|
| "old_state",
|
| IdleHelper::IdlePeriodStateToString(idle_period_state_),
|
| @@ -415,13 +412,12 @@ void IdleHelper::State::TraceEventIdlePeriodStateChange(
|
| if (idle_period_trace_event_started_ && running_idle_task_for_tracing_ &&
|
| !new_running_idle_task) {
|
| running_idle_task_for_tracing_ = false;
|
| - if (!idle_period_deadline_for_tracing_.is_null() &&
|
| - now > idle_period_deadline_for_tracing_) {
|
| + 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_for_tracing_,
|
| - last_idle_task_trace_time_).ToInternalValue());
|
| + std::max(idle_period_deadline_,
|
| + last_idle_task_time_).ToInternalValue());
|
| }
|
| }
|
|
|
| @@ -434,7 +430,7 @@ void IdleHelper::State::TraceEventIdlePeriodStateChange(
|
| }
|
|
|
| if (new_running_idle_task) {
|
| - last_idle_task_trace_time_ = now;
|
| + last_idle_task_time_ = now;
|
| running_idle_task_for_tracing_ = true;
|
| TRACE_EVENT_ASYNC_STEP_INTO0(
|
| tracing_category_, idle_period_tracing_name_, this,
|
|
|