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