Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: base/task_scheduler/task.cc

Issue 2831883003: Do not inherit TaskPriority in TaskTraits. (Closed)
Patch Set: self-review Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/task_scheduler/task.h" 5 #include "base/task_scheduler/task.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/critical_closure.h" 9 #include "base/critical_closure.h"
10 #include "base/logging.h"
10 11
11 namespace base { 12 namespace base {
12 namespace internal { 13 namespace internal {
13 14
14 Task::Task(const tracked_objects::Location& posted_from, 15 Task::Task(const tracked_objects::Location& posted_from,
15 OnceClosure task, 16 OnceClosure task,
16 const TaskTraits& traits, 17 const TaskTraits& traits,
17 TimeDelta delay) 18 TimeDelta delay)
18 : PendingTask( 19 : PendingTask(
19 posted_from, 20 posted_from,
20 traits.shutdown_behavior() == TaskShutdownBehavior::BLOCK_SHUTDOWN 21 traits.shutdown_behavior() == TaskShutdownBehavior::BLOCK_SHUTDOWN
21 ? MakeCriticalClosure(std::move(task)) 22 ? MakeCriticalClosure(std::move(task))
22 : std::move(task), 23 : std::move(task),
23 delay.is_zero() ? TimeTicks() : TimeTicks::Now() + delay, 24 delay.is_zero() ? TimeTicks() : TimeTicks::Now() + delay,
24 false), // Not nestable. 25 false), // Not nestable.
25 // Prevent a delayed BLOCK_SHUTDOWN task from blocking shutdown before 26 // Prevent a delayed BLOCK_SHUTDOWN task from blocking shutdown before
26 // being scheduled by changing its shutdown behavior to SKIP_ON_SHUTDOWN. 27 // being scheduled by changing its shutdown behavior to SKIP_ON_SHUTDOWN.
27 traits(!delay.is_zero() && traits.shutdown_behavior() == 28 traits(!delay.is_zero() && traits.shutdown_behavior() ==
28 TaskShutdownBehavior::BLOCK_SHUTDOWN 29 TaskShutdownBehavior::BLOCK_SHUTDOWN
29 ? TaskTraits(traits).WithShutdownBehavior( 30 ? TaskTraits(traits).WithShutdownBehavior(
30 TaskShutdownBehavior::SKIP_ON_SHUTDOWN) 31 TaskShutdownBehavior::SKIP_ON_SHUTDOWN)
31 : traits), 32 : traits),
32 delay(delay) {} 33 delay(delay) {
34 DCHECK_LE(static_cast<int>(traits.priority()),
35 static_cast<int>(TaskPriority::HIGHEST));
36 }
33 37
34 Task::~Task() = default; 38 Task::~Task() = default;
35 39
36 } // namespace internal 40 } // namespace internal
37 } // namespace base 41 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698