Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1735334 - Remove obsolete promise wrapping code r=smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D129194
This commit is contained in:
Matthew Gaudet 2021-10-22 13:24:57 +00:00
parent b641c43be1
commit c1a03d89fa
1 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dom/streams/UnderlyingSourceCallbackHelpers.cpp
View File

@ -123,18 +123,6 @@ void UnderlyingSourceStartCallbackHelper::StartCallback(
already_AddRefed<Promise> IDLUnderlyingSourcePullCallbackHelper::PullCallback(
JSContext* aCx, ReadableStreamDefaultController& aController,
ErrorResult& aRv) {
// See https://bugzilla.mozilla.org/show_bug.cgi?id=1726595 for why all this
// gorp exists.
// Pre-allocate a promise which we may end up discarding or rejecting.
// We do this here in order to avoid having to try allocating on a
// failure path after the callback is called.
nsIGlobalObject* global = GetIncumbentGlobal();
RefPtr<Promise> maybeRejectPromise = Promise::Create(global, aRv);
if (aRv.Failed()) {
return nullptr;
}
JS::RootedObject thisObj(aCx, mThisObj);
// Strong Ref
@ -143,16 +131,6 @@ already_AddRefed<Promise> IDLUnderlyingSourcePullCallbackHelper::PullCallback(
callback->Call(thisObj, aController, aRv, "UnderlyingSource.pull",
CallbackFunction::eRethrowExceptions);
// Inform the ErrorResult that we're handling a JS exception if it happened.
aRv.WouldReportJSException();
if (aRv.Failed()) {
MOZ_ASSERT(!promise);
// Use the previously allocated promise now.
maybeRejectPromise->MaybeReject(std::move(aRv));
return maybeRejectPromise.forget();
}
return promise.forget();
}
@ -160,18 +138,6 @@ already_AddRefed<Promise>
IDLUnderlyingSourceCancelCallbackHelper::CancelCallback(
JSContext* aCx, const Optional<JS::Handle<JS::Value>>& aReason,
ErrorResult& aRv) {
// See https://bugzilla.mozilla.org/show_bug.cgi?id=1726595 for why all this
// gorp exists.
// Pre-allocate a promise which we may end up discarding or rejecting.
// We do this here in order to avoid having to try allocating on a
// failure path after the callback is called.
nsIGlobalObject* global = GetIncumbentGlobal();
RefPtr<Promise> maybeRejectPromise = Promise::Create(global, aRv);
if (aRv.Failed()) {
return nullptr;
}
JS::RootedObject thisObj(aCx, mThisObj);
// Strong Ref
@ -180,16 +146,6 @@ IDLUnderlyingSourceCancelCallbackHelper::CancelCallback(
callback->Call(thisObj, aReason, aRv, "UnderlyingSource.cancel",
CallbackFunction::eRethrowExceptions);
// Inform the ErrorResult that we're handling a JS exception if it happened.
aRv.WouldReportJSException();
if (aRv.Failed()) {
MOZ_ASSERT(!promise);
// Use the previously allocated promise now.
maybeRejectPromise->MaybeReject(std::move(aRv));
return maybeRejectPromise.forget();
}
return promise.forget();
}