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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebCryptoKey.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "public/platform/WebCryptoKey.h" 31 #include "public/platform/WebCryptoKey.h"
32 32
33 #include "public/platform/WebCryptoAlgorithm.h" 33 #include "public/platform/WebCryptoAlgorithm.h"
34 #include "public/platform/WebCryptoAlgorithmParams.h" 34 #include "public/platform/WebCryptoAlgorithmParams.h"
35 #include "public/platform/WebCryptoKeyAlgorithm.h" 35 #include "public/platform/WebCryptoKeyAlgorithm.h"
36 #include "wtf/PtrUtil.h" 36 #include "wtf/OwnPtr.h"
37 #include "wtf/ThreadSafeRefCounted.h" 37 #include "wtf/ThreadSafeRefCounted.h"
38 #include <memory>
39 38
40 namespace blink { 39 namespace blink {
41 40
42 class WebCryptoKeyPrivate : public ThreadSafeRefCounted<WebCryptoKeyPrivate> { 41 class WebCryptoKeyPrivate : public ThreadSafeRefCounted<WebCryptoKeyPrivate> {
43 public: 42 public:
44 WebCryptoKeyPrivate(std::unique_ptr<WebCryptoKeyHandle> handle, WebCryptoKey Type type, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKe yUsageMask usages) 43 WebCryptoKeyPrivate(PassOwnPtr<WebCryptoKeyHandle> handle, WebCryptoKeyType type, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKeyUsag eMask usages)
45 : handle(std::move(handle)) 44 : handle(std::move(handle))
46 , type(type) 45 , type(type)
47 , extractable(extractable) 46 , extractable(extractable)
48 , algorithm(algorithm) 47 , algorithm(algorithm)
49 , usages(usages) 48 , usages(usages)
50 { 49 {
51 ASSERT(!algorithm.isNull()); 50 ASSERT(!algorithm.isNull());
52 } 51 }
53 52
54 const std::unique_ptr<WebCryptoKeyHandle> handle; 53 const OwnPtr<WebCryptoKeyHandle> handle;
55 const WebCryptoKeyType type; 54 const WebCryptoKeyType type;
56 const bool extractable; 55 const bool extractable;
57 const WebCryptoKeyAlgorithm algorithm; 56 const WebCryptoKeyAlgorithm algorithm;
58 const WebCryptoKeyUsageMask usages; 57 const WebCryptoKeyUsageMask usages;
59 }; 58 };
60 59
61 WebCryptoKey WebCryptoKey::create(WebCryptoKeyHandle* handle, WebCryptoKeyType t ype, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKeyUsage Mask usages) 60 WebCryptoKey WebCryptoKey::create(WebCryptoKeyHandle* handle, WebCryptoKeyType t ype, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKeyUsage Mask usages)
62 { 61 {
63 WebCryptoKey key; 62 WebCryptoKey key;
64 key.m_private = adoptRef(new WebCryptoKeyPrivate(wrapUnique(handle), type, e xtractable, algorithm, usages)); 63 key.m_private = adoptRef(new WebCryptoKeyPrivate(adoptPtr(handle), type, ext ractable, algorithm, usages));
65 return key; 64 return key;
66 } 65 }
67 66
68 WebCryptoKey WebCryptoKey::createNull() 67 WebCryptoKey WebCryptoKey::createNull()
69 { 68 {
70 return WebCryptoKey(); 69 return WebCryptoKey();
71 } 70 }
72 71
73 WebCryptoKeyHandle* WebCryptoKey::handle() const 72 WebCryptoKeyHandle* WebCryptoKey::handle() const
74 { 73 {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 { 113 {
115 m_private = other.m_private; 114 m_private = other.m_private;
116 } 115 }
117 116
118 void WebCryptoKey::reset() 117 void WebCryptoKey::reset()
119 { 118 {
120 m_private.reset(); 119 m_private.reset();
121 } 120 }
122 121
123 } // namespace blink 122 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698