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

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

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 /* 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/OwnPtr.h" 36 #include "wtf/PtrUtil.h"
37 #include "wtf/ThreadSafeRefCounted.h" 37 #include "wtf/ThreadSafeRefCounted.h"
38 #include <memory>
38 39
39 namespace blink { 40 namespace blink {
40 41
41 class WebCryptoKeyPrivate : public ThreadSafeRefCounted<WebCryptoKeyPrivate> { 42 class WebCryptoKeyPrivate : public ThreadSafeRefCounted<WebCryptoKeyPrivate> {
42 public: 43 public:
43 WebCryptoKeyPrivate(PassOwnPtr<WebCryptoKeyHandle> handle, WebCryptoKeyType type, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKeyUsag eMask usages) 44 WebCryptoKeyPrivate(std::unique_ptr<WebCryptoKeyHandle> handle, WebCryptoKey Type type, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKe yUsageMask usages)
44 : handle(std::move(handle)) 45 : handle(std::move(handle))
45 , type(type) 46 , type(type)
46 , extractable(extractable) 47 , extractable(extractable)
47 , algorithm(algorithm) 48 , algorithm(algorithm)
48 , usages(usages) 49 , usages(usages)
49 { 50 {
50 ASSERT(!algorithm.isNull()); 51 ASSERT(!algorithm.isNull());
51 } 52 }
52 53
53 const OwnPtr<WebCryptoKeyHandle> handle; 54 const std::unique_ptr<WebCryptoKeyHandle> handle;
54 const WebCryptoKeyType type; 55 const WebCryptoKeyType type;
55 const bool extractable; 56 const bool extractable;
56 const WebCryptoKeyAlgorithm algorithm; 57 const WebCryptoKeyAlgorithm algorithm;
57 const WebCryptoKeyUsageMask usages; 58 const WebCryptoKeyUsageMask usages;
58 }; 59 };
59 60
60 WebCryptoKey WebCryptoKey::create(WebCryptoKeyHandle* handle, WebCryptoKeyType t ype, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKeyUsage Mask usages) 61 WebCryptoKey WebCryptoKey::create(WebCryptoKeyHandle* handle, WebCryptoKeyType t ype, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKeyUsage Mask usages)
61 { 62 {
62 WebCryptoKey key; 63 WebCryptoKey key;
63 key.m_private = adoptRef(new WebCryptoKeyPrivate(adoptPtr(handle), type, ext ractable, algorithm, usages)); 64 key.m_private = adoptRef(new WebCryptoKeyPrivate(wrapUnique(handle), type, e xtractable, algorithm, usages));
64 return key; 65 return key;
65 } 66 }
66 67
67 WebCryptoKey WebCryptoKey::createNull() 68 WebCryptoKey WebCryptoKey::createNull()
68 { 69 {
69 return WebCryptoKey(); 70 return WebCryptoKey();
70 } 71 }
71 72
72 WebCryptoKeyHandle* WebCryptoKey::handle() const 73 WebCryptoKeyHandle* WebCryptoKey::handle() const
73 { 74 {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 { 114 {
114 m_private = other.m_private; 115 m_private = other.m_private;
115 } 116 }
116 117
117 void WebCryptoKey::reset() 118 void WebCryptoKey::reset()
118 { 119 {
119 m_private.reset(); 120 m_private.reset();
120 } 121 }
121 122
122 } // namespace blink 123 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698