<!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>[205257] trunk/Source</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/205257">205257</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-31 11:36:46 -0700 (Wed, 31 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid using strong reference in JSDOMPromise’s DeferredWrapper
https://bugs.webkit.org/show_bug.cgi?id=161426
<rdar://problem/28091123>
Reviewed by Geoffrey Garen.
Replace JSC::Strong in DeferredWrapper by JSC::Weak, and make the global object own JSPromiseDeferred.
DeferredWrapper adds itself to JSDOMGlobalObject's newly added HashSet when it's created and clears itself
from the HashSet inside its destructor as well as when the promise is resolved or rejected.
This is so that JSDOMGlobalObject's visitChildren can visit every live DeferredWrapper.
Because this operation is rather expense, this patch turns DeferredWrapper into a RefCounted object to avoid
HashMap churns. Most of code changes in this patch is due to this type change, and the fact lambda cannot
capture Ref<DeferredWrapper> since its copy constructor doesn't exist.
We also create a write barrier from the global object to JSPromiseDeferred so that they won't be collected
during an eden collection when it happens before JSDOMGlobalObject's visitChildren is invoked.
Note that it's possible for the entire DOM wrapper world of the promise to go away before the promise is
resolved or rejected by a ref-counted C++ object. In this case, m_deferred and m_globalObject become dead.
Various member resolve* and reject functions of DeferredWrapper have been modified to check this condition.
Because JSDOMGlobalObject can be finalized before DeferredWrapper is finalized. DeferredWrapper's destructor,
which calls DeferredWrapper::clear, should only remove itself from m_globalObject when m_globalObject is alive.
Finally, this patch makes DeferredWrapper inherit from ActiveDOMCallback so that it won't try to execute scripts
when the active DOM objects have been suspended; e.g. after a page navigation.
No new tests since there should be no author/user visible behavioral change.
* Modules/applepay/ApplePaySession.cpp:
(WebCore::ApplePaySession::canMakePaymentsWithActiveCard):
* Modules/applepay/ApplePaySession.h:
* Modules/fetch/DOMWindowFetch.cpp:
(WebCore::DOMWindowFetch::fetch):
* Modules/fetch/DOMWindowFetch.h:
* Modules/fetch/FetchBody.cpp:
(WebCore::FetchBody::arrayBuffer):
(WebCore::FetchBody::blob):
(WebCore::FetchBody::json):
(WebCore::FetchBody::text):
(WebCore::FetchBody::consume):
(WebCore::FetchBody::consumeArrayBuffer):
(WebCore::FetchBody::consumeArrayBufferView):
(WebCore::FetchBody::consumeText):
(WebCore::FetchBody::consumeBlob):
(WebCore::FetchBody::loadingFailed):
(WebCore::FetchBody::loadingSucceeded):
* Modules/fetch/FetchBody.h:
(WebCore::FetchBody::formData):
(WebCore::FetchBody::cleanConsumePromise):
(WebCore::FetchBody): Use RefPtr<DeferredWrapper> instead of Optional<DeferredWrapper> now that DeferredWrapper
is ref counted. Perhaps we could use Optional<Ref<DeferredWrapper>> here but that seemed rather verbose.
* Modules/fetch/FetchBodyConsumer.cpp:
(WebCore::FetchBodyConsumer::resolveWithData):
(WebCore::FetchBodyConsumer::resolve):
* Modules/fetch/FetchBodyConsumer.h:
* Modules/fetch/FetchBodyOwner.cpp:
(WebCore::FetchBodyOwner::arrayBuffer):
(WebCore::FetchBodyOwner::blob):
(WebCore::FetchBodyOwner::formData):
(WebCore::FetchBodyOwner::json):
(WebCore::FetchBodyOwner::text):
* Modules/fetch/FetchBodyOwner.h:
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::consume):
(WebCore::FetchResponse::finishConsumingStream):
* Modules/fetch/FetchResponse.h:
* Modules/fetch/WorkerGlobalScopeFetch.cpp:
(WebCore::WorkerGlobalScopeFetch::fetch):
* Modules/fetch/WorkerGlobalScopeFetch.h:
* Modules/mediastream/UserMediaPermissionCheck.h:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSDOMGlobalObject.cpp:
(WebCore::JSDOMGlobalObject::~JSDOMGlobalObject): Added.
(WebCore::JSDOMGlobalObject::visitChildren): Added visits to each JSPromiseDeferred owned by this global object.
* bindings/js/JSDOMGlobalObject.h:
(WebCore::JSDOMGlobalObject::deferredWrappers): Added. This map is only used by JSDOMGlobalObject's visitChildren.
* bindings/js/JSDOMPromise.cpp:
(WebCore::DeferredWrapper::DeferredWrapper):
(WebCore::DeferredWrapper::~DeferredWrapper): Calls clear. When the global object has already been finalized,
m_globalObject is dead. In that case, there is no need to remove itself from the global object. When m_deferred
has been cleared, either clear() has already been called (1) or the callback is dead (2). Since (2) happens only
when the global object itself is dead (as its visitChildren would have visited m_deferred otherwise), again, there
is no need to remove itself from global object.
(WebCore::DeferredWrapper::clear): Added. Clears m_deferred and removes itself from JSDOMGlobalObject.
(WebCore::DeferredWrapper::contextDestroyed): ScriptExecutionContext has been destroyed. We must call clear().
(WebCore::DeferredWrapper::callFunction): Check canInvokeCallback in ActiveDOMCallback.
(WebCore::DeferredWrapper::reject): Exit early when isSuspended() is true. See below.
(WebCore::rejectPromiseWithExceptionIfAny):
(WebCore::fulfillPromiseWithJSON):
(WebCore::fulfillPromiseWithArrayBuffer):
* bindings/js/JSDOMPromise.h:
(WebCore::DeferredWrapper::create): Added.
(WebCore::DeferredWrapper::isSuspended): Added. Returns true iff the DOM wrapper world has gone away or active DOM
objects have been suspended.
(WebCore::DeferredWrapper::globalObject): Made this inline.
(WebCore::DeferredWrapper::visitAggregate): Added. Called by JSDOMGlobalObject::visitChildren.
(WebCore::DOMPromise::resolve):
(WebCore::DOMPromise::reject):
(WebCore::DeferredWrapper::resolveWithValue): Exit early when isSuspended() is true.
(WebCore::DeferredWrapper::resolveWithNewlyCreated): Ditto.
(WebCore::DeferredWrapper::rejectWithValue): Ditto.
(WebCore::DeferredWrapper::resolve): Ditto.
(WebCore::DeferredWrapper::reject): Ditto.
* bindings/js/JSFontFaceCustom.cpp:
(WebCore::JSFontFace::loaded):
* bindings/js/JSFontFaceSetCustom.cpp:
(WebCore::JSFontFaceSet::ready):
* bindings/js/JSMediaDevicesCustom.cpp:
(WebCore::JSMediaDevices::getUserMedia):
* bindings/js/JSReadableStreamSourceCustom.cpp:
(WebCore::JSReadableStreamSource::start):
* bindings/js/JSWebKitSubtleCryptoCustom.cpp:
(WebCore::JSWebKitSubtleCrypto::encrypt):
(WebCore::JSWebKitSubtleCrypto::decrypt):
(WebCore::JSWebKitSubtleCrypto::sign):
(WebCore::JSWebKitSubtleCrypto::verify):
(WebCore::JSWebKitSubtleCrypto::digest):
(WebCore::JSWebKitSubtleCrypto::generateKey):
(WebCore::JSWebKitSubtleCrypto::importKey):
(WebCore::JSWebKitSubtleCrypto::exportKey):
(WebCore::JSWebKitSubtleCrypto::wrapKey):
(WebCore::JSWebKitSubtleCrypto::unwrapKey):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateReturnParameters):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessioncpp">trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessionh">trunk/Source/WebCore/Modules/applepay/ApplePaySession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchDOMWindowFetchcpp">trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchDOMWindowFetchh">trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodycpp">trunk/Source/WebCore/Modules/fetch/FetchBody.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyh">trunk/Source/WebCore/Modules/fetch/FetchBody.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyConsumercpp">trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyConsumerh">trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyOwnercpp">trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyOwnerh">trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseh">trunk/Source/WebCore/Modules/fetch/FetchResponse.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchWorkerGlobalScopeFetchcpp">trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchWorkerGlobalScopeFetchh">trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaPermissionCheckh">trunk/Source/WebCore/Modules/mediastream/UserMediaPermissionCheck.h</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjectcpp">trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjecth">trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h</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="#trunkSourceWebCorebindingsjsJSFontFaceCustomcpp">trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSFontFaceSetCustomcpp">trunk/Source/WebCore/bindings/js/JSFontFaceSetCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMediaDevicesCustomcpp">trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamSourceCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebKitSubtleCryptoCustomcpp">trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/ChangeLog 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -1,3 +1,133 @@
</span><ins>+2016-08-30 Ryosuke Niwa <rniwa@webkit.org>
+
+ Avoid using strong reference in JSDOMPromise’s DeferredWrapper
+ https://bugs.webkit.org/show_bug.cgi?id=161426
+ <rdar://problem/28091123>
+
+ Reviewed by Geoffrey Garen.
+
+ Replace JSC::Strong in DeferredWrapper by JSC::Weak, and make the global object own JSPromiseDeferred.
+
+ DeferredWrapper adds itself to JSDOMGlobalObject's newly added HashSet when it's created and clears itself
+ from the HashSet inside its destructor as well as when the promise is resolved or rejected.
+ This is so that JSDOMGlobalObject's visitChildren can visit every live DeferredWrapper.
+
+ Because this operation is rather expense, this patch turns DeferredWrapper into a RefCounted object to avoid
+ HashMap churns. Most of code changes in this patch is due to this type change, and the fact lambda cannot
+ capture Ref<DeferredWrapper> since its copy constructor doesn't exist.
+
+ We also create a write barrier from the global object to JSPromiseDeferred so that they won't be collected
+ during an eden collection when it happens before JSDOMGlobalObject's visitChildren is invoked.
+
+ Note that it's possible for the entire DOM wrapper world of the promise to go away before the promise is
+ resolved or rejected by a ref-counted C++ object. In this case, m_deferred and m_globalObject become dead.
+ Various member resolve* and reject functions of DeferredWrapper have been modified to check this condition.
+
+ Because JSDOMGlobalObject can be finalized before DeferredWrapper is finalized. DeferredWrapper's destructor,
+ which calls DeferredWrapper::clear, should only remove itself from m_globalObject when m_globalObject is alive.
+
+ Finally, this patch makes DeferredWrapper inherit from ActiveDOMCallback so that it won't try to execute scripts
+ when the active DOM objects have been suspended; e.g. after a page navigation.
+
+ No new tests since there should be no author/user visible behavioral change.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::ApplePaySession::canMakePaymentsWithActiveCard):
+ * Modules/applepay/ApplePaySession.h:
+ * Modules/fetch/DOMWindowFetch.cpp:
+ (WebCore::DOMWindowFetch::fetch):
+ * Modules/fetch/DOMWindowFetch.h:
+ * Modules/fetch/FetchBody.cpp:
+ (WebCore::FetchBody::arrayBuffer):
+ (WebCore::FetchBody::blob):
+ (WebCore::FetchBody::json):
+ (WebCore::FetchBody::text):
+ (WebCore::FetchBody::consume):
+ (WebCore::FetchBody::consumeArrayBuffer):
+ (WebCore::FetchBody::consumeArrayBufferView):
+ (WebCore::FetchBody::consumeText):
+ (WebCore::FetchBody::consumeBlob):
+ (WebCore::FetchBody::loadingFailed):
+ (WebCore::FetchBody::loadingSucceeded):
+ * Modules/fetch/FetchBody.h:
+ (WebCore::FetchBody::formData):
+ (WebCore::FetchBody::cleanConsumePromise):
+ (WebCore::FetchBody): Use RefPtr<DeferredWrapper> instead of Optional<DeferredWrapper> now that DeferredWrapper
+ is ref counted. Perhaps we could use Optional<Ref<DeferredWrapper>> here but that seemed rather verbose.
+ * Modules/fetch/FetchBodyConsumer.cpp:
+ (WebCore::FetchBodyConsumer::resolveWithData):
+ (WebCore::FetchBodyConsumer::resolve):
+ * Modules/fetch/FetchBodyConsumer.h:
+ * Modules/fetch/FetchBodyOwner.cpp:
+ (WebCore::FetchBodyOwner::arrayBuffer):
+ (WebCore::FetchBodyOwner::blob):
+ (WebCore::FetchBodyOwner::formData):
+ (WebCore::FetchBodyOwner::json):
+ (WebCore::FetchBodyOwner::text):
+ * Modules/fetch/FetchBodyOwner.h:
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::consume):
+ (WebCore::FetchResponse::finishConsumingStream):
+ * Modules/fetch/FetchResponse.h:
+ * Modules/fetch/WorkerGlobalScopeFetch.cpp:
+ (WebCore::WorkerGlobalScopeFetch::fetch):
+ * Modules/fetch/WorkerGlobalScopeFetch.h:
+ * Modules/mediastream/UserMediaPermissionCheck.h:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::JSDOMGlobalObject::~JSDOMGlobalObject): Added.
+ (WebCore::JSDOMGlobalObject::visitChildren): Added visits to each JSPromiseDeferred owned by this global object.
+ * bindings/js/JSDOMGlobalObject.h:
+ (WebCore::JSDOMGlobalObject::deferredWrappers): Added. This map is only used by JSDOMGlobalObject's visitChildren.
+ * bindings/js/JSDOMPromise.cpp:
+ (WebCore::DeferredWrapper::DeferredWrapper):
+ (WebCore::DeferredWrapper::~DeferredWrapper): Calls clear. When the global object has already been finalized,
+ m_globalObject is dead. In that case, there is no need to remove itself from the global object. When m_deferred
+ has been cleared, either clear() has already been called (1) or the callback is dead (2). Since (2) happens only
+ when the global object itself is dead (as its visitChildren would have visited m_deferred otherwise), again, there
+ is no need to remove itself from global object.
+ (WebCore::DeferredWrapper::clear): Added. Clears m_deferred and removes itself from JSDOMGlobalObject.
+ (WebCore::DeferredWrapper::contextDestroyed): ScriptExecutionContext has been destroyed. We must call clear().
+ (WebCore::DeferredWrapper::callFunction): Check canInvokeCallback in ActiveDOMCallback.
+ (WebCore::DeferredWrapper::reject): Exit early when isSuspended() is true. See below.
+ (WebCore::rejectPromiseWithExceptionIfAny):
+ (WebCore::fulfillPromiseWithJSON):
+ (WebCore::fulfillPromiseWithArrayBuffer):
+ * bindings/js/JSDOMPromise.h:
+ (WebCore::DeferredWrapper::create): Added.
+ (WebCore::DeferredWrapper::isSuspended): Added. Returns true iff the DOM wrapper world has gone away or active DOM
+ objects have been suspended.
+ (WebCore::DeferredWrapper::globalObject): Made this inline.
+ (WebCore::DeferredWrapper::visitAggregate): Added. Called by JSDOMGlobalObject::visitChildren.
+ (WebCore::DOMPromise::resolve):
+ (WebCore::DOMPromise::reject):
+ (WebCore::DeferredWrapper::resolveWithValue): Exit early when isSuspended() is true.
+ (WebCore::DeferredWrapper::resolveWithNewlyCreated): Ditto.
+ (WebCore::DeferredWrapper::rejectWithValue): Ditto.
+ (WebCore::DeferredWrapper::resolve): Ditto.
+ (WebCore::DeferredWrapper::reject): Ditto.
+ * bindings/js/JSFontFaceCustom.cpp:
+ (WebCore::JSFontFace::loaded):
+ * bindings/js/JSFontFaceSetCustom.cpp:
+ (WebCore::JSFontFaceSet::ready):
+ * bindings/js/JSMediaDevicesCustom.cpp:
+ (WebCore::JSMediaDevices::getUserMedia):
+ * bindings/js/JSReadableStreamSourceCustom.cpp:
+ (WebCore::JSReadableStreamSource::start):
+ * bindings/js/JSWebKitSubtleCryptoCustom.cpp:
+ (WebCore::JSWebKitSubtleCrypto::encrypt):
+ (WebCore::JSWebKitSubtleCrypto::decrypt):
+ (WebCore::JSWebKitSubtleCrypto::sign):
+ (WebCore::JSWebKitSubtleCrypto::verify):
+ (WebCore::JSWebKitSubtleCrypto::digest):
+ (WebCore::JSWebKitSubtleCrypto::generateKey):
+ (WebCore::JSWebKitSubtleCrypto::importKey):
+ (WebCore::JSWebKitSubtleCrypto::exportKey):
+ (WebCore::JSWebKitSubtleCrypto::wrapKey):
+ (WebCore::JSWebKitSubtleCrypto::unwrapKey):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateReturnParameters):
+
</ins><span class="cx"> 2016-08-31 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Request construction failure should not set "bodyUsed"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx"> return paymentCoordinator.canMakePayments();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::canMakePaymentsWithActiveCard(ScriptExecutionContext& scriptExecutionContext, const String& merchantIdentifier, DeferredWrapper&& promise, ExceptionCode& ec)
</del><ins>+void ApplePaySession::canMakePaymentsWithActiveCard(ScriptExecutionContext& scriptExecutionContext, const String& merchantIdentifier, Ref<DeferredWrapper>&& passedPromise, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> auto& document = downcast<Document>(scriptExecutionContext);
</span><span class="cx"> DOMWindow& window = *document.domWindow();
</span><span class="lines">@@ -745,12 +745,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ RefPtr<DeferredWrapper> promise(WTFMove(passedPromise));
</ins><span class="cx"> if (!shouldDiscloseApplePayCapability(document)) {
</span><span class="cx"> auto& paymentCoordinator = document.frame()->mainFrame().paymentCoordinator();
</span><span class="cx"> bool canMakePayments = paymentCoordinator.canMakePayments();
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([promise, canMakePayments]() mutable {
</span><del>- promise.resolve(canMakePayments);
</del><ins>+ promise->resolve(canMakePayments);
</ins><span class="cx"> });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -758,7 +759,7 @@
</span><span class="cx"> auto& paymentCoordinator = document.frame()->mainFrame().paymentCoordinator();
</span><span class="cx">
</span><span class="cx"> paymentCoordinator.canMakePaymentsWithActiveCard(merchantIdentifier, document.domain(), [promise](bool canMakePayments) mutable {
</span><del>- promise.resolve(canMakePayments);
</del><ins>+ promise->resolve(canMakePayments);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> static bool supportsVersion(ScriptExecutionContext&, unsigned version, ExceptionCode&);
</span><span class="cx"> static bool canMakePayments(ScriptExecutionContext&, ExceptionCode&);
</span><del>- static void canMakePaymentsWithActiveCard(ScriptExecutionContext&, const String& merchantIdentifier, DeferredWrapper&&, ExceptionCode&);
</del><ins>+ static void canMakePaymentsWithActiveCard(ScriptExecutionContext&, const String& merchantIdentifier, Ref<DeferredWrapper>&&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void begin(ExceptionCode&);
</span><span class="cx"> void abort(ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchDOMWindowFetchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void DOMWindowFetch::fetch(DOMWindow& window, FetchRequest& request, DeferredWrapper&& promise)
</del><ins>+void DOMWindowFetch::fetch(DOMWindow& window, FetchRequest& request, DOMPromise<FetchResponse>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (!window.scriptExecutionContext())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchDOMWindowFetchh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx">
</span><ins>+#include "JSDOMPromise.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -38,10 +39,11 @@
</span><span class="cx"> class DeferredWrapper;
</span><span class="cx"> class Dictionary;
</span><span class="cx"> class FetchRequest;
</span><ins>+class FetchResponse;
</ins><span class="cx">
</span><span class="cx"> class DOMWindowFetch {
</span><span class="cx"> public:
</span><del>- static void fetch(DOMWindow&, FetchRequest&, DeferredWrapper&&);
</del><ins>+ static void fetch(DOMWindow&, FetchRequest&, DOMPromise<FetchResponse>&&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> headers.fastSet(HTTPHeaderName::ContentType, m_contentType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::arrayBuffer(FetchBodyOwner& owner, DeferredWrapper&& promise)
</del><ins>+void FetchBody::arrayBuffer(FetchBodyOwner& owner, Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type != Type::None);
</span><span class="cx"> m_consumer.setType(FetchBodyConsumer::Type::ArrayBuffer);
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> consume(owner, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::blob(FetchBodyOwner& owner, DeferredWrapper&& promise)
</del><ins>+void FetchBody::blob(FetchBodyOwner& owner, Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type != Type::None);
</span><span class="cx"> m_consumer.setType(FetchBodyConsumer::Type::Blob);
</span><span class="lines">@@ -139,12 +139,12 @@
</span><span class="cx"> consume(owner, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::json(FetchBodyOwner& owner, DeferredWrapper&& promise)
</del><ins>+void FetchBody::json(FetchBodyOwner& owner, Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type != Type::None);
</span><span class="cx">
</span><span class="cx"> if (m_type == Type::Text) {
</span><del>- fulfillPromiseWithJSON(promise, m_text);
</del><ins>+ fulfillPromiseWithJSON(WTFMove(promise), m_text);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_consumer.setType(FetchBodyConsumer::Type::JSON);
</span><span class="lines">@@ -151,12 +151,12 @@
</span><span class="cx"> consume(owner, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::text(FetchBodyOwner& owner, DeferredWrapper&& promise)
</del><ins>+void FetchBody::text(FetchBodyOwner& owner, Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type != Type::None);
</span><span class="cx">
</span><span class="cx"> if (m_type == Type::Text) {
</span><del>- promise.resolve(m_text);
</del><ins>+ promise->resolve(m_text);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_consumer.setType(FetchBodyConsumer::Type::Text);
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> consume(owner, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::consume(FetchBodyOwner& owner, DeferredWrapper&& promise)
</del><ins>+void FetchBody::consume(FetchBodyOwner& owner, Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> // This should be handled by FetchBodyOwner
</span><span class="cx"> ASSERT(m_type != Type::None);
</span><span class="lines">@@ -172,13 +172,13 @@
</span><span class="cx">
</span><span class="cx"> switch (m_type) {
</span><span class="cx"> case Type::ArrayBuffer:
</span><del>- consumeArrayBuffer(promise);
</del><ins>+ consumeArrayBuffer(WTFMove(promise));
</ins><span class="cx"> return;
</span><span class="cx"> case Type::ArrayBufferView:
</span><del>- consumeArrayBufferView(promise);
</del><ins>+ consumeArrayBufferView(WTFMove(promise));
</ins><span class="cx"> return;
</span><span class="cx"> case Type::Text:
</span><del>- consumeText(promise);
</del><ins>+ consumeText(WTFMove(promise));
</ins><span class="cx"> return;
</span><span class="cx"> case Type::Blob:
</span><span class="cx"> consumeBlob(owner, WTFMove(promise));
</span><span class="lines">@@ -187,11 +187,11 @@
</span><span class="cx"> m_consumePromise = WTFMove(promise);
</span><span class="cx"> return;
</span><span class="cx"> case Type::Loaded:
</span><del>- m_consumer.resolve(promise);
</del><ins>+ m_consumer.resolve(WTFMove(promise));
</ins><span class="cx"> return;
</span><span class="cx"> case Type::FormData:
</span><span class="cx"> // FIXME: Support consuming FormData.
</span><del>- promise.reject(0);
</del><ins>+ promise->reject(0);
</ins><span class="cx"> return;
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -246,28 +246,28 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void FetchBody::consumeArrayBuffer(DeferredWrapper& promise)
</del><ins>+void FetchBody::consumeArrayBuffer(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_data);
</span><del>- m_consumer.resolveWithData(promise, static_cast<const uint8_t*>(m_data->data()), m_data->byteLength());
</del><ins>+ m_consumer.resolveWithData(WTFMove(promise), static_cast<const uint8_t*>(m_data->data()), m_data->byteLength());
</ins><span class="cx"> m_data = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::consumeArrayBufferView(DeferredWrapper& promise)
</del><ins>+void FetchBody::consumeArrayBufferView(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_dataView);
</span><del>- m_consumer.resolveWithData(promise, static_cast<const uint8_t*>(m_dataView->baseAddress()), m_dataView->byteLength());
</del><ins>+ m_consumer.resolveWithData(WTFMove(promise), static_cast<const uint8_t*>(m_dataView->baseAddress()), m_dataView->byteLength());
</ins><span class="cx"> m_dataView = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::consumeText(DeferredWrapper& promise)
</del><ins>+void FetchBody::consumeText(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> Vector<uint8_t> data = extractFromText();
</span><del>- m_consumer.resolveWithData(promise, data.data(), data.size());
</del><ins>+ m_consumer.resolveWithData(WTFMove(promise), data.data(), data.size());
</ins><span class="cx"> m_text = { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::consumeBlob(FetchBodyOwner& owner, DeferredWrapper&& promise)
</del><ins>+void FetchBody::consumeBlob(FetchBodyOwner& owner, Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_blob);
</span><span class="cx">
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_consumePromise) {
</span><span class="cx"> m_consumePromise->reject(0);
</span><del>- m_consumePromise = Nullopt;
</del><ins>+ m_consumePromise = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -297,10 +297,8 @@
</span><span class="cx"> void FetchBody::loadingSucceeded()
</span><span class="cx"> {
</span><span class="cx"> m_type = m_consumer.hasData() ? Type::Loaded : Type::None;
</span><del>- if (m_consumePromise) {
- m_consumer.resolve(*m_consumePromise);
- m_consumePromise = Nullopt;
- }
</del><ins>+ if (m_consumePromise)
+ m_consumer.resolve(m_consumePromise.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<FormData> FetchBody::bodyForInternalRequest(ScriptExecutionContext& context) const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -52,11 +52,11 @@
</span><span class="cx">
</span><span class="cx"> class FetchBody {
</span><span class="cx"> public:
</span><del>- void arrayBuffer(FetchBodyOwner&, DeferredWrapper&&);
- void blob(FetchBodyOwner&, DeferredWrapper&&);
- void json(FetchBodyOwner&, DeferredWrapper&&);
- void text(FetchBodyOwner&, DeferredWrapper&&);
- void formData(FetchBodyOwner&, DeferredWrapper&& promise) { promise.reject(0); }
</del><ins>+ void arrayBuffer(FetchBodyOwner&, Ref<DeferredWrapper>&&);
+ void blob(FetchBodyOwner&, Ref<DeferredWrapper>&&);
+ void json(FetchBodyOwner&, Ref<DeferredWrapper>&&);
+ void text(FetchBodyOwner&, Ref<DeferredWrapper>&&);
+ void formData(FetchBodyOwner&, Ref<DeferredWrapper>&& promise) { promise.get().reject(0); }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> void consumeAsStream(FetchBodyOwner&, FetchResponseSource&);
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> FetchBodyConsumer& consumer() { return m_consumer; }
</span><span class="cx">
</span><del>- void cleanConsumePromise() { m_consumePromise = Nullopt; }
</del><ins>+ void cleanConsumePromise() { m_consumePromise = nullptr; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> FetchBody(Ref<Blob>&&);
</span><span class="lines">@@ -93,13 +93,13 @@
</span><span class="cx"> FetchBody(String&&);
</span><span class="cx"> FetchBody(Type type) : m_type(type) { }
</span><span class="cx">
</span><del>- void consume(FetchBodyOwner&, DeferredWrapper&&);
</del><ins>+ void consume(FetchBodyOwner&, Ref<DeferredWrapper>&&);
</ins><span class="cx">
</span><span class="cx"> Vector<uint8_t> extractFromText() const;
</span><del>- void consumeArrayBuffer(DeferredWrapper&);
- void consumeArrayBufferView(DeferredWrapper&);
- void consumeText(DeferredWrapper&);
- void consumeBlob(FetchBodyOwner&, DeferredWrapper&&);
</del><ins>+ void consumeArrayBuffer(Ref<DeferredWrapper>&&);
+ void consumeArrayBufferView(Ref<DeferredWrapper>&&);
+ void consumeText(Ref<DeferredWrapper>&&);
+ void consumeBlob(FetchBodyOwner&, Ref<DeferredWrapper>&&);
</ins><span class="cx">
</span><span class="cx"> Type m_type { Type::None };
</span><span class="cx"> String m_contentType;
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> String m_text;
</span><span class="cx">
</span><span class="cx"> FetchBodyConsumer m_consumer { FetchBodyConsumer::Type::None };
</span><del>- Optional<DeferredWrapper> m_consumePromise;
</del><ins>+ RefPtr<DeferredWrapper> m_consumePromise;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyConsumercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -59,20 +59,20 @@
</span><span class="cx"> return decoder->decodeAndFlush(reinterpret_cast<const char*>(data), length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBodyConsumer::resolveWithData(DeferredWrapper& promise, const unsigned char* data, unsigned length)
</del><ins>+void FetchBodyConsumer::resolveWithData(Ref<DeferredWrapper>&& promise, const unsigned char* data, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> switch (m_type) {
</span><span class="cx"> case Type::ArrayBuffer:
</span><del>- fulfillPromiseWithArrayBuffer(promise, data, length);
</del><ins>+ fulfillPromiseWithArrayBuffer(WTFMove(promise), data, length);
</ins><span class="cx"> return;
</span><span class="cx"> case Type::Blob:
</span><del>- promise.resolveWithNewlyCreated(blobFromData(data, length, m_contentType));
</del><ins>+ promise->resolveWithNewlyCreated(blobFromData(data, length, m_contentType));
</ins><span class="cx"> return;
</span><span class="cx"> case Type::JSON:
</span><del>- fulfillPromiseWithJSON(promise, textFromUTF8(data, length));
</del><ins>+ fulfillPromiseWithJSON(WTFMove(promise), textFromUTF8(data, length));
</ins><span class="cx"> return;
</span><span class="cx"> case Type::Text:
</span><del>- promise.resolve(textFromUTF8(data, length));
</del><ins>+ promise->resolve(textFromUTF8(data, length));
</ins><span class="cx"> return;
</span><span class="cx"> case Type::None:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -80,21 +80,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBodyConsumer::resolve(DeferredWrapper& promise)
</del><ins>+void FetchBodyConsumer::resolve(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type != Type::None);
</span><span class="cx"> switch (m_type) {
</span><span class="cx"> case Type::ArrayBuffer:
</span><del>- fulfillPromiseWithArrayBuffer(promise, takeAsArrayBuffer().get());
</del><ins>+ fulfillPromiseWithArrayBuffer(WTFMove(promise), takeAsArrayBuffer().get());
</ins><span class="cx"> return;
</span><span class="cx"> case Type::Blob:
</span><del>- promise.resolveWithNewlyCreated(takeAsBlob());
</del><ins>+ promise->resolveWithNewlyCreated(takeAsBlob());
</ins><span class="cx"> return;
</span><span class="cx"> case Type::JSON:
</span><del>- fulfillPromiseWithJSON(promise, takeAsText());
</del><ins>+ fulfillPromiseWithJSON(WTFMove(promise), takeAsText());
</ins><span class="cx"> return;
</span><span class="cx"> case Type::Text:
</span><del>- promise.resolve(takeAsText());
</del><ins>+ promise->resolve(takeAsText());
</ins><span class="cx"> return;
</span><span class="cx"> case Type::None:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyConsumerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx">
</span><span class="cx"> void clean() { m_buffer = nullptr; }
</span><span class="cx">
</span><del>- void resolve(DeferredWrapper&);
- void resolveWithData(DeferredWrapper&, const unsigned char*, unsigned);
</del><ins>+ void resolve(Ref<DeferredWrapper>&&);
+ void resolveWithData(Ref<DeferredWrapper>&&, const unsigned char*, unsigned);
</ins><span class="cx">
</span><span class="cx"> bool hasData() const { return !!m_buffer; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -71,14 +71,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBodyOwner::arrayBuffer(DeferredWrapper&& promise)
</del><ins>+void FetchBodyOwner::arrayBuffer(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_body.isEmpty()) {
</span><del>- fulfillPromiseWithArrayBuffer(promise, nullptr, 0);
</del><ins>+ fulfillPromiseWithArrayBuffer(WTFMove(promise), nullptr, 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (isDisturbedOrLocked()) {
</span><del>- promise.reject(TypeError);
</del><ins>+ promise->reject(TypeError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><span class="lines">@@ -85,14 +85,14 @@
</span><span class="cx"> m_body.arrayBuffer(*this, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBodyOwner::blob(DeferredWrapper&& promise)
</del><ins>+void FetchBodyOwner::blob(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_body.isEmpty()) {
</span><del>- promise.resolve(Blob::create(Vector<uint8_t>(), Blob::normalizedContentType(extractMIMETypeFromMediaType(m_body.contentType()))));
</del><ins>+ promise->resolve(Blob::create(Vector<uint8_t>(), Blob::normalizedContentType(extractMIMETypeFromMediaType(m_body.contentType()))));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (isDisturbedOrLocked()) {
</span><del>- promise.reject(TypeError);
</del><ins>+ promise->reject(TypeError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><span class="lines">@@ -99,14 +99,14 @@
</span><span class="cx"> m_body.blob(*this, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBodyOwner::formData(DeferredWrapper&& promise)
</del><ins>+void FetchBodyOwner::formData(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_body.isEmpty()) {
</span><del>- promise.reject(0);
</del><ins>+ promise->reject(0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (isDisturbedOrLocked()) {
</span><del>- promise.reject(TypeError);
</del><ins>+ promise->reject(TypeError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><span class="lines">@@ -113,14 +113,14 @@
</span><span class="cx"> m_body.formData(*this, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBodyOwner::json(DeferredWrapper&& promise)
</del><ins>+void FetchBodyOwner::json(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_body.isEmpty()) {
</span><del>- promise.reject(SYNTAX_ERR);
</del><ins>+ promise->reject(SYNTAX_ERR);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (isDisturbedOrLocked()) {
</span><del>- promise.reject(TypeError);
</del><ins>+ promise->reject(TypeError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><span class="lines">@@ -127,14 +127,14 @@
</span><span class="cx"> m_body.json(*this, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBodyOwner::text(DeferredWrapper&& promise)
</del><ins>+void FetchBodyOwner::text(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_body.isEmpty()) {
</span><del>- promise.resolve(String());
</del><ins>+ promise->resolve(String());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (isDisturbedOrLocked()) {
</span><del>- promise.reject(TypeError);
</del><ins>+ promise->reject(TypeError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -46,11 +46,11 @@
</span><span class="cx"> // Exposed Body API
</span><span class="cx"> bool isDisturbed() const { return m_isDisturbed; };
</span><span class="cx">
</span><del>- void arrayBuffer(DeferredWrapper&&);
- void blob(DeferredWrapper&&);
- void formData(DeferredWrapper&&);
- void json(DeferredWrapper&&);
- void text(DeferredWrapper&&);
</del><ins>+ void arrayBuffer(Ref<DeferredWrapper>&&);
+ void blob(Ref<DeferredWrapper>&&);
+ void formData(Ref<DeferredWrapper>&&);
+ void json(Ref<DeferredWrapper>&&);
+ void text(Ref<DeferredWrapper>&&);
</ins><span class="cx">
</span><span class="cx"> bool isDisturbedOrLocked() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> m_loader->stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchResponse::consume(unsigned type, DeferredWrapper&& wrapper)
</del><ins>+void FetchResponse::consume(unsigned type, Ref<DeferredWrapper>&& wrapper)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(type <= static_cast<unsigned>(FetchBodyConsumer::Type::Text));
</span><span class="cx">
</span><span class="lines">@@ -241,9 +241,9 @@
</span><span class="cx"> m_consumer.append(chunk->data(), chunk->byteLength());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchResponse::finishConsumingStream(DeferredWrapper&& promise)
</del><ins>+void FetchResponse::finishConsumingStream(Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><del>- m_consumer.resolve(promise);
</del><ins>+ m_consumer.resolve(WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchResponse::consumeBodyAsStream()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -60,11 +60,11 @@
</span><span class="cx"> using FetchPromise = DOMPromise<FetchResponse>;
</span><span class="cx"> static void fetch(ScriptExecutionContext&, FetchRequest&, FetchPromise&&);
</span><span class="cx">
</span><del>- void consume(unsigned, DeferredWrapper&&);
</del><ins>+ void consume(unsigned, Ref<DeferredWrapper>&&);
</ins><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> void startConsumingStream(unsigned);
</span><span class="cx"> void consumeChunk(Ref<JSC::Uint8Array>&&);
</span><del>- void finishConsumingStream(DeferredWrapper&&);
</del><ins>+ void finishConsumingStream(Ref<DeferredWrapper>&&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void setStatus(int, const String&, ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchWorkerGlobalScopeFetchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void WorkerGlobalScopeFetch::fetch(WorkerGlobalScope& scope, FetchRequest& request, DeferredWrapper&& promise)
</del><ins>+void WorkerGlobalScopeFetch::fetch(WorkerGlobalScope& scope, FetchRequest& request, Ref<DeferredWrapper>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (!scope.scriptExecutionContext())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchWorkerGlobalScopeFetchh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> class WorkerGlobalScopeFetch {
</span><span class="cx"> public:
</span><del>- static void fetch(WorkerGlobalScope&, FetchRequest&, DeferredWrapper&&);
</del><ins>+ static void fetch(WorkerGlobalScope&, FetchRequest&, Ref<DeferredWrapper>&&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaPermissionCheckh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaPermissionCheck.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaPermissionCheck.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaPermissionCheck.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><del>-#include "MediaDevices.h"
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -4941,7 +4941,7 @@
</span><span class="cx"> B5B7A17017C10AA800E4AA0A /* ElementData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5B7A16F17C1080600E4AA0A /* ElementData.cpp */; };
</span><span class="cx"> B5B7A17117C10AC000E4AA0A /* ElementData.h in Headers */ = {isa = PBXBuildFile; fileRef = B5B7A16E17C1048000E4AA0A /* ElementData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B5D31DFA11CF610B009F22B4 /* ActiveDOMCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5D31DF811CF610B009F22B4 /* ActiveDOMCallback.cpp */; };
</span><del>- B5D31DFB11CF610B009F22B4 /* ActiveDOMCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B5D31DF911CF610B009F22B4 /* ActiveDOMCallback.h */; };
</del><ins>+ B5D31DFB11CF610B009F22B4 /* ActiveDOMCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B5D31DF911CF610B009F22B4 /* ActiveDOMCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> B6566270120B1227006EA85C /* JSIDBTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = B656626E120B1227006EA85C /* JSIDBTransaction.h */; };
</span><span class="cx"> B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B658FF9F1522EF3A00DD5595 /* JSRadioNodeList.cpp */; };
</span><span class="cx"> B658FFA21522EF3A00DD5595 /* JSRadioNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = B658FFA01522EF3A00DD5595 /* JSRadioNodeList.h */; };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "JSDOMGlobalObject.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "JSDOMPromise.h"
</ins><span class="cx"> #include "JSDOMWindow.h"
</span><span class="cx"> #include "JSEventListener.h"
</span><span class="cx"> #include "JSMediaStream.h"
</span><span class="lines">@@ -61,6 +62,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSDOMGlobalObject::~JSDOMGlobalObject()
+{
+}
+
</ins><span class="cx"> void JSDOMGlobalObject::destroy(JSCell* cell)
</span><span class="cx"> {
</span><span class="cx"> static_cast<JSDOMGlobalObject*>(cell)->JSDOMGlobalObject::~JSDOMGlobalObject();
</span><span class="lines">@@ -167,6 +172,9 @@
</span><span class="cx"> for (auto& constructor : thisObject->constructors().values())
</span><span class="cx"> visitor.append(&constructor);
</span><span class="cx">
</span><ins>+ for (auto& deferredWrapper : thisObject->deferredWrappers())
+ deferredWrapper->visitAggregate(visitor);
+
</ins><span class="cx"> thisObject->m_builtinInternalFunctions.visit(visitor);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+ class DeferredWrapper;
</ins><span class="cx"> class Document;
</span><span class="cx"> class Event;
</span><span class="cx"> class DOMWrapperWorld;
</span><span class="lines">@@ -41,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> typedef HashMap<const JSC::ClassInfo*, JSC::WriteBarrier<JSC::Structure>> JSDOMStructureMap;
</span><span class="cx"> typedef HashMap<const JSC::ClassInfo*, JSC::WriteBarrier<JSC::JSObject>> JSDOMConstructorMap;
</span><ins>+ typedef HashSet<DeferredWrapper*> DeferredWrapperSet;
</ins><span class="cx">
</span><span class="cx"> class WEBCORE_EXPORT JSDOMGlobalObject : public JSC::JSGlobalObject {
</span><span class="cx"> typedef JSC::JSGlobalObject Base;
</span><span class="lines">@@ -56,6 +58,8 @@
</span><span class="cx"> JSDOMStructureMap& structures() { return m_structures; }
</span><span class="cx"> JSDOMConstructorMap& constructors() { return m_constructors; }
</span><span class="cx">
</span><ins>+ DeferredWrapperSet& deferredWrappers() { return m_deferredWrappers; }
+
</ins><span class="cx"> ScriptExecutionContext* scriptExecutionContext() const;
</span><span class="cx">
</span><span class="cx"> // Make binding code generation easier.
</span><span class="lines">@@ -75,6 +79,8 @@
</span><span class="cx"> static const JSC::ClassInfo s_info;
</span><span class="cx">
</span><span class="cx"> public:
</span><ins>+ ~JSDOMGlobalObject();
+
</ins><span class="cx"> static const JSC::ClassInfo* info() { return &s_info; }
</span><span class="cx">
</span><span class="cx"> static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSValue prototype)
</span><span class="lines">@@ -85,6 +91,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> JSDOMStructureMap m_structures;
</span><span class="cx"> JSDOMConstructorMap m_constructors;
</span><ins>+ DeferredWrapperSet m_deferredWrappers;
</ins><span class="cx">
</span><span class="cx"> Event* m_currentEvent;
</span><span class="cx"> Ref<DOMWrapperWorld> m_world;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromisecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -35,18 +35,33 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-DeferredWrapper::DeferredWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, JSPromiseDeferred* promiseDeferred)
- : m_globalObject(exec->vm(), globalObject)
- , m_deferred(exec->vm(), promiseDeferred)
</del><ins>+DeferredWrapper::DeferredWrapper(ExecState*, JSDOMGlobalObject* globalObject, JSPromiseDeferred* promiseDeferred)
+ : ActiveDOMCallback(globalObject->scriptExecutionContext())
+ , m_deferred(promiseDeferred)
+ , m_globalObject(globalObject)
</ins><span class="cx"> {
</span><ins>+ globalObject->vm().heap.writeBarrier(globalObject, promiseDeferred);
+ m_globalObject->deferredWrappers().add(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSDOMGlobalObject& DeferredWrapper::globalObject() const
</del><ins>+DeferredWrapper::~DeferredWrapper()
</ins><span class="cx"> {
</span><del>- ASSERT(m_globalObject);
- return *m_globalObject.get();
</del><ins>+ clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void DeferredWrapper::clear()
+{
+ ASSERT(!m_deferred || m_globalObject);
+ if (m_deferred && m_globalObject)
+ m_globalObject->deferredWrappers().remove(this);
+ m_deferred.clear();
+}
+
+void DeferredWrapper::contextDestroyed()
+{
+ clear();
+}
+
</ins><span class="cx"> JSC::JSValue DeferredWrapper::promise() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_deferred);
</span><span class="lines">@@ -55,6 +70,9 @@
</span><span class="cx">
</span><span class="cx"> void DeferredWrapper::callFunction(ExecState& exec, JSValue function, JSValue resolution)
</span><span class="cx"> {
</span><ins>+ if (!canInvokeCallback())
+ return;
+
</ins><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType = getCallData(function, callData);
</span><span class="cx"> ASSERT(callType != CallType::None);
</span><span class="lines">@@ -64,12 +82,14 @@
</span><span class="cx">
</span><span class="cx"> call(&exec, function, callType, callData, jsUndefined(), arguments);
</span><span class="cx">
</span><del>- m_globalObject.clear();
- m_deferred.clear();
</del><ins>+ clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DeferredWrapper::reject(ExceptionCode ec, const String& message)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
+
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* state = m_globalObject->globalExec();
</span><span class="lines">@@ -85,7 +105,7 @@
</span><span class="cx"> JSValue error = state.exception()->value();
</span><span class="cx"> state.clearException();
</span><span class="cx">
</span><del>- DeferredWrapper(&state, &globalObject, &promiseDeferred).reject(error);
</del><ins>+ DeferredWrapper::create(&state, &globalObject, &promiseDeferred)->reject(error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline JSC::JSValue parseAsJSON(JSC::ExecState* state, const String& data)
</span><span class="lines">@@ -94,27 +114,27 @@
</span><span class="cx"> return JSC::JSONParse(state, data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void fulfillPromiseWithJSON(DeferredWrapper& promise, const String& data)
</del><ins>+void fulfillPromiseWithJSON(Ref<DeferredWrapper>&& promise, const String& data)
</ins><span class="cx"> {
</span><del>- JSC::JSValue value = parseAsJSON(promise.globalObject().globalExec(), data);
</del><ins>+ JSC::JSValue value = parseAsJSON(promise->globalObject()->globalExec(), data);
</ins><span class="cx"> if (!value)
</span><del>- promise.reject(SYNTAX_ERR);
</del><ins>+ promise->reject(SYNTAX_ERR);
</ins><span class="cx"> else
</span><del>- promise.resolve(value);
</del><ins>+ promise->resolve(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void fulfillPromiseWithArrayBuffer(DeferredWrapper& promise, ArrayBuffer* arrayBuffer)
</del><ins>+void fulfillPromiseWithArrayBuffer(Ref<DeferredWrapper>&& promise, ArrayBuffer* arrayBuffer)
</ins><span class="cx"> {
</span><span class="cx"> if (!arrayBuffer) {
</span><del>- promise.reject<JSValue>(createOutOfMemoryError(promise.globalObject().globalExec()));
</del><ins>+ promise->reject<JSValue>(createOutOfMemoryError(promise->globalObject()->globalExec()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- promise.resolve(arrayBuffer);
</del><ins>+ promise->resolve(arrayBuffer);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void fulfillPromiseWithArrayBuffer(DeferredWrapper& promise, const void* data, size_t length)
</del><ins>+void fulfillPromiseWithArrayBuffer(Ref<DeferredWrapper>&& promise, const void* data, size_t length)
</ins><span class="cx"> {
</span><del>- fulfillPromiseWithArrayBuffer(promise, ArrayBuffer::tryCreate(data, length).get());
</del><ins>+ fulfillPromiseWithArrayBuffer(WTFMove(promise), ArrayBuffer::tryCreate(data, length).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef JSDOMPromise_h
</span><span class="cx"> #define JSDOMPromise_h
</span><span class="cx">
</span><ins>+#include "ActiveDOMCallback.h"
</ins><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include <heap/StrongInlines.h>
</span><span class="cx"> #include <runtime/JSPromiseDeferred.h>
</span><span class="lines">@@ -95,10 +96,15 @@
</span><span class="cx"> static constexpr bool passByConstRef = false;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class DeferredWrapper {
</del><ins>+class DeferredWrapper : public RefCounted<DeferredWrapper>, public ActiveDOMCallback {
</ins><span class="cx"> public:
</span><del>- DeferredWrapper(JSC::ExecState*, JSDOMGlobalObject*, JSC::JSPromiseDeferred*);
</del><ins>+ static Ref<DeferredWrapper> create(JSC::ExecState* state, JSDOMGlobalObject* globalObject, JSC::JSPromiseDeferred* deferred)
+ {
+ return adoptRef(*new DeferredWrapper(state, globalObject, deferred));
+ }
</ins><span class="cx">
</span><ins>+ ~DeferredWrapper();
+
</ins><span class="cx"> template<class ResolveResultType> typename std::enable_if<PromiseResultInspector<ResolveResultType>::passByValue, void>::type
</span><span class="cx"> resolve(ResolveResultType result) { resolveWithValue(result); }
</span><span class="cx"> template<class ResolveResultType> typename std::enable_if<PromiseResultInspector<ResolveResultType>::passByRef, void>::type
</span><span class="lines">@@ -121,10 +127,19 @@
</span><span class="cx">
</span><span class="cx"> void reject(ExceptionCode, const String& = { });
</span><span class="cx">
</span><del>- JSDOMGlobalObject& globalObject() const;
</del><span class="cx"> JSC::JSValue promise() const;
</span><span class="cx">
</span><ins>+ bool isSuspended() { return !m_deferred || !canInvokeCallback(); } // The wrapper world has gone away or active DOM objects have been suspended.
+ JSDOMGlobalObject* globalObject() { return m_globalObject.get(); }
+
+ void visitAggregate(JSC::SlotVisitor& visitor) { visitor.appendUnbarrieredWeak(&m_deferred); }
+
</ins><span class="cx"> private:
</span><ins>+ DeferredWrapper(JSC::ExecState*, JSDOMGlobalObject*, JSC::JSPromiseDeferred*);
+
+ void clear();
+ void contextDestroyed() override;
+
</ins><span class="cx"> void callFunction(JSC::ExecState&, JSC::JSValue function, JSC::JSValue resolution);
</span><span class="cx"> void resolve(JSC::ExecState& state, JSC::JSValue resolution) { callFunction(state, m_deferred->resolve(), resolution); }
</span><span class="cx"> void reject(JSC::ExecState& state, JSC::JSValue resolution) { callFunction(state, m_deferred->reject(), resolution); }
</span><span class="lines">@@ -132,13 +147,13 @@
</span><span class="cx"> template<class RejectResultType> void rejectWithValue(RejectResultType&&);
</span><span class="cx"> template<class ResolveResultType> void resolveWithValue(ResolveResultType&&);
</span><span class="cx">
</span><del>- JSC::Strong<JSDOMGlobalObject> m_globalObject;
- JSC::Strong<JSC::JSPromiseDeferred> m_deferred;
</del><ins>+ JSC::Weak<JSC::JSPromiseDeferred> m_deferred;
+ JSC::Weak<JSDOMGlobalObject> m_globalObject;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-void fulfillPromiseWithJSON(DeferredWrapper&, const String&);
-void fulfillPromiseWithArrayBuffer(DeferredWrapper&, ArrayBuffer*);
-void fulfillPromiseWithArrayBuffer(DeferredWrapper&, const void*, size_t);
</del><ins>+void fulfillPromiseWithJSON(Ref<DeferredWrapper>&&, const String&);
+void fulfillPromiseWithArrayBuffer(Ref<DeferredWrapper>&&, ArrayBuffer*);
+void fulfillPromiseWithArrayBuffer(Ref<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">@@ -156,26 +171,31 @@
</span><span class="cx"> template <typename Value>
</span><span class="cx"> class DOMPromise {
</span><span class="cx"> public:
</span><del>- DOMPromise(DeferredWrapper&& wrapper) : m_wrapper(WTFMove(wrapper)) { }
</del><ins>+ DOMPromise(Ref<DeferredWrapper>&& wrapper)
+ : m_wrapper(WTFMove(wrapper))
+ {
+ }
+
</ins><span class="cx"> DOMPromise(DOMPromise&& promise) : m_wrapper(WTFMove(promise.m_wrapper)) { }
</span><span class="cx">
</span><span class="cx"> DOMPromise(const DOMPromise&) = default;
</span><span class="cx"> DOMPromise& operator=(DOMPromise const&) = default;
</span><span class="cx">
</span><del>- void resolve(typename PromiseResultInspector<Value>::Type value) { m_wrapper.resolve(value); }
</del><ins>+ void resolve(typename PromiseResultInspector<Value>::Type value) { m_wrapper->resolve(value); }
</ins><span class="cx">
</span><del>- template<typename... ErrorType> void reject(ErrorType&&... error) { m_wrapper.reject(std::forward<ErrorType>(error)...); }
</del><ins>+ template<typename... ErrorType> void reject(ErrorType&&... error) { m_wrapper->reject(std::forward<ErrorType>(error)...); }
</ins><span class="cx">
</span><span class="cx"> DeferredWrapper& deferredWrapper() { return m_wrapper; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- DeferredWrapper m_wrapper;
</del><ins>+ Ref<DeferredWrapper> m_wrapper;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<class ResolveResultType>
</span><span class="cx"> inline void DeferredWrapper::resolveWithValue(ResolveResultType&& result)
</span><span class="cx"> {
</span><del>- ASSERT(m_deferred);
</del><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span><span class="cx"> JSC::JSLockHolder locker(exec);
</span><span class="lines">@@ -185,6 +205,8 @@
</span><span class="cx"> template<class ResolveResultType>
</span><span class="cx"> inline void DeferredWrapper::resolveWithNewlyCreated(Ref<ResolveResultType>&& result)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span><span class="lines">@@ -195,6 +217,8 @@
</span><span class="cx"> template<class RejectResultType>
</span><span class="cx"> inline void DeferredWrapper::rejectWithValue(RejectResultType&& result)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span><span class="lines">@@ -205,6 +229,8 @@
</span><span class="cx"> template<>
</span><span class="cx"> inline void DeferredWrapper::resolve(bool result)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span><span class="lines">@@ -215,6 +241,8 @@
</span><span class="cx"> template<>
</span><span class="cx"> inline void DeferredWrapper::resolve(JSC::JSValue value)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span><span class="lines">@@ -225,6 +253,8 @@
</span><span class="cx"> template<>
</span><span class="cx"> inline void DeferredWrapper::reject(JSC::JSValue value)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span><span class="lines">@@ -235,6 +265,8 @@
</span><span class="cx"> template<>
</span><span class="cx"> inline void DeferredWrapper::resolve(std::nullptr_t)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span><span class="lines">@@ -245,6 +277,8 @@
</span><span class="cx"> template<>
</span><span class="cx"> inline void DeferredWrapper::reject(std::nullptr_t)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span><span class="lines">@@ -255,6 +289,8 @@
</span><span class="cx"> template<>
</span><span class="cx"> inline void DeferredWrapper::resolve(const String& result)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span><span class="lines">@@ -265,6 +301,8 @@
</span><span class="cx"> template<>
</span><span class="cx"> inline void DeferredWrapper::reject(const String& result)
</span><span class="cx"> {
</span><ins>+ if (isSuspended())
+ return;
</ins><span class="cx"> ASSERT(m_deferred);
</span><span class="cx"> ASSERT(m_globalObject);
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSFontFaceCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_loaded) {
</span><span class="cx"> if (!wrapped().promise()) {
</span><del>- DeferredWrapper promise(&state, globalObject(), JSC::JSPromiseDeferred::create(&state, globalObject()));
- m_loaded.set(state.vm(), this, promise.promise());
</del><ins>+ Ref<DeferredWrapper> promise = DeferredWrapper::create(&state, globalObject(), JSC::JSPromiseDeferred::create(&state, globalObject()));
+ m_loaded.set(state.vm(), this, promise->promise());
</ins><span class="cx"> wrapped().registerLoaded(WTFMove(promise));
</span><span class="cx"> } else
</span><span class="cx"> m_loaded.set(state.vm(), this, wrapped().promise().value().deferredWrapper().promise());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSFontFaceSetCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSFontFaceSetCustom.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSFontFaceSetCustom.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/js/JSFontFaceSetCustom.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> JSC::JSValue JSFontFaceSet::ready(JSC::ExecState& state) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_ready) {
</span><del>- DeferredWrapper promise(&state, globalObject(), JSC::JSPromiseDeferred::create(&state, globalObject()));
- m_ready.set(state.vm(), this, promise.promise());
</del><ins>+ Ref<DeferredWrapper> promise = DeferredWrapper::create(&state, globalObject(), JSC::JSPromiseDeferred::create(&state, globalObject()));
+ m_ready.set(state.vm(), this, promise->promise());
</ins><span class="cx"> wrapped().registerReady(WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx"> return m_ready.get();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMediaDevicesCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> auto audioConstraints = MediaConstraintsImpl::create(WTFMove(mandatoryAudioConstraints), WTFMove(advancedAudioConstraints), areAudioConstraintsValid);
</span><span class="cx"> auto videoConstraints = MediaConstraintsImpl::create(WTFMove(mandatoryVideoConstraints), WTFMove(advancedVideoConstraints), areVideoConstraintsValid);
</span><span class="cx"> JSC::JSPromiseDeferred* promiseDeferred = JSC::JSPromiseDeferred::create(&state, globalObject());
</span><del>- wrapped().getUserMedia(WTFMove(audioConstraints), WTFMove(videoConstraints), DeferredWrapper(&state, globalObject(), promiseDeferred), ec);
</del><ins>+ wrapped().getUserMedia(WTFMove(audioConstraints), WTFMove(videoConstraints), DeferredWrapper::create(&state, globalObject(), promiseDeferred), ec);
</ins><span class="cx"> setDOMException(&state, ec);
</span><span class="cx"> return promiseDeferred->promise();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamSourceCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> m_controller.set(state.vm(), jsSource, state.argument(0));
</span><span class="cx">
</span><span class="cx"> JSC::JSPromiseDeferred* promiseDeferred = JSC::JSPromiseDeferred::create(&state, globalObject());
</span><del>- wrapped().start(ReadableStreamDefaultController(controller), DeferredWrapper(&state, globalObject(), promiseDeferred));
</del><ins>+ wrapped().start(ReadableStreamDefaultController(controller), DeferredWrapper::create(&state, globalObject(), promiseDeferred));
</ins><span class="cx"> return promiseDeferred->promise();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebKitSubtleCryptoCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -174,12 +174,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper.releaseNonNull(), result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -229,12 +229,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper.releaseNonNull(), result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -284,12 +284,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper.releaseNonNull(), result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -345,12 +345,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx"> auto successCallback = [wrapper](bool result) mutable {
</span><del>- wrapper.resolve(result);
</del><ins>+ wrapper->resolve(result);
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -390,12 +390,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper.releaseNonNull(), result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -444,17 +444,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx"> auto successCallback = [wrapper](CryptoKey* key, CryptoKeyPair* keyPair) mutable {
</span><span class="cx"> ASSERT(key || keyPair);
</span><span class="cx"> ASSERT(!key || !keyPair);
</span><span class="cx"> if (key)
</span><del>- wrapper.resolve(key);
</del><ins>+ wrapper->resolve(key);
</ins><span class="cx"> else
</span><del>- wrapper.resolve(keyPair);
</del><ins>+ wrapper->resolve(keyPair);
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -581,12 +581,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx"> auto successCallback = [wrapper](CryptoKey& result) mutable {
</span><del>- wrapper.resolve(result);
</del><ins>+ wrapper->resolve(result);
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebCore::importKey(state, keyFormat, data, WTFMove(algorithm), WTFMove(parameters), extractable, keyUsages, WTFMove(successCallback), WTFMove(failureCallback));
</span><span class="lines">@@ -650,12 +650,12 @@
</span><span class="cx"> return throwTypeError(&state, scope);
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx"> auto successCallback = [wrapper](const Vector<uint8_t>& result) mutable {
</span><del>- fulfillPromiseWithArrayBuffer(wrapper, result.data(), result.size());
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper.releaseNonNull(), result.data(), result.size());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebCore::exportKey(state, keyFormat, *key, WTFMove(successCallback), WTFMove(failureCallback));
</span><span class="lines">@@ -706,25 +706,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx">
</span><span class="cx"> auto exportSuccessCallback = [keyFormat, algorithm, parameters, wrappingKey, wrapper](const Vector<uint8_t>& exportedKeyData) mutable {
</span><span class="cx"> auto encryptSuccessCallback = [wrapper](const Vector<uint8_t>& encryptedData) mutable {
</span><del>- fulfillPromiseWithArrayBuffer(wrapper, encryptedData.data(), encryptedData.size());
</del><ins>+ fulfillPromiseWithArrayBuffer(wrapper.releaseNonNull(), encryptedData.data(), encryptedData.size());
</ins><span class="cx"> };
</span><span class="cx"> auto encryptFailureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> algorithm->encryptForWrapKey(*parameters, *wrappingKey, std::make_pair(exportedKeyData.data(), exportedKeyData.size()), WTFMove(encryptSuccessCallback), WTFMove(encryptFailureCallback), ec);
</span><span class="cx"> if (ec) {
</span><span class="cx"> // FIXME: Report failure details to console, and possibly to calling script once there is a standardized way to pass errors to WebCrypto promise reject functions.
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> auto exportFailureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -809,15 +809,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><del>- DeferredWrapper wrapper(&state, globalObject(), promiseDeferred);
</del><ins>+ RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</ins><span class="cx"> Strong<JSDOMGlobalObject> domGlobalObject(state.vm(), globalObject());
</span><span class="cx">
</span><span class="cx"> auto decryptSuccessCallback = [domGlobalObject, keyFormat, unwrappedKeyAlgorithm, unwrappedKeyAlgorithmParameters, extractable, keyUsages, wrapper](const Vector<uint8_t>& result) mutable {
</span><span class="cx"> auto importSuccessCallback = [wrapper](CryptoKey& key) mutable {
</span><del>- wrapper.resolve(key);
</del><ins>+ wrapper->resolve(key);
</ins><span class="cx"> };
</span><span class="cx"> auto importFailureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx"> ExecState& state = *domGlobalObject->globalExec();
</span><span class="cx"> WebCore::importKey(state, keyFormat, std::make_pair(result.data(), result.size()), unwrappedKeyAlgorithm, unwrappedKeyAlgorithmParameters, extractable, keyUsages, WTFMove(importSuccessCallback), WTFMove(importFailureCallback));
</span><span class="lines">@@ -824,12 +824,12 @@
</span><span class="cx"> if (state.hadException()) {
</span><span class="cx"> // FIXME: Report exception details to console, and possibly to calling script once there is a standardized way to pass errors to WebCrypto promise reject functions.
</span><span class="cx"> state.clearException();
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> auto decryptFailureCallback = [wrapper]() mutable {
</span><del>- wrapper.reject(nullptr);
</del><ins>+ wrapper->reject(nullptr);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -4114,9 +4114,9 @@
</span><span class="cx">
</span><span class="cx"> if (IsReturningPromise($function)) {
</span><span class="cx"> if ($function->isStatic) {
</span><del>- push(@arguments, "DeferredWrapper(state, jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject()), promiseDeferred)");
</del><ins>+ push(@arguments, "DeferredWrapper::create(state, jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject()), promiseDeferred)");
</ins><span class="cx"> } else {
</span><del>- push(@arguments, "DeferredWrapper(state, castedThis->globalObject(), promiseDeferred)");
</del><ins>+ push(@arguments, "DeferredWrapper::create(state, castedThis->globalObject(), promiseDeferred)");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> push(@arguments, "ec") if $function->signature->extendedAttributes->{"RaisesException"} || $function->signature->extendedAttributes->{"RaisesExceptionWithMessage"};
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (205256 => 205257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-08-31 17:44:22 UTC (rev 205256)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-08-31 18:36:46 UTC (rev 205257)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/Modules/vibration"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/webdatabase"
</span><span class="cx"> "${WEBCORE_DIR}/accessibility"
</span><ins>+ "${WEBCORE_DIR}/bindings/generic"
</ins><span class="cx"> "${WEBCORE_DIR}/bindings/js"
</span><span class="cx"> "${WEBCORE_DIR}/bindings"
</span><span class="cx"> "${WEBCORE_DIR}/bridge"
</span></span></pre>
</div>
</div>
</body>
</html>