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 15 matching lines...) Expand all Loading... |
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 "platform/heap/Heap.h" | 35 #include "platform/heap/Heap.h" |
36 #include <string.h> | |
37 | 36 |
38 namespace blink { | 37 namespace blink { |
39 | 38 |
40 void WebCryptoResult::completeWithError(WebCryptoErrorType errorType, const WebS
tring& errorDetails) | 39 void WebCryptoResult::completeWithError(WebCryptoErrorType errorType, const WebS
tring& errorDetails) |
41 { | 40 { |
42 m_impl->completeWithError(errorType, errorDetails); | 41 if (!cancelled()) |
| 42 m_impl->completeWithError(errorType, errorDetails); |
43 reset(); | 43 reset(); |
44 } | 44 } |
45 | 45 |
46 void WebCryptoResult::completeWithBuffer(const void* bytes, unsigned bytesSize) | 46 void WebCryptoResult::completeWithBuffer(const void* bytes, unsigned bytesSize) |
47 { | 47 { |
48 m_impl->completeWithBuffer(bytes, bytesSize); | 48 if (!cancelled()) |
| 49 m_impl->completeWithBuffer(bytes, bytesSize); |
49 reset(); | 50 reset(); |
50 } | 51 } |
51 | 52 |
52 void WebCryptoResult::completeWithJson(const char* utf8Data, unsigned length) | 53 void WebCryptoResult::completeWithJson(const char* utf8Data, unsigned length) |
53 { | 54 { |
54 m_impl->completeWithJson(utf8Data, length); | 55 if (!cancelled()) |
| 56 m_impl->completeWithJson(utf8Data, length); |
55 reset(); | 57 reset(); |
56 } | 58 } |
57 | 59 |
58 void WebCryptoResult::completeWithBoolean(bool b) | 60 void WebCryptoResult::completeWithBoolean(bool b) |
59 { | 61 { |
60 m_impl->completeWithBoolean(b); | 62 if (!cancelled()) |
| 63 m_impl->completeWithBoolean(b); |
61 reset(); | 64 reset(); |
62 } | 65 } |
63 | 66 |
64 void WebCryptoResult::completeWithKey(const WebCryptoKey& key) | 67 void WebCryptoResult::completeWithKey(const WebCryptoKey& key) |
65 { | 68 { |
66 ASSERT(!key.isNull()); | 69 ASSERT(!key.isNull()); |
67 m_impl->completeWithKey(key); | 70 if (!cancelled()) |
| 71 m_impl->completeWithKey(key); |
68 reset(); | 72 reset(); |
69 } | 73 } |
70 | 74 |
71 void WebCryptoResult::completeWithKeyPair(const WebCryptoKey& publicKey, const W
ebCryptoKey& privateKey) | 75 void WebCryptoResult::completeWithKeyPair(const WebCryptoKey& publicKey, const W
ebCryptoKey& privateKey) |
72 { | 76 { |
73 ASSERT(!publicKey.isNull()); | 77 ASSERT(!publicKey.isNull()); |
74 ASSERT(!privateKey.isNull()); | 78 ASSERT(!privateKey.isNull()); |
75 m_impl->completeWithKeyPair(publicKey, privateKey); | 79 if (!cancelled()) |
| 80 m_impl->completeWithKeyPair(publicKey, privateKey); |
76 reset(); | 81 reset(); |
77 } | 82 } |
78 | 83 |
79 bool WebCryptoResult::cancelled() const | 84 bool WebCryptoResult::cancelled() const |
80 { | 85 { |
81 return m_impl->cancelled(); | 86 return m_cancel->cancelled(); |
82 } | 87 } |
83 | 88 |
84 WebCryptoResult::WebCryptoResult(const PassRefPtrWillBeRawPtr<CryptoResult>& imp
l) | 89 WebCryptoResult::WebCryptoResult(const PassRefPtrWillBeRawPtr<CryptoResult>& imp
l, const PassRefPtr<CryptoResultCancel>& cancel) |
85 : m_impl(impl) | 90 : m_impl(impl) |
| 91 , m_cancel(cancel) |
86 { | 92 { |
87 ASSERT(m_impl.get()); | 93 ASSERT(m_impl.get()); |
| 94 ASSERT(m_cancel.get()); |
88 } | 95 } |
89 | 96 |
90 void WebCryptoResult::reset() | 97 void WebCryptoResult::reset() |
91 { | 98 { |
92 m_impl.reset(); | 99 m_impl.reset(); |
| 100 m_cancel.reset(); |
93 } | 101 } |
94 | 102 |
95 void WebCryptoResult::assign(const WebCryptoResult& o) | 103 void WebCryptoResult::assign(const WebCryptoResult& o) |
96 { | 104 { |
97 m_impl = o.m_impl; | 105 m_impl = o.m_impl; |
| 106 m_cancel = o.m_cancel; |
98 } | 107 } |
99 | 108 |
100 } // namespace blink | 109 } // namespace blink |
OLD | NEW |