| Index: base/task_scheduler/task.cc
|
| diff --git a/base/task_scheduler/task.cc b/base/task_scheduler/task.cc
|
| index 3780c16dcb71ceff67da3611d4c9c260e641aa76..44dd34da0e07096107baee79fdd464dd1029b534 100644
|
| --- a/base/task_scheduler/task.cc
|
| +++ b/base/task_scheduler/task.cc
|
| @@ -10,20 +10,21 @@ namespace internal {
|
| Task::Task(const tracked_objects::Location& posted_from,
|
| const Closure& task,
|
| const TaskTraits& traits,
|
| - TimeDelta delay)
|
| + TimeDelta delay,
|
| + TaskType task_type)
|
| : PendingTask(posted_from,
|
| task,
|
| delay.is_zero() ? TimeTicks() : TimeTicks::Now() + delay,
|
| false), // Not nestable.
|
| // Prevent a delayed BLOCK_SHUTDOWN task from blocking shutdown before
|
| // being scheduled by changing its shutdown behavior to SKIP_ON_SHUTDOWN.
|
| - traits(!delay.is_zero() &&
|
| - traits.shutdown_behavior() ==
|
| - TaskShutdownBehavior::BLOCK_SHUTDOWN
|
| + traits(!delay.is_zero() && traits.shutdown_behavior() ==
|
| + TaskShutdownBehavior::BLOCK_SHUTDOWN
|
| ? TaskTraits(traits).WithShutdownBehavior(
|
| TaskShutdownBehavior::SKIP_ON_SHUTDOWN)
|
| : traits),
|
| - delay(delay) {}
|
| + delay(delay),
|
| + task_type(task_type) {}
|
|
|
| Task::~Task() = default;
|
|
|
|
|