Introduce KeepAliveWhilePending to ScriptPromiseResolverWithContext.

Source/modules/crypto/SubtleCrypto.cpp

 /*
  * 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 14 matching lines @@
  * 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.
  */
 
 #include "config.h"
 #include "modules/crypto/SubtleCrypto.h"
 
 #include "bindings/v8/Dictionary.h"
+#include "bindings/v8/ScriptPromiseResolverWithContext.h"
+#include "core/dom/DOMException.h"
 #include "core/dom/ExecutionContext.h"
-#include "modules/crypto/CryptoResultImpl.h"
+#include "modules/crypto/CrossThreadCryptoResult.h"
 #include "modules/crypto/Key.h"
+#include "modules/crypto/KeyPair.h"
 #include "modules/crypto/NormalizeAlgorithm.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebArrayBuffer.h"
 #include "public/platform/WebCrypto.h"
 #include "public/platform/WebCryptoAlgorithm.h"
 #include "wtf/ArrayBufferView.h"
 
 namespace WebCore {
 
+class SubtleCrypto::PendingResult : public GarbageCollectedFinalized<PendingResult>, public CryptoResultBase {
+public:
+    PendingResult(ScriptState* scriptState, RawPtr<SubtleCrypto> crypto)

[haraken, 2014/06/13 14:23:31]

RawPtr<SubtleCrypto> => SubtleCrypto*

+        : m_resolver(ScriptPromiseResolverWithContext::create(scriptState))
+        , m_crypto(crypto)
+        , m_factory(this)
+    {
+        m_resolver->keepObjectWhilePending(crypto);
+        m_crypto->m_pendingResults.add(this);
+    }
+
+    virtual ~PendingResult() { }
+
+    virtual void completeWithError(blink::WebCryptoErrorType errorType, const blink::WebString& errorDetails) OVERRIDE
+    {
+        m_resolver->reject(DOMException::create(webCryptoErrorToExceptionCode(errorType), errorDetails));
+        unregisterThis();
+    }
+
+    virtual void completeWithBuffer(const blink::WebArrayBuffer& buffer) OVERRIDE
+    {
+        m_resolver->resolve(PassRefPtr<ArrayBuffer>(buffer));
+        unregisterThis();
+    }
+
+    virtual void completeWithBoolean(bool b) OVERRIDE
+    {
+        m_resolver->resolve(b);
+        unregisterThis();
+    }
+
+    virtual void completeWithKey(const blink::WebCryptoKey& key) OVERRIDE
+    {
+        m_resolver->resolve(Key::create(key));
+        unregisterThis();
+    }
+
+    virtual void completeWithKeyPair(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey) OVERRIDE
+    {
+        m_resolver->resolve(KeyPair::create(publicKey, privateKey));
+        unregisterThis();
+    }
+
+    ScriptPromise promise() { return m_resolver->promise(); }
+
+    WeakPtr<PendingResult> createWeakPtr() { return m_factory.createWeakPtr(); }
+
+    void trace(Visitor* visitor) { visitor->trace(m_crypto); }
+
+private:
+    void unregisterThis()
+    {
+        m_crypto->m_pendingResults.remove(this);
+    }
+
+    RefPtr<ScriptPromiseResolverWithContext> m_resolver;
+    Member<SubtleCrypto> m_crypto;
+    WeakPtrFactory<PendingResult> m_factory;
+};
+
 // Seems like the generated bindings should take care of these however it
 // currently doesn't. See also http://crbug.com/264520
 static bool ensureNotNull(const ArrayPiece& x, const char* paramName, CryptoResult* result)
 {
     if (x.isNull()) {
         String message = String("Invalid ") + paramName + String(" argument");
         result->completeWithError(blink::WebCryptoErrorTypeType, blink::WebString(message));
         return false;
     }
     return true;
@@ skipping 22 matching lines @@
 {
     const SecurityOrigin* origin = scriptState->executionContext()->securityOrigin();
     if (!origin->canAccessFeatureRequiringSecureOrigin()) {
         result->completeWithError(blink::WebCryptoErrorTypeNotSupported, "WebCrypto is only supported over secure origins. See http://crbug.com/373032");
         return false;
     }
 
     return true;
 }
 
-static ScriptPromise startCryptoOperation(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, blink::WebCryptoOperation operationType, const ArrayPiece& signature, const ArrayPiece& dataBuffer)
+ScriptPromise SubtleCrypto::startCryptoOperation(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, blink::WebCryptoOperation operationType, const ArrayPiece& signature, const ArrayPiece& dataBuffer)
 {
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
-    ScriptPromise promise = result->promise();
+    ScriptPromise promise;
+    RefPtr<CrossThreadCryptoResult<PendingResult> > result = createCrossThreadCryptoResult(scriptState, &promise);
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
     bool requiresKey = operationType != blink::WebCryptoOperationDigest;
 
     if (requiresKey && !ensureNotNull(key, "key", result.get()))
         return promise;
     if (operationType == blink::WebCryptoOperationVerify && !ensureNotNull(signature, "signature", result.get()))
         return promise;
@@ skipping 32 matching lines @@
     }
 
     return promise;
 }
 
 SubtleCrypto::SubtleCrypto()
 {
     ScriptWrappable::init(this);
 }
 
+SubtleCrypto::~SubtleCrypto()
+{
+}
+
 ScriptPromise SubtleCrypto::encrypt(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, const ArrayPiece& data)
 {
     return startCryptoOperation(scriptState, rawAlgorithm, key, blink::WebCryptoOperationEncrypt, ArrayPiece(), data);
 }
 
 ScriptPromise SubtleCrypto::decrypt(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, const ArrayPiece& data)
 {
     return startCryptoOperation(scriptState, rawAlgorithm, key, blink::WebCryptoOperationDecrypt, ArrayPiece(), data);
 }
 
 ScriptPromise SubtleCrypto::sign(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, const ArrayPiece& data)
 {
     return startCryptoOperation(scriptState, rawAlgorithm, key, blink::WebCryptoOperationSign, ArrayPiece(), data);
 }
 
 ScriptPromise SubtleCrypto::verifySignature(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, const ArrayPiece& signature, const ArrayPiece& data)
 {
     return startCryptoOperation(scriptState, rawAlgorithm, key, blink::WebCryptoOperationVerify, signature, data);
 }
 
 ScriptPromise SubtleCrypto::digest(ScriptState* scriptState, const Dictionary& rawAlgorithm, const ArrayPiece& data)
 {
     return startCryptoOperation(scriptState, rawAlgorithm, 0, blink::WebCryptoOperationDigest, ArrayPiece(), data);
 }
 
 ScriptPromise SubtleCrypto::generateKey(ScriptState* scriptState, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
-    ScriptPromise promise = result->promise();
+    ScriptPromise promise;
+    RefPtr<CrossThreadCryptoResult<PendingResult> > result = createCrossThreadCryptoResult(scriptState, &promise);
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
     blink::WebCryptoKeyUsageMask keyUsages;
     if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
         return promise;
 
     blink::WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, blink::WebCryptoOperationGenerateKey, algorithm, result.get()))
         return promise;
 
     blink::Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::importKey(ScriptState* scriptState, const String& rawFormat, const ArrayPiece& keyData, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
-    ScriptPromise promise = result->promise();
+    ScriptPromise promise;
+    RefPtr<CrossThreadCryptoResult<PendingResult> > result = createCrossThreadCryptoResult(scriptState, &promise);
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
     if (!ensureNotNull(keyData, "keyData", result.get()))
         return promise;
 
     blink::WebCryptoKeyFormat format;
     if (!Key::parseFormat(rawFormat, format, result.get()))
         return promise;
 
     blink::WebCryptoKeyUsageMask keyUsages;
     if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
         return promise;
 
     blink::WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, blink::WebCryptoOperationImportKey, algorithm, result.get()))
         return promise;
 
     blink::Platform::current()->crypto()->importKey(format, keyData.bytes(), keyData.byteLength(), algorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::exportKey(ScriptState* scriptState, const String& rawFormat, Key* key)
 {
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
-    ScriptPromise promise = result->promise();
+    ScriptPromise promise;
+    RefPtr<CrossThreadCryptoResult<PendingResult> > result = createCrossThreadCryptoResult(scriptState, &promise);
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
     if (!ensureNotNull(key, "key", result.get()))
         return promise;
 
     blink::WebCryptoKeyFormat format;
     if (!Key::parseFormat(rawFormat, format, result.get()))
         return promise;
 
     if (!key->extractable()) {
         result->completeWithError(blink::WebCryptoErrorTypeInvalidAccess, "key is not extractable");
         return promise;
     }
 
     blink::Platform::current()->crypto()->exportKey(format, key->key(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::wrapKey(ScriptState* scriptState, const String& rawFormat, Key* key, Key* wrappingKey, const Dictionary& rawWrapAlgorithm)
 {
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
-    ScriptPromise promise = result->promise();
+    ScriptPromise promise;
+    RefPtr<CrossThreadCryptoResult<PendingResult> > result = createCrossThreadCryptoResult(scriptState, &promise);
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
     if (!ensureNotNull(key, "key", result.get()))
         return promise;
 
     if (!ensureNotNull(wrappingKey, "wrappingKey", result.get()))
         return promise;
 
@@ skipping 12 matching lines @@
 
     if (!wrappingKey->canBeUsedForAlgorithm(wrapAlgorithm, blink::WebCryptoOperationWrapKey, result.get()))
         return promise;
 
     blink::Platform::current()->crypto()->wrapKey(format, key->key(), wrappingKey->key(), wrapAlgorithm, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::unwrapKey(ScriptState* scriptState, const String& rawFormat, const ArrayPiece& wrappedKey, Key* unwrappingKey, const Dictionary& rawUnwrapAlgorithm, const Dictionary& rawUnwrappedKeyAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
-    ScriptPromise promise = result->promise();
+    ScriptPromise promise;
+    RefPtr<CrossThreadCryptoResult<PendingResult> > result = createCrossThreadCryptoResult(scriptState, &promise);
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
     if (!ensureNotNull(wrappedKey, "wrappedKey", result.get()))
         return promise;
     if (!ensureNotNull(unwrappingKey, "unwrappingKey", result.get()))
         return promise;
 
     blink::WebCryptoKeyFormat format;
@@ skipping 12 matching lines @@
     if (!parseAlgorithm(rawUnwrappedKeyAlgorithm, blink::WebCryptoOperationImportKey, unwrappedKeyAlgorithm, result.get()))
         return promise;
 
     if (!unwrappingKey->canBeUsedForAlgorithm(unwrapAlgorithm, blink::WebCryptoOperationUnwrapKey, result.get()))
         return promise;
 
     blink::Platform::current()->crypto()->unwrapKey(format, wrappedKey.bytes(), wrappedKey.byteLength(), unwrappingKey->key(), unwrapAlgorithm, unwrappedKeyAlgorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
+PassRefPtr<CrossThreadCryptoResult<SubtleCrypto::PendingResult> > SubtleCrypto::createCrossThreadCryptoResult(ScriptState* scriptState, ScriptPromise* promise)
+{
+    RawPtr<PendingResult> pending = new PendingResult(scriptState, this);

[haraken, 2014/06/13 14:23:31]

RawPtr<PendingResult> => PendingResult*

+    RefPtr<CrossThreadCryptoResult<PendingResult> > result = CrossThreadCryptoResult<PendingResult>::create(pending->createWeakPtr());
+    *promise = pending->promise();
+    return result.release();
+}
+
+void SubtleCrypto::trace(Visitor* visitor)
+{
+    visitor->trace(m_pendingResults);
+}
+
 } // namespace WebCore