Chromium Code Reviews| Index: Source/modules/crypto/CryptoResultImpl.h |
| diff --git a/Source/modules/crypto/CryptoResultImpl.h b/Source/modules/crypto/CryptoResultImpl.h |
| index 0b54ba2ec71d0fa19e0465baccd6d462d9e4b4f0..f4fa76bf8d38620bbb0cd41a51d33b7206ddcb13 100644 |
| --- a/Source/modules/crypto/CryptoResultImpl.h |
| +++ b/Source/modules/crypto/CryptoResultImpl.h |
| @@ -31,9 +31,8 @@ |
| #ifndef CryptoResultImpl_h |
| #define CryptoResultImpl_h |
| -#include "bindings/v8/NewScriptState.h" |
| #include "bindings/v8/ScriptPromise.h" |
| -#include "bindings/v8/ScriptPromiseResolver.h" |
| +#include "bindings/v8/ScriptPromiseResolverWithContext.h" |
| #include "core/dom/ContextLifecycleObserver.h" |
| #include "platform/CryptoResult.h" |
| #include "public/platform/WebCrypto.h" |
| @@ -43,9 +42,6 @@ |
| namespace WebCore { |
| -class ScriptPromiseResolver; |
| -class ScriptState; |
| - |
| // Wrapper around a Promise to notify completion of the crypto operation. |
| // Platform cannot know about Promises which are declared in bindings. |
| class CryptoResultImpl FINAL : public CryptoResult, public ContextLifecycleObserver { |
|
eroman
2014/04/16 17:35:05
Can the ContextLifecycleObserver be removed now?
|
| @@ -76,8 +72,7 @@ private: |
| void clearPromiseResolver(); |
| - RefPtr<ScriptPromiseResolver> m_promiseResolver; |
| - RefPtr<NewScriptState> m_scriptState; |
| + RefPtr<ScriptPromiseResolverWithContext> m_promiseResolver; |
| #if !ASSERT_DISABLED |
| ThreadIdentifier m_owningThread; |