| Index: content/renderer/webcrypto/webcrypto_impl.h
|
| diff --git a/content/renderer/webcrypto/webcrypto_impl.h b/content/renderer/webcrypto/webcrypto_impl.h
|
| index f0b7dc514a27d13fdbbed1fb3e1b2544d0ea149b..87e0da8a3a0d94a69f12d3fc7ebb771184b5fcc4 100644
|
| --- a/content/renderer/webcrypto/webcrypto_impl.h
|
| +++ b/content/renderer/webcrypto/webcrypto_impl.h
|
| @@ -17,6 +17,7 @@ class CONTENT_EXPORT WebCryptoImpl
|
| : NON_EXPORTED_BASE(public WebKit::WebCrypto) {
|
| public:
|
| WebCryptoImpl();
|
| + virtual ~WebCryptoImpl();
|
|
|
| virtual void encrypt(
|
| const WebKit::WebCryptoAlgorithm& algorithm,
|
| @@ -63,8 +64,6 @@ class CONTENT_EXPORT WebCryptoImpl
|
| unsigned data_size,
|
| WebKit::WebCryptoResult result);
|
|
|
| - static void ShrinkBuffer(WebKit::WebArrayBuffer* buffer, unsigned new_size);
|
| -
|
| protected:
|
| friend class WebCryptoImplTest;
|
|
|
| @@ -114,6 +113,15 @@ class CONTENT_EXPORT WebCryptoImpl
|
| unsigned data_size,
|
| bool* signature_match);
|
|
|
| + bool ImportKeyJwk(
|
| + const unsigned char* key_data,
|
| + unsigned key_data_size,
|
| + bool extractable,
|
| + const WebKit::WebCryptoAlgorithm& algorithm,
|
| + WebKit::WebCryptoKeyUsageMask usage_mask,
|
| + scoped_ptr<WebKit::WebCryptoKeyHandle>* handle,
|
| + WebKit::WebCryptoKeyType* type);
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(WebCryptoImpl);
|
| };
|
|
|