Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-04 23:40:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1367679. P3 - pass mCompletionPromise to InvokeCallbackMethod(). r=gerald

Browse Source 
This reduces duplicate code by handling promise chaining in one place.

MozReview-Commit-ID: 474T5hvf9oM

--HG--
extra : rebase_source : b8de5bad5597234654d476b93c0c89abc5215073
extra : intermediate-source : b0f3d3fef28646c31c87acfbfbf36ec9329e7a6c
extra : source : 89aab3206558922271aff1d611f029aed3910acf
This commit is contained in:
JW Wang 2017-05-31 17:28:09 +08:00
parent c58f498b84
commit c6caf473c8
1 changed files with 40 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
xpcom/threads/MozPromise.h
View File

@ -526,12 +526,16 @@ protected:
typename ThisType,
typename MethodType,
typename ValueType>
static typename EnableIf<SupportChaining, already_AddRefed<MozPromise>>::Type
InvokeCallbackMethod(ThisType* aThisVal,
MethodType aMethod,
ValueType&& aValue)
static typename EnableIf<SupportChaining, void>::Type InvokeCallbackMethod(
ThisType* aThisVal,
MethodType aMethod,
ValueType&& aValue,
RefPtr<Private>&& aCompletionPromise)
{
return InvokeMethod(aThisVal, aMethod, Forward<ValueType>(aValue)).forget();
auto p = InvokeMethod(aThisVal, aMethod, Forward<ValueType>(aValue));
if (aCompletionPromise) {
p->ChainTo(aCompletionPromise.forget(), "<chained completion promise>");
}
}
// Called when promise chaining is not supported.
@ -539,13 +543,16 @@ protected:
typename ThisType,
typename MethodType,
typename ValueType>
static typename EnableIf<!SupportChaining, already_AddRefed<MozPromise>>::Type
InvokeCallbackMethod(ThisType* aThisVal,
MethodType aMethod,
ValueType&& aValue)
static typename EnableIf<!SupportChaining, void>::Type InvokeCallbackMethod(
ThisType* aThisVal,
MethodType aMethod,
ValueType&& aValue,
RefPtr<Private>&& aCompletionPromise)
{
MOZ_DIAGNOSTIC_ASSERT(
!aCompletionPromise,
"Can't do promise chaining for a non-promise-returning method.");
InvokeMethod(aThisVal, aMethod, Forward<ValueType>(aValue));
return nullptr;
}
template<typename>
@ -597,13 +604,18 @@ protected:
void DoResolveOrRejectInternal(ResolveOrRejectValue& aValue) override
{
RefPtr<MozPromise> result;
if (aValue.IsResolve()) {
result = InvokeCallbackMethod<SupportChaining::value>(
mThisVal.get(), mResolveMethod, MaybeMove(aValue.ResolveValue()));
InvokeCallbackMethod<SupportChaining::value>(
mThisVal.get(),
mResolveMethod,
MaybeMove(aValue.ResolveValue()),
Move(mCompletionPromise));
} else {
result = InvokeCallbackMethod<SupportChaining::value>(
mThisVal.get(), mRejectMethod, MaybeMove(aValue.RejectValue()));
InvokeCallbackMethod<SupportChaining::value>(
mThisVal.get(),
mRejectMethod,
MaybeMove(aValue.RejectValue()),
Move(mCompletionPromise));
}
// Null out mThisVal after invoking the callback so that any references are
@ -611,15 +623,6 @@ protected:
// released on whatever thread last drops its reference to the ThenValue,
// which may or may not be ok.
mThisVal = nullptr;
MOZ_DIAGNOSTIC_ASSERT(
!mCompletionPromise || result,
"Can't do promise chaining for a non-promise-returning method.");
if (mCompletionPromise && result) {
result->ChainTo(mCompletionPromise.forget(),
"<chained completion promise>");
}
}
private:
@ -664,23 +667,16 @@ protected:
void DoResolveOrRejectInternal(ResolveOrRejectValue& aValue) override
{
RefPtr<MozPromise> result = InvokeCallbackMethod<SupportChaining::value>(
mThisVal.get(), mResolveRejectMethod, MaybeMove(aValue));
InvokeCallbackMethod<SupportChaining::value>(mThisVal.get(),
mResolveRejectMethod,
MaybeMove(aValue),
Move(mCompletionPromise));
// Null out mThisVal after invoking the callback so that any references are
// released predictably on the dispatch thread. Otherwise, it would be
// released on whatever thread last drops its reference to the ThenValue,
// which may or may not be ok.
mThisVal = nullptr;
MOZ_DIAGNOSTIC_ASSERT(
!mCompletionPromise || result,
"Can't do promise chaining for a non-promise-returning method.");
if (mCompletionPromise && result) {
result->ChainTo(mCompletionPromise.forget(),
"<chained completion promise>");
}
}
private:
@ -735,17 +731,18 @@ protected:
// classes with ::operator()), since it allows us to share code more easily.
// We could fix this if need be, though it's quite easy to work around by
// just capturing something.
RefPtr<MozPromise> result;
if (aValue.IsResolve()) {
result = InvokeCallbackMethod<SupportChaining::value>(
InvokeCallbackMethod<SupportChaining::value>(
mResolveFunction.ptr(),
&ResolveFunction::operator(),
MaybeMove(aValue.ResolveValue()));
MaybeMove(aValue.ResolveValue()),
Move(mCompletionPromise));
} else {
result = InvokeCallbackMethod<SupportChaining::value>(
InvokeCallbackMethod<SupportChaining::value>(
mRejectFunction.ptr(),
&RejectFunction::operator(),
MaybeMove(aValue.RejectValue()));
MaybeMove(aValue.RejectValue()),
Move(mCompletionPromise));
}
// Destroy callbacks after invocation so that any references in closures are
@ -754,15 +751,6 @@ protected:
// which may or may not be ok.
mResolveFunction.reset();
mRejectFunction.reset();
MOZ_DIAGNOSTIC_ASSERT(
!mCompletionPromise || result,
"Can't do promise chaining for a non-promise-returning method.");
if (mCompletionPromise && result) {
result->ChainTo(mCompletionPromise.forget(),
"<chained completion promise>");
}
}
private:
@ -811,25 +799,17 @@ protected:
// classes with ::operator()), since it allows us to share code more easily.
// We could fix this if need be, though it's quite easy to work around by
// just capturing something.
RefPtr<MozPromise> result = InvokeCallbackMethod<SupportChaining::value>(
InvokeCallbackMethod<SupportChaining::value>(
mResolveRejectFunction.ptr(),
&ResolveRejectFunction::operator(),
MaybeMove(aValue));
MaybeMove(aValue),
Move(mCompletionPromise));
// Destroy callbacks after invocation so that any references in closures are
// released predictably on the dispatch thread. Otherwise, they would be
// released on whatever thread last drops its reference to the ThenValue,
// which may or may not be ok.
mResolveRejectFunction.reset();
MOZ_DIAGNOSTIC_ASSERT(
!mCompletionPromise || result,
"Can't do promise chaining for a non-promise-returning method.");
if (mCompletionPromise && result) {
result->ChainTo(mCompletionPromise.forget(),
"<chained completion promise>");
}
}
private: