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..0a1aa615f856540e6f8e8bfc686cf01559765b14 100644 |
--- a/content/renderer/webcrypto/webcrypto_impl.h |
+++ b/content/renderer/webcrypto/webcrypto_impl.h |
@@ -5,6 +5,8 @@ |
#ifndef CONTENT_RENDERER_WEBCRYPTO_WEBCRYPTO_IMPL_H_ |
#define CONTENT_RENDERER_WEBCRYPTO_WEBCRYPTO_IMPL_H_ |
+#include <map> |
+#include <string> |
eroman
2013/10/28 23:02:00
These two headers appear unused in this file. Add
padolph
2013/10/29 02:25:40
Done.
|
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
@@ -17,6 +19,7 @@ class CONTENT_EXPORT WebCryptoImpl |
: NON_EXPORTED_BASE(public WebKit::WebCrypto) { |
public: |
WebCryptoImpl(); |
+ virtual ~WebCryptoImpl(); |
eroman
2013/10/28 23:02:00
Any reason to add the destructor definition? Since
padolph
2013/10/29 02:25:40
Clang complained when I didn't have this. Should I
|
virtual void encrypt( |
const WebKit::WebCryptoAlgorithm& algorithm, |
@@ -63,8 +66,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 +115,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); |
}; |