| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef BASE_TASK_RUNNER_UTIL_H_ | 5 #ifndef BASE_TASK_RUNNER_UTIL_H_ |
| 6 #define BASE_TASK_RUNNER_UTIL_H_ | 6 #define BASE_TASK_RUNNER_UTIL_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| 11 #include "base/callback_internal.h" |
| 11 #include "base/logging.h" | 12 #include "base/logging.h" |
| 12 #include "base/task_runner.h" | 13 #include "base/task_runner.h" |
| 13 | 14 |
| 14 namespace base { | 15 namespace base { |
| 15 | 16 |
| 16 namespace internal { | 17 namespace internal { |
| 17 | 18 |
| 18 // Helper class for TaskRunner::PostTaskAndReplyWithResult. | 19 // Helper class for TaskRunner::PostTaskAndReplyWithResult. |
| 19 template <typename ReturnType> | 20 template <typename ReturnType> |
| 20 void ReturnAsParamAdapter(const Callback<ReturnType(void)>& func, | 21 void ReturnAsParamAdapter(const Callback<ReturnType(void)>& func, |
| 21 ReturnType* result) { | 22 ReturnType* result) { |
| 22 if (!func.is_null()) | 23 if (!func.is_null()) |
| 23 *result = func.Run(); | 24 *result = func.Run(); |
| 24 } | 25 } |
| 25 | 26 |
| 26 // Helper class for TaskRunner::PostTaskAndReplyWithResult. | 27 // Helper class for TaskRunner::PostTaskAndReplyWithResult. |
| 27 template <typename ReturnType> | 28 template <typename ReturnType> |
| 28 Closure ReturnAsParam(const Callback<ReturnType(void)>& func, | 29 Closure ReturnAsParam(const Callback<ReturnType(void)>& func, |
| 29 ReturnType* result) { | 30 ReturnType* result) { |
| 30 DCHECK(result); | 31 DCHECK(result); |
| 31 return Bind(&ReturnAsParamAdapter<ReturnType>, func, result); | 32 return Bind(&ReturnAsParamAdapter<ReturnType>, func, result); |
| 32 } | 33 } |
| 33 | 34 |
| 34 // Helper class for TaskRunner::PostTaskAndReplyWithResult. | 35 // Helper class for TaskRunner::PostTaskAndReplyWithResult. |
| 35 template <typename ReturnType> | 36 template <typename ReturnType> |
| 36 void ReplyAdapter(const Callback<void(ReturnType)>& callback, | 37 void ReplyAdapter(const Callback<void(ReturnType)>& callback, |
| 37 ReturnType* result) { | 38 ReturnType* result) { |
| 38 DCHECK(result); | 39 DCHECK(result); |
| 39 if(!callback.is_null()) | 40 if(!callback.is_null()) |
| 40 callback.Run(*result); | 41 callback.Run(CallbackForward(*result)); |
| 41 } | 42 } |
| 42 | 43 |
| 43 // Helper class for TaskRunner::PostTaskAndReplyWithResult. | 44 // Helper class for TaskRunner::PostTaskAndReplyWithResult. |
| 44 template <typename ReturnType, typename OwnedType> | 45 template <typename ReturnType, typename OwnedType> |
| 45 Closure ReplyHelper(const Callback<void(ReturnType)>& callback, | 46 Closure ReplyHelper(const Callback<void(ReturnType)>& callback, |
| 46 OwnedType result) { | 47 OwnedType result) { |
| 47 return Bind(&ReplyAdapter<ReturnType>, callback, result); | 48 return Bind(&ReplyAdapter<ReturnType>, callback, result); |
| 48 } | 49 } |
| 49 | 50 |
| 50 } // namespace internal | 51 } // namespace internal |
| (...skipping 21 matching lines...) Expand all Loading... |
| 72 ReturnType* result = new ReturnType; | 73 ReturnType* result = new ReturnType; |
| 73 return task_runner->PostTaskAndReply( | 74 return task_runner->PostTaskAndReply( |
| 74 from_here, | 75 from_here, |
| 75 internal::ReturnAsParam<ReturnType>(task, result), | 76 internal::ReturnAsParam<ReturnType>(task, result), |
| 76 internal::ReplyHelper(reply, Owned(result))); | 77 internal::ReplyHelper(reply, Owned(result))); |
| 77 } | 78 } |
| 78 | 79 |
| 79 } // namespace base | 80 } // namespace base |
| 80 | 81 |
| 81 #endif // BASE_TASK_RUNNER_UTIL_H_ | 82 #endif // BASE_TASK_RUNNER_UTIL_H_ |
| OLD | NEW |