[WebCrypto] Use ScriptPromiseResolverWithContext.

Source/modules/crypto/CryptoResultImpl.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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"
 #include "wtf/Assertions.h"
 #include "wtf/Forward.h"
 #include "wtf/Threading.h"
 
 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?

 public:
     ~CryptoResultImpl();
 
     static PassRefPtr<CryptoResultImpl> create();
 
     virtual void completeWithError() OVERRIDE;
     virtual void completeWithError(const blink::WebString&) OVERRIDE;
     virtual void completeWithBuffer(const blink::WebArrayBuffer&) OVERRIDE;
     virtual void completeWithBoolean(bool) OVERRIDE;
     virtual void completeWithKey(const blink::WebCryptoKey&) OVERRIDE;
     virtual void completeWithKeyPair(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey) OVERRIDE;
 
     ScriptPromise promise() { return m_promiseResolver->promise(); }
 
 private:
     CryptoResultImpl(ExecutionContext*);
     void finish();
     void CheckValidThread() const;
 
     // Override from ContextLifecycleObserver
     virtual void contextDestroyed() OVERRIDE;
 
     // Returns true if the ExecutionContext is still alive and running.
     bool canCompletePromise() const;
 
     void clearPromiseResolver();
 
-    RefPtr<ScriptPromiseResolver> m_promiseResolver;
-    RefPtr<NewScriptState> m_scriptState;
+    RefPtr<ScriptPromiseResolverWithContext> m_promiseResolver;
 
 #if !ASSERT_DISABLED
     ThreadIdentifier m_owningThread;
     bool m_finished;
 #endif
 };
 
 } // namespace WebCore
 
 #endif