<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198622] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198622">198622</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-03-24 03:36:45 -0700 (Thu, 24 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove DeferredWrapper::resolve<Vector<unsigned char>>
https://bugs.webkit.org/show_bug.cgi?id=154849
Reviewed by Darin Adler.
Adding fulfillPromiseWithArrayBuffer to resolve a promise with an ArrayBuffer.
If the ArrayBuffer is null, the promise is rejected with an OutOfMemory exception.
Not covered by tests since we would need to make tryCreate return null on failing allocation.
* Modules/fetch/FetchBody.cpp:
(WebCore::FetchBody::processIfEmptyOrDisturbed):
(WebCore::FetchBody::loadedAsArrayBuffer):
* bindings/js/JSDOMPromise.cpp:
(WebCore::fulfillPromiseWithArrayBuffer):
* bindings/js/JSDOMPromise.h:
(WebCore::DeferredWrapper::resolve<JSC::JSValue>): Deleted.
(WebCore::DeferredWrapper::resolve): Deleted.
* bindings/js/JSSubtleCryptoCustom.cpp:
(WebCore::JSSubtleCrypto::encrypt):
(WebCore::JSSubtleCrypto::decrypt):
(WebCore::JSSubtleCrypto::sign):
(WebCore::JSSubtleCrypto::digest):
(WebCore::JSSubtleCrypto::exportKey):
(WebCore::JSSubtleCrypto::wrapKey):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodycpp">trunk/Source/WebCore/Modules/fetch/FetchBody.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromisecpp">trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromiseh">trunk/Source/WebCore/bindings/js/JSDOMPromise.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp">trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198621 => 198622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-24 09:02:55 UTC (rev 198621)
+++ trunk/Source/WebCore/ChangeLog 2016-03-24 10:36:45 UTC (rev 198622)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-03-24 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Remove DeferredWrapper::resolve<Vector<unsigned char>>
+ https://bugs.webkit.org/show_bug.cgi?id=154849
+
+ Reviewed by Darin Adler.
+
+ Adding fulfillPromiseWithArrayBuffer to resolve a promise with an ArrayBuffer.
+ If the ArrayBuffer is null, the promise is rejected with an OutOfMemory exception.
+
+ Not covered by tests since we would need to make tryCreate return null on failing allocation.
+
+ * Modules/fetch/FetchBody.cpp:
+ (WebCore::FetchBody::processIfEmptyOrDisturbed):
+ (WebCore::FetchBody::loadedAsArrayBuffer):
+ * bindings/js/JSDOMPromise.cpp:
+ (WebCore::fulfillPromiseWithArrayBuffer):
+ * bindings/js/JSDOMPromise.h:
+ (WebCore::DeferredWrapper::resolve<JSC::JSValue>): Deleted.
+ (WebCore::DeferredWrapper::resolve): Deleted.
+ * bindings/js/JSSubtleCryptoCustom.cpp:
+ (WebCore::JSSubtleCrypto::encrypt):
+ (WebCore::JSSubtleCrypto::decrypt):
+ (WebCore::JSSubtleCrypto::sign):
+ (WebCore::JSSubtleCrypto::digest):
+ (WebCore::JSSubtleCrypto::exportKey):
+ (WebCore::JSSubtleCrypto::wrapKey):
+
</ins><span class="cx"> 2016-03-23 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Simplify logic for checking policies
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (198621 => 198622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-03-24 09:02:55 UTC (rev 198621)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-03-24 10:36:45 UTC (rev 198622)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> promise.reject<ExceptionCode>(SYNTAX_ERR);
</span><span class="cx"> return true;
</span><span class="cx"> case Consumer::Type::ArrayBuffer:
</span><del>- promise.resolve(ArrayBuffer::tryCreate(nullptr, 0));
</del><ins>+ fulfillPromiseWithArrayBuffer(promise, nullptr, 0);
</ins><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">
</span><span class="cx"> if (type == Consumer::Type::ArrayBuffer) {
</span><span class="cx"> Vector<char> data = extractFromText();
</span><del>- promise.resolve<RefPtr<ArrayBuffer>>(ArrayBuffer::tryCreate(data.data(), data.size()));
</del><ins>+ fulfillPromiseWithArrayBuffer(promise, data.data(), data.size());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> String contentType = Blob::normalizedContentType(extractMIMETypeFromMediaType(m_mimeType));
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> ASSERT(m_consumer);
</span><span class="cx"> ASSERT(m_consumer->type == Consumer::Type::Blob || m_consumer->type == Consumer::Type::ArrayBuffer);
</span><span class="cx"> if (m_consumer->type == Consumer::Type::ArrayBuffer)
</span><del>- m_consumer->promise.resolve(buffer);
</del><ins>+ fulfillPromiseWithArrayBuffer(m_consumer->promise, buffer.get());
</ins><span class="cx"> else {
</span><span class="cx"> ASSERT(m_blob);
</span><span class="cx"> Vector<char> data;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromisecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp (198621 => 198622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2016-03-24 09:02:55 UTC (rev 198621)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2016-03-24 10:36:45 UTC (rev 198622)
</span><span class="lines">@@ -93,4 +93,18 @@
</span><span class="cx"> promise.resolve(value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void fulfillPromiseWithArrayBuffer(DeferredWrapper& promise, ArrayBuffer* arrayBuffer)
+{
+ if (!arrayBuffer) {
+ promise.reject<JSValue>(createOutOfMemoryError(promise.globalObject().globalExec()));
+ return;
+ }
+ promise.resolve(arrayBuffer);
</ins><span class="cx"> }
</span><ins>+
+void fulfillPromiseWithArrayBuffer(DeferredWrapper& promise, const void* data, size_t length)
+{
+ fulfillPromiseWithArrayBuffer(promise, ArrayBuffer::tryCreate(data, length).get());
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (198621 => 198622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-03-24 09:02:55 UTC (rev 198621)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-03-24 10:36:45 UTC (rev 198622)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void fulfillPromiseWithJSON(DeferredWrapper&, const String&);
</span><ins>+void fulfillPromiseWithArrayBuffer(DeferredWrapper&, ArrayBuffer*);
+void fulfillPromiseWithArrayBuffer(DeferredWrapper&, const void*, size_t);
</ins><span class="cx"> void rejectPromiseWithExceptionIfAny(JSC::ExecState&, JSDOMGlobalObject&, JSC::JSPromiseDeferred&);
</span><span class="cx">
</span><span class="cx"> inline JSC::JSValue callPromiseFunction(JSC::ExecState& state, JSC::EncodedJSValue promiseFunction(JSC::ExecState*, JSC::JSPromiseDeferred*))
</span><span class="lines">@@ -166,16 +168,6 @@
</span><span class="cx"> JSC::JSLockHolder locker(exec);
</span><span class="cx"> resolve(*exec, value);
</span><span class="cx"> }
</span><del>-template<>
-inline void DeferredWrapper::resolve<Vector<unsigned char>>(const Vector<unsigned char>& result)
-{
- ASSERT(m_deferred);
- ASSERT(m_globalObject);
- JSC::ExecState* exec = m_globalObject->globalExec();
- JSC::JSLockHolder locker(exec);
- auto buffer = ArrayBuffer::tryCreate(result.data(), result.size());
- resolve(*exec, toJS(exec, m_globalObject.get(), buffer.get()));
-}
</del><span class="cx">
</span><span class="cx"> template<>
</span><span class="cx"> inline void DeferredWrapper::resolve(const std::nullptr_t&)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp (198621 => 198622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2016-03-24 09:02:55 UTC (rev 198621)
+++ trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2016-03-24 10:36:45 UTC (rev 198622)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</span><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- wrapper.resolve(result);
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><span class="cx"> wrapper.reject(nullptr);
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</span><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- wrapper.resolve(result);
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><span class="cx"> wrapper.reject(nullptr);
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</span><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- wrapper.resolve(result);
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><span class="cx"> wrapper.reject(nullptr);
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</span><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- wrapper.resolve(result);
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><span class="cx"> wrapper.reject(nullptr);
</span><span class="lines">@@ -613,7 +613,7 @@
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</span><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- wrapper.resolve(result);
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><span class="cx"> wrapper.reject(nullptr);
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx"> auto encryptSuccessCallback = [wrapper, algorithmPtr, parametersPtr](const Vector<uint8_t>& encryptedData) mutable {
</span><span class="cx"> delete algorithmPtr;
</span><span class="cx"> delete parametersPtr;
</span><del>- wrapper.resolve(encryptedData);
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper, encryptedData.data(), encryptedData.size());
</ins><span class="cx"> };
</span><span class="cx"> auto encryptFailureCallback = [wrapper, algorithmPtr, parametersPtr]() mutable {
</span><span class="cx"> delete algorithmPtr;
</span></span></pre>
</div>
</div>
</body>
</html>