OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "remoting/client/plugin/pepper_main_thread_task_runner.h" | 5 #include "remoting/client/plugin/pepper_main_thread_task_runner.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/bind.h" | 10 #include "base/bind.h" |
10 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
11 #include "ppapi/cpp/completion_callback.h" | 12 #include "ppapi/cpp/completion_callback.h" |
12 #include "ppapi/cpp/core.h" | 13 #include "ppapi/cpp/core.h" |
13 #include "ppapi/cpp/module.h" | 14 #include "ppapi/cpp/module.h" |
14 | 15 |
15 namespace remoting { | 16 namespace remoting { |
16 namespace { | 17 namespace { |
17 | 18 |
18 void RunAndDestroy(void* task_ptr, int32_t) { | 19 void RunAndDestroy(void* task_ptr, int32_t) { |
19 std::unique_ptr<base::Closure> task(static_cast<base::Closure*>(task_ptr)); | 20 std::unique_ptr<base::Closure> task(static_cast<base::Closure*>(task_ptr)); |
20 task->Run(); | 21 task->Run(); |
21 } | 22 } |
22 | 23 |
23 } // namespace | 24 } // namespace |
24 | 25 |
25 PepperMainThreadTaskRunner::PepperMainThreadTaskRunner() | 26 PepperMainThreadTaskRunner::PepperMainThreadTaskRunner() |
26 : core_(pp::Module::Get()->core()), weak_ptr_factory_(this) { | 27 : core_(pp::Module::Get()->core()), weak_ptr_factory_(this) { |
27 DCHECK(core_->IsMainThread()); | 28 DCHECK(core_->IsMainThread()); |
28 weak_ptr_ = weak_ptr_factory_.GetWeakPtr(); | 29 weak_ptr_ = weak_ptr_factory_.GetWeakPtr(); |
29 } | 30 } |
30 | 31 |
31 bool PepperMainThreadTaskRunner::PostDelayedTask( | 32 bool PepperMainThreadTaskRunner::PostDelayedTask( |
32 const tracked_objects::Location& from_here, | 33 const tracked_objects::Location& from_here, |
33 const base::Closure& task, | 34 base::Closure task, |
34 base::TimeDelta delay) { | 35 base::TimeDelta delay) { |
35 auto task_ptr = base::MakeUnique<base::Closure>( | 36 auto task_ptr = base::MakeUnique<base::Closure>(base::Bind( |
36 base::Bind(&PepperMainThreadTaskRunner::RunTask, weak_ptr_, task)); | 37 &PepperMainThreadTaskRunner::RunTask, weak_ptr_, base::Passed(&task))); |
37 core_->CallOnMainThread( | 38 core_->CallOnMainThread( |
38 delay.InMillisecondsRoundedUp(), | 39 delay.InMillisecondsRoundedUp(), |
39 pp::CompletionCallback(&RunAndDestroy, task_ptr.release())); | 40 pp::CompletionCallback(&RunAndDestroy, task_ptr.release())); |
40 return true; | 41 return true; |
41 } | 42 } |
42 | 43 |
43 bool PepperMainThreadTaskRunner::PostNonNestableDelayedTask( | 44 bool PepperMainThreadTaskRunner::PostNonNestableDelayedTask( |
44 const tracked_objects::Location& from_here, | 45 const tracked_objects::Location& from_here, |
45 const base::Closure& task, | 46 base::Closure task, |
46 base::TimeDelta delay) { | 47 base::TimeDelta delay) { |
47 return PostDelayedTask(from_here, task, delay); | 48 return PostDelayedTask(from_here, std::move(task), delay); |
48 } | 49 } |
49 | 50 |
50 bool PepperMainThreadTaskRunner::RunsTasksOnCurrentThread() const { | 51 bool PepperMainThreadTaskRunner::RunsTasksOnCurrentThread() const { |
51 return core_->IsMainThread(); | 52 return core_->IsMainThread(); |
52 } | 53 } |
53 | 54 |
54 PepperMainThreadTaskRunner::~PepperMainThreadTaskRunner() {} | 55 PepperMainThreadTaskRunner::~PepperMainThreadTaskRunner() {} |
55 | 56 |
56 void PepperMainThreadTaskRunner::RunTask(const base::Closure& task) { | 57 void PepperMainThreadTaskRunner::RunTask(base::Closure task) { |
57 task.Run(); | 58 std::move(task).Run(); |
58 } | 59 } |
59 | 60 |
60 } // namespace remoting | 61 } // namespace remoting |
OLD | NEW |