OLD | NEW |
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 14 matching lines...) Expand all Loading... |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
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 "config.h" | 31 #include "config.h" |
32 #include "public/platform/WebCrypto.h" | 32 #include "public/platform/WebCrypto.h" |
33 | 33 |
34 #include "platform/CryptoResult.h" | 34 #include "platform/CryptoResult.h" |
35 #include "wtf/PassRefPtr.h" | 35 #include "platform/heap/Heap.h" |
| 36 #include "wtf/MainThread.h" |
36 #include <string.h> | 37 #include <string.h> |
37 | 38 |
38 namespace blink { | 39 namespace blink { |
39 | 40 |
40 void WebCryptoResult::completeWithError(WebCryptoErrorType errorType, const WebS
tring& errorDetails) | 41 void WebCryptoResult::completeWithError(WebCryptoErrorType errorType, const WebS
tring& errorDetails) |
41 { | 42 { |
42 m_impl->completeWithError(errorType, errorDetails); | 43 m_impl->completeWithError(errorType, errorDetails); |
43 reset(); | 44 reset(); |
44 } | 45 } |
45 | 46 |
(...skipping 28 matching lines...) Expand all Loading... |
74 ASSERT(!privateKey.isNull()); | 75 ASSERT(!privateKey.isNull()); |
75 m_impl->completeWithKeyPair(publicKey, privateKey); | 76 m_impl->completeWithKeyPair(publicKey, privateKey); |
76 reset(); | 77 reset(); |
77 } | 78 } |
78 | 79 |
79 bool WebCryptoResult::cancelled() const | 80 bool WebCryptoResult::cancelled() const |
80 { | 81 { |
81 return m_impl->cancelled(); | 82 return m_impl->cancelled(); |
82 } | 83 } |
83 | 84 |
84 WebCryptoResult::WebCryptoResult(const PassRefPtr<CryptoResult>& impl) | 85 WebCryptoResult::WebCryptoResult(const PassRefPtrWillBeRawPtr<CryptoResult>& imp
l) |
85 : m_impl(impl) | 86 : m_impl(impl) |
86 { | 87 { |
87 ASSERT(m_impl.get()); | 88 ASSERT(m_impl.get()); |
88 } | 89 } |
89 | 90 |
90 void WebCryptoResult::reset() | 91 void WebCryptoResult::reset() |
91 { | 92 { |
92 m_impl.reset(); | 93 m_impl.reset(); |
93 } | 94 } |
94 | 95 |
95 void WebCryptoResult::assign(const WebCryptoResult& o) | 96 void WebCryptoResult::assign(const WebCryptoResult& o) |
96 { | 97 { |
97 m_impl = o.m_impl; | 98 m_impl = o.m_impl; |
98 } | 99 } |
99 | 100 |
100 } // namespace blink | 101 } // namespace blink |
OLD | NEW |