Cleanup: remove WebCryptoResultPrivate from blink API.

Source/modules/crypto/CryptoResult.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 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * 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.
  */
 
 #include "config.h"
+#include "modules/crypto/CryptoResult.h"
+
+#include "V8Key.h" // Must precede ScriptPromiseResolver.h
+#include "bindings/v8/custom/V8ArrayBufferCustom.h" // Must precede ScriptPromiseResolver.h
+#include "bindings/v8/ScriptPromiseResolver.h"
+#include "modules/crypto/Key.h"
+#include "modules/crypto/NormalizeAlgorithm.h"
+#include "public/platform/Platform.h"
 #include "public/platform/WebArrayBuffer.h"
 #include "public/platform/WebCrypto.h"
-#include <string.h>
+#include "public/platform/WebCryptoAlgorithm.h"
+#include "wtf/ArrayBufferView.h"
 
-namespace WebKit {
+namespace WebCore {
 
-void WebCryptoResult::completeWithError()
+CryptoResult::~CryptoResult()
 {
-    m_impl->completeWithError();
-    reset();
+    ASSERT(m_finished);
 }
 
-void WebCryptoResult::completeWithBuffer(const WebArrayBuffer& buffer)
+PassRefPtr<CryptoResult> CryptoResult::create()
 {
-    RELEASE_ASSERT(!buffer.isNull());
-    m_impl->completeWithBuffer(buffer);
-    reset();
+    return adoptRef(new CryptoResult);
 }
 
-void WebCryptoResult::completeWithBuffer(const void* bytes, size_t bytesSize)
+void CryptoResult::completeWithError()
 {
-    WebArrayBuffer buffer = WebKit::WebArrayBuffer::create(bytesSize, 1);
-    RELEASE_ASSERT(!buffer.isNull());
-    memcpy(buffer.data(), bytes, bytesSize);
-    completeWithBuffer(buffer);
+    m_promiseResolver->reject(ScriptValue::createNull());
+    finish();
 }
 
-void WebCryptoResult::completeWithBoolean(bool b)
+void CryptoResult::completeWithBuffer(const WebKit::WebArrayBuffer& buffer)
 {
-    m_impl->completeWithBoolean(b);
-    reset();
+    m_promiseResolver->fulfill(PassRefPtr<ArrayBuffer>(buffer));
+    finish();
 }
 
-void WebCryptoResult::completeWithKey(const WebCryptoKey& key)
+void CryptoResult::completeWithBoolean(bool b)
 {
-    m_impl->completeWithKey(key);
-    reset();
+    m_promiseResolver->fulfill(ScriptValue::createBoolean(b));
+    finish();
 }
 
-void WebCryptoResult::reset()
+void CryptoResult::completeWithKey(const WebKit::WebCryptoKey& key)
 {
-    m_impl.reset();
+    m_promiseResolver->fulfill(Key::create(key));
+    finish();
 }
 
-void WebCryptoResult::assign(const WebCryptoResult& o)
+ScriptObject CryptoResult::promise()
 {
-    m_impl = o.m_impl;
+    return m_promiseResolver->promise();
 }
 
-void WebCryptoResult::assign(WebCryptoResultPrivate* impl)
+CryptoResult::CryptoResult()
+    : m_promiseResolver(ScriptPromiseResolver::create())
+    , m_finished(false) { }
+
+void CryptoResult::finish()
 {
-    m_impl = impl;
+    ASSERT(!m_finished);
+    m_finished = true;
 }
 
-} // namespace WebKit
+} // namespace WebCore