| 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 11 matching lines...) Expand all Loading... |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 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/WebCryptoKey.h" | 32 #include "public/platform/WebCrypto.h" |
| 33 | |
| 34 #include "public/platform/WebCryptoAlgorithm.h" | |
| 35 #include "wtf/OwnPtr.h" | |
| 36 #include "wtf/ThreadSafeRefCounted.h" | |
| 37 | 33 |
| 38 namespace WebKit { | 34 namespace WebKit { |
| 39 | 35 |
| 40 class WebCryptoKeyPrivate : public ThreadSafeRefCounted<WebCryptoKeyPrivate> { | 36 // FIXME: Assert that these methods are called from the right thread. |
| 41 public: | |
| 42 WebCryptoKeyPrivate(PassOwnPtr<WebCryptoKeyHandle> handle, WebCryptoKeyType
type, bool extractable, const WebCryptoAlgorithm& algorithm, WebCryptoKeyUsageMa
sk usages) | |
| 43 : handle(handle) | |
| 44 , type(type) | |
| 45 , extractable(extractable) | |
| 46 , algorithm(algorithm) | |
| 47 , usages(usages) | |
| 48 { | |
| 49 } | |
| 50 | 37 |
| 51 const OwnPtr<WebCryptoKeyHandle> handle; | 38 void WebCryptoOperationResult::initializationFailed() |
| 52 const WebCryptoKeyType type; | |
| 53 const bool extractable; | |
| 54 const WebCryptoAlgorithm algorithm; | |
| 55 const WebCryptoKeyUsageMask usages; | |
| 56 }; | |
| 57 | |
| 58 WebCryptoKey WebCryptoKey::create(WebCryptoKeyHandle* handle, WebCryptoKeyType t
ype, bool extractable, const WebCryptoAlgorithm& algorithm, WebCryptoKeyUsageMas
k usages) | |
| 59 { | 39 { |
| 60 WebCryptoKey key; | 40 m_impl->initializationFailed(); |
| 61 key.m_private = adoptRef(new WebCryptoKeyPrivate(adoptPtr(handle), type, ext
ractable, algorithm, usages)); | 41 reset(); |
| 62 return key; | |
| 63 } | 42 } |
| 64 | 43 |
| 65 WebCryptoKeyHandle* WebCryptoKey::handle() const | 44 void WebCryptoOperationResult::initializationSucceeded(WebCryptoOperation* op) |
| 66 { | 45 { |
| 67 return m_private->handle.get(); | 46 m_impl->initializationSucceeded(op); |
| 47 reset(); |
| 68 } | 48 } |
| 69 | 49 |
| 70 WebCryptoKeyType WebCryptoKey::type() const | 50 void WebCryptoOperationResult::completeWithError() |
| 71 { | 51 { |
| 72 return m_private->type; | 52 m_impl->completeWithError(); |
| 53 reset(); |
| 73 } | 54 } |
| 74 | 55 |
| 75 bool WebCryptoKey::extractable() const | 56 void WebCryptoOperationResult::completeWithArrayBuffer(const WebArrayBuffer& buf
fer) |
| 76 { | 57 { |
| 77 return m_private->extractable; | 58 m_impl->completeWithArrayBuffer(buffer); |
| 59 reset(); |
| 78 } | 60 } |
| 79 | 61 |
| 80 const WebCryptoAlgorithm& WebCryptoKey::algorithm() const | 62 void WebCryptoOperationResult::reset() |
| 81 { | 63 { |
| 82 return m_private->algorithm; | 64 m_impl.reset(); |
| 83 } | 65 } |
| 84 | 66 |
| 85 WebCryptoKeyUsageMask WebCryptoKey::usages() const | 67 void WebCryptoOperationResult::assign(const WebCryptoOperationResult& o) |
| 86 { | 68 { |
| 87 return m_private->usages; | 69 m_impl = o.m_impl; |
| 88 } | 70 } |
| 89 | 71 |
| 90 void WebCryptoKey::assign(const WebCryptoKey& other) | 72 void WebCryptoOperationResult::assign(WebCryptoOperationResultInterface* impl) |
| 91 { | 73 { |
| 92 m_private = other.m_private; | 74 m_impl = impl; |
| 93 } | 75 } |
| 94 | 76 |
| 95 void WebCryptoKey::reset() | 77 void WebCryptoKeyOperationResult::initializationFailed() |
| 96 { | 78 { |
| 97 m_private.reset(); | 79 m_impl->initializationFailed(); |
| 80 reset(); |
| 81 } |
| 82 |
| 83 void WebCryptoKeyOperationResult::initializationSucceeded(WebCryptoKeyOperation*
op) |
| 84 { |
| 85 m_impl->initializationSucceeded(op); |
| 86 reset(); |
| 87 } |
| 88 |
| 89 void WebCryptoKeyOperationResult::completeWithError() |
| 90 { |
| 91 m_impl->completeWithError(); |
| 92 reset(); |
| 93 } |
| 94 |
| 95 void WebCryptoKeyOperationResult::completeWithKey(const WebCryptoKey& key) |
| 96 { |
| 97 m_impl->completeWithKey(key); |
| 98 reset(); |
| 99 } |
| 100 |
| 101 void WebCryptoKeyOperationResult::reset() |
| 102 { |
| 103 m_impl.reset(); |
| 104 } |
| 105 |
| 106 void WebCryptoKeyOperationResult::assign(const WebCryptoKeyOperationResult& o) |
| 107 { |
| 108 m_impl = o.m_impl; |
| 109 } |
| 110 |
| 111 void WebCryptoKeyOperationResult::assign(WebCryptoKeyOperationResultInterface* i
mpl) |
| 112 { |
| 113 m_impl = impl; |
| 98 } | 114 } |
| 99 | 115 |
| 100 } // namespace WebKit | 116 } // namespace WebKit |
| OLD | NEW |