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

Unified Diff: Source/core/platform/chromium/support/WebCrypto.cpp

Issue 19885002: WebCrypto: Add interfaces for importKey(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use a wrapper for the result rather than raw pointer Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/platform/chromium/support/WebCrypto.cpp
diff --git a/Source/core/platform/chromium/support/WebCrypto.cpp b/Source/core/platform/chromium/support/WebCrypto.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3af7dfe6e5202eefeb7abbb6433312297ddee757
--- /dev/null
+++ b/Source/core/platform/chromium/support/WebCrypto.cpp
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "public/platform/WebCrypto.h"
+
+#include "modules/crypto/CryptoOperation.h"
+#include "modules/crypto/KeyOperation.h"
+
+namespace WebKit {
+
+// FIXME: Assert that these methods (especially assignment) are called from the
+// correct thread.
+
+WebCryptoOperationResult::WebCryptoOperationResult(WebCore::CryptoOperation* impl)
+ : m_impl(impl)
+{
+ ASSERT(impl);
+}
+
+void WebCryptoOperationResult::initializationFailed()
+{
+ m_impl->initializationFailed();
+ m_impl = 0;
+}
+
+void WebCryptoOperationResult::initializationSucceeded(WebCryptoOperation* op)
+{
+ m_impl->initializationSucceeded(op);
+ m_impl = 0;
+}
+
+void WebCryptoOperationResult::completeWithError()
+{
+ m_impl->completeWithError();
+ m_impl = 0;
+}
+
+void WebCryptoOperationResult::completeWithArrayBuffer(const WebArrayBuffer& buffer)
+{
+ m_impl->completeWithArrayBuffer(buffer);
+ m_impl = 0;
+}
+
+WebCryptoKeyOperationResult::WebCryptoKeyOperationResult(WebCore::KeyOperation* impl)
+ : m_impl(impl)
+{
+ ASSERT(impl);
+}
+
+void WebCryptoKeyOperationResult::initializationFailed()
+{
+ m_impl->initializationFailed();
+ m_impl.reset();
+}
+
+void WebCryptoKeyOperationResult::initializationSucceeded(WebCryptoKeyOperation* op)
+{
+ m_impl->initializationSucceeded(op);
+ m_impl.reset();
+}
+
+void WebCryptoKeyOperationResult::completeWithError()
+{
+ m_impl->completeWithError();
+ m_impl.reset();
+}
+
+void WebCryptoKeyOperationResult::completeWithKey(const WebCryptoKey& key)
+{
+ m_impl->completeWithKey(key);
+ m_impl.reset();
+}
+
+void WebCryptoKeyOperationResult::reset()
+{
+ // When destroying, the operation should have already been completed.
+ ASSERT(!m_impl.get());
+ m_impl.reset();
+}
+
+void WebCryptoKeyOperationResult::assign(const WebCryptoKeyOperationResult& o)
+{
+ m_impl = o.m_impl;
+}
+
+} // namespace WebKit

Powered by Google App Engine
This is Rietveld 408576698