| 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);
|
|
|