Index: Source/modules/crypto/CryptoResultImpl.h |
diff --git a/Source/modules/crypto/CryptoResultImpl.h b/Source/modules/crypto/CryptoResultImpl.h |
index 117d6863218e978dd4a3a98503119949265fe4c7..03e47d58ae021868e817870a5d9f7024287d75e6 100644 |
--- a/Source/modules/crypto/CryptoResultImpl.h |
+++ b/Source/modules/crypto/CryptoResultImpl.h |
@@ -32,6 +32,7 @@ |
#define CryptoResultImpl_h |
#include "bindings/v8/ScriptPromise.h" |
+#include "core/dom/AsyncInitializerResolver.h" |
#include "platform/CryptoResult.h" |
#include "public/platform/WebCrypto.h" |
#include "wtf/Forward.h" |
@@ -48,7 +49,7 @@ namespace WebCore { |
// * The CryptoResult interface must only be called from the origin thread. |
// * addref() and deref() can be called from any thread. |
// * One of the completeWith***() functions must be called, or the |
-// PromiseState will be leaked until the ExecutionContext is destroyed. |
+// Initializer will be leaked until the ExecutionContext is destroyed. |
class CryptoResultImpl FINAL : public CryptoResult { |
public: |
~CryptoResultImpl(); |
@@ -61,14 +62,13 @@ public: |
virtual void completeWithKey(const blink::WebCryptoKey&) OVERRIDE; |
virtual void completeWithKeyPair(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey) OVERRIDE; |
- // It is only valid to call this before completion. |
ScriptPromise promise(); |
private: |
explicit CryptoResultImpl(ScriptState*); |
+ class Initializer; |
- class PromiseState; |
- WeakPtr<PromiseState> m_promiseState; |
+ WeakPtr<AsyncInitializerResolver<Initializer> > m_resolver; |
}; |
} // namespace WebCore |