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

Side by Side Diff: third_party/WebKit/Source/platform/mojo/MojoHelper.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 #ifndef MojoHelper_h 5 #ifndef MojoHelper_h
6 #define MojoHelper_h 6 #define MojoHelper_h
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "mojo/public/cpp/bindings/callback.h" 9 #include "mojo/public/cpp/bindings/callback.h"
10 #include "mojo/public/cpp/bindings/wtf_array.h" 10 #include "mojo/public/cpp/bindings/wtf_array.h"
11 #include "platform/heap/HeapAllocator.h" 11 #include "platform/heap/HeapAllocator.h"
12 #include <utility> 12 #include <utility>
13 13
14 namespace blink { 14 namespace blink {
15 15
16 namespace internal { 16 namespace internal {
17 17
18 template <typename R, typename... Args> 18 template <typename R, typename... Args>
19 R CallWTFFunction(Function<R(Args...)>* functor, Args... args) 19 R CallWTFFunction(Function<R(Args...)>* functor, Args... args)
20 { 20 {
21 return (*functor)(std::forward<Args>(args)...); 21 return (*functor)(std::forward<Args>(args)...);
22 } 22 }
23 23
24 } 24 }
25 25
26 template <typename R, typename... Args> 26 template <typename R, typename... Args>
27 base::Callback<R(Args...)> createBaseCallback(PassOwnPtr<Function<R(Args...)>> f unctor)
28 {
29 return base::Bind(&internal::CallWTFFunction<R, Args...>, base::Owned(functo r.leakPtr()));
30 }
31
32 template <typename R, typename... Args>
33 base::Callback<R(Args...)> createBaseCallback(std::unique_ptr<Function<R(Args... )>> functor) 27 base::Callback<R(Args...)> createBaseCallback(std::unique_ptr<Function<R(Args... )>> functor)
34 { 28 {
35 return base::Bind(&internal::CallWTFFunction<R, Args...>, base::Owned(functo r.release())); 29 return base::Bind(&internal::CallWTFFunction<R, Args...>, base::Owned(functo r.release()));
36 } 30 }
37 31
38 } // namespace blink 32 } // namespace blink
39 33
40 namespace mojo { 34 namespace mojo {
41 35
42 // A |TypeConverter| that will create a |WTFArray<T>| containing a copy of the 36 // A |TypeConverter| that will create a |WTFArray<T>| containing a copy of the
43 // contents of a |blink::HeapVector<E>|, using |TypeConverter<T, E>| to copy 37 // contents of a |blink::HeapVector<E>|, using |TypeConverter<T, E>| to copy
44 // each element. The returned array will always be non-null. 38 // each element. The returned array will always be non-null.
45 template <typename T, typename E> 39 template <typename T, typename E>
46 struct TypeConverter<WTFArray<T>, blink::HeapVector<E>> { 40 struct TypeConverter<WTFArray<T>, blink::HeapVector<E>> {
47 static WTFArray<T> Convert(const blink::HeapVector<E>& input) 41 static WTFArray<T> Convert(const blink::HeapVector<E>& input)
48 { 42 {
49 WTFArray<T> result(input.size()); 43 WTFArray<T> result(input.size());
50 for (size_t i = 0; i < input.size(); ++i) 44 for (size_t i = 0; i < input.size(); ++i)
51 result[i] = TypeConverter<T, E>::Convert(input[i]); 45 result[i] = TypeConverter<T, E>::Convert(input[i]);
52 return std::move(result); 46 return std::move(result);
53 } 47 }
54 }; 48 };
55 49
56 } // namespace mojo 50 } // namespace mojo
57 51
58 #endif // MojoHelper_h 52 #endif // MojoHelper_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698