Index: Source/modules/crypto/CryptoOperation.h |
diff --git a/Source/modules/crypto/CryptoOperation.h b/Source/modules/crypto/CryptoOperation.h |
index 79e79a6c882b820b8226c5d01c00dc06f565f424..b53e5396f13f1b724b1824a9857db7b6dabaf845 100644 |
--- a/Source/modules/crypto/CryptoOperation.h |
+++ b/Source/modules/crypto/CryptoOperation.h |
@@ -34,21 +34,23 @@ |
#include "bindings/v8/ScriptObject.h" |
#include "bindings/v8/ScriptWrappable.h" |
#include "modules/crypto/Algorithm.h" |
-#include "public/platform/WebCrypto.h" |
#include "public/platform/WebCryptoAlgorithm.h" |
+#include "public/platform/WebCrypto.h" |
#include "wtf/Forward.h" |
#include "wtf/PassRefPtr.h" |
-#include "wtf/RefCounted.h" |
+#include "wtf/ThreadSafeRefCounted.h" |
namespace WebCore { |
class ScriptPromiseResolver; |
class ExceptionState; |
-class CryptoOperation : public ScriptWrappable, public WebKit::WebCryptoOperationResult, public RefCounted<CryptoOperation> { |
+typedef int ExceptionCode; |
+ |
+class CryptoOperation : public ScriptWrappable, public ThreadSafeRefCounted<CryptoOperation> { |
public: |
~CryptoOperation(); |
- static PassRefPtr<CryptoOperation> create(const WebKit::WebCryptoAlgorithm&, ExceptionState*); |
+ static PassRefPtr<CryptoOperation> create(const WebKit::WebCryptoAlgorithm&); |
CryptoOperation* process(ArrayBuffer* data); |
CryptoOperation* process(ArrayBufferView* data); |
@@ -58,11 +60,12 @@ public: |
Algorithm* algorithm(); |
- // Implementation of WebKit::WebCryptoOperationResult. |
- virtual void initializationFailed() OVERRIDE; |
- virtual void initializationSucceded(WebKit::WebCryptoOperation*) OVERRIDE; |
- virtual void completeWithError() OVERRIDE; |
- virtual void completeWithArrayBuffer(const WebKit::WebArrayBuffer&) OVERRIDE; |
+ void initializationFailed(); |
+ void initializationSucceeded(WebKit::WebCryptoOperation*); |
+ void completeWithError(); |
+ void completeWithArrayBuffer(const WebKit::WebArrayBuffer&); |
+ |
+ CryptoOperation* returnValue(ExceptionState&); |
private: |
enum State { |
@@ -82,7 +85,7 @@ private: |
Done, |
}; |
- CryptoOperation(const WebKit::WebCryptoAlgorithm&, ExceptionState*); |
+ explicit CryptoOperation(const WebKit::WebCryptoAlgorithm&); |
void process(const unsigned char*, size_t); |
@@ -99,7 +102,7 @@ private: |
RefPtr<ScriptPromiseResolver> m_promiseResolver; |
- ExceptionState* m_exceptionState; |
+ ExceptionCode m_exceptionCode; |
}; |
} // namespace WebCore |