Decouple ScriptPromise creation from ScriptPromiseResolver.

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 59 matching lines @@
     WebKit::WebCryptoAlgorithm algorithm;
     if (!normalizeAlgorithm(rawAlgorithm, operationType, algorithm, es))
         return ScriptPromise();
 
     if (requiresKey && !key->canBeUsedForAlgorithm(algorithm, operationType, es))
         return ScriptPromise();
 
     const unsigned char* data = static_cast<const unsigned char*>(dataBuffer->baseAddress());
     unsigned dataSize = dataBuffer->byteLength();
 
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create();
+    ScriptPromise promise = ScriptPromise::createPending();
+    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
 
     switch (operationType) {
     case Encrypt:
         WebKit::Platform::current()->crypto()->encrypt(algorithm, key->key(), data, dataSize, result->result());
         break;
     case Decrypt:
         WebKit::Platform::current()->crypto()->decrypt(algorithm, key->key(), data, dataSize, result->result());
         break;
     case Sign:
         WebKit::Platform::current()->crypto()->sign(algorithm, key->key(), data, dataSize, result->result());
         break;
     case Verify:
         WebKit::Platform::current()->crypto()->verifySignature(algorithm, key->key(), reinterpret_cast<const unsigned char*>(signature->baseAddress()), signature->byteLength(), data, dataSize, result->result());
         break;
     case Digest:
         WebKit::Platform::current()->crypto()->digest(algorithm, data, dataSize, result->result());
         break;
     default:
         ASSERT_NOT_REACHED();
         return ScriptPromise();
     }
 
-    return result->promise();
+    return promise;
 }
 
 } // namespace
 
 SubtleCrypto::SubtleCrypto()
 {
     ScriptWrappable::init(this);
 }
 
 ScriptPromise SubtleCrypto::encrypt(const Dictionary& rawAlgorithm, Key* key, ArrayBufferView* data, ExceptionState& es)
@@ skipping 24 matching lines @@
 ScriptPromise SubtleCrypto::generateKey(const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& es)
 {
     WebKit::WebCryptoKeyUsageMask keyUsages;
     if (!Key::parseUsageMask(rawKeyUsages, keyUsages, es))
         return ScriptPromise();
 
     WebKit::WebCryptoAlgorithm algorithm;
     if (!normalizeAlgorithm(rawAlgorithm, GenerateKey, algorithm, es))
         return ScriptPromise();
 
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create();
+    ScriptPromise promise = ScriptPromise::createPending();
+    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
     WebKit::Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result());
-    return result->promise();
+    return promise;
 }
 
 ScriptPromise SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* keyData, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& es)
 {
     WebKit::WebCryptoKeyFormat format;
     if (!Key::parseFormat(rawFormat, format, es))
         return ScriptPromise();
 
     if (!keyData) {
         es.throwTypeError("Invalid keyData argument");
         return ScriptPromise();
     }
 
     WebKit::WebCryptoKeyUsageMask keyUsages;
     if (!Key::parseUsageMask(rawKeyUsages, keyUsages, es))
         return ScriptPromise();
 
     WebKit::WebCryptoAlgorithm algorithm;
     if (!normalizeAlgorithm(rawAlgorithm, ImportKey, algorithm, es))
         return ScriptPromise();
 
     const unsigned char* keyDataBytes = static_cast<unsigned char*>(keyData->baseAddress());
 
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create();
+    ScriptPromise promise = ScriptPromise::createPending();
+    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
     WebKit::Platform::current()->crypto()->importKey(format, keyDataBytes, keyData->byteLength(), algorithm, extractable, keyUsages, result->result());
-    return result->promise();
+    return promise;
 }
 
 ScriptPromise SubtleCrypto::exportKey(const String& rawFormat, Key* key, ExceptionState& es)
 {
     WebKit::WebCryptoKeyFormat format;
     if (!Key::parseFormat(rawFormat, format, es))
         return ScriptPromise();
 
     if (!key) {
         es.throwTypeError("Invalid key argument");
         return ScriptPromise();
     }
 
     if (!key->extractable()) {
         es.throwDOMException(NotSupportedError, "key is not extractable");
         return ScriptPromise();
     }
 
-    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create();
+    ScriptPromise promise = ScriptPromise::createPending();
+    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
     WebKit::Platform::current()->crypto()->exportKey(format, key->key(), result->result());
-    return result->promise();
+    return promise;
 }
 
 } // namespace WebCore