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

Unified Diff: Source/platform/exported/WebCryptoKey.cpp

Issue 179353002: [webcrypto] Add the KeyAlgorithm interface. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase yet again (another conflict) Created 6 years, 10 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
« no previous file with comments | « Source/platform/exported/WebCryptoAlgorithm.cpp ('k') | Source/platform/exported/WebCryptoKeyAlgorithm.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/exported/WebCryptoKey.cpp
diff --git a/Source/platform/exported/WebCryptoKey.cpp b/Source/platform/exported/WebCryptoKey.cpp
index 2f63e9cdb5157fa56dd36272bdaf6bbf9c7eab53..28f95b433ba736e228d7ebb9887f1a98757f148f 100644
--- a/Source/platform/exported/WebCryptoKey.cpp
+++ b/Source/platform/exported/WebCryptoKey.cpp
@@ -32,6 +32,8 @@
#include "public/platform/WebCryptoKey.h"
#include "public/platform/WebCryptoAlgorithm.h"
+#include "public/platform/WebCryptoAlgorithmParams.h"
+#include "public/platform/WebCryptoKeyAlgorithm.h"
#include "wtf/OwnPtr.h"
#include "wtf/ThreadSafeRefCounted.h"
@@ -39,7 +41,7 @@ namespace blink {
class WebCryptoKeyPrivate : public ThreadSafeRefCounted<WebCryptoKeyPrivate> {
public:
- WebCryptoKeyPrivate(PassOwnPtr<WebCryptoKeyHandle> handle, WebCryptoKeyType type, bool extractable, const WebCryptoAlgorithm& algorithm, WebCryptoKeyUsageMask usages)
+ WebCryptoKeyPrivate(PassOwnPtr<WebCryptoKeyHandle> handle, WebCryptoKeyType type, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKeyUsageMask usages)
: handle(handle)
, type(type)
, extractable(extractable)
@@ -52,11 +54,11 @@ public:
const OwnPtr<WebCryptoKeyHandle> handle;
const WebCryptoKeyType type;
const bool extractable;
- const WebCryptoAlgorithm algorithm;
+ const WebCryptoKeyAlgorithm algorithm;
const WebCryptoKeyUsageMask usages;
};
-WebCryptoKey WebCryptoKey::create(WebCryptoKeyHandle* handle, WebCryptoKeyType type, bool extractable, const WebCryptoAlgorithm& algorithm, WebCryptoKeyUsageMask usages)
+WebCryptoKey WebCryptoKey::create(WebCryptoKeyHandle* handle, WebCryptoKeyType type, bool extractable, const WebCryptoKeyAlgorithm& algorithm, WebCryptoKeyUsageMask usages)
{
WebCryptoKey key;
key.m_private = adoptRef(new WebCryptoKeyPrivate(adoptPtr(handle), type, extractable, algorithm, usages));
@@ -86,7 +88,7 @@ bool WebCryptoKey::extractable() const
return m_private->extractable;
}
-const WebCryptoAlgorithm& WebCryptoKey::algorithm() const
+const WebCryptoKeyAlgorithm& WebCryptoKey::algorithm() const
{
ASSERT(!isNull());
return m_private->algorithm;
« no previous file with comments | « Source/platform/exported/WebCryptoAlgorithm.cpp ('k') | Source/platform/exported/WebCryptoKeyAlgorithm.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698