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

Unified Diff: public/platform/WebCrypto.h

Issue 338993002: [webcrypto] exportKey() now returns dictionary when format='jwk' (CL 2 of 2). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and fix rsa-oaep-key-manipulation.html Created 6 years, 6 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/WebCryptoResult.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public/platform/WebCrypto.h
diff --git a/public/platform/WebCrypto.h b/public/platform/WebCrypto.h
index b7533207533c2206f24d5e6e4a23a0c618ea174e..c01f05e5a8e43a4eec34e59e9dfdd15de1690963 100644
--- a/public/platform/WebCrypto.h
+++ b/public/platform/WebCrypto.h
@@ -44,6 +44,9 @@ namespace WebCore { class CryptoResult; }
namespace WTF { template <typename T> class PassRefPtr; }
#endif
+// FIXME: Remove once chromium side rolls.
+#define WEBCRYPTO_RESULT_ACCEPTS_JSON 1
+
namespace blink {
class WebArrayBuffer;
@@ -90,6 +93,7 @@ public:
BLINK_PLATFORM_EXPORT void completeWithBuffer(const WebArrayBuffer&);
// Makes a copy of the input data given as a pointer and byte length.
BLINK_PLATFORM_EXPORT void completeWithBuffer(const void*, unsigned);
+ BLINK_PLATFORM_EXPORT void completeWithJson(const char* utf8Data, unsigned length);
BLINK_PLATFORM_EXPORT void completeWithBoolean(bool);
BLINK_PLATFORM_EXPORT void completeWithKey(const WebCryptoKey&);
BLINK_PLATFORM_EXPORT void completeWithKeyPair(const WebCryptoKey& publicKey, const WebCryptoKey& privateKey);
« no previous file with comments | « Source/platform/exported/WebCryptoResult.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698