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

Bug 1588353 - Remove unnecessary Unused << for non-MOZ_MUST_USE function return value r=asuth

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D52131

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Perry Jiang 2019-11-07 19:29:59 +00:00
parent ed7cba1f5c
commit 5b6e37c114
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/workers/remoteworkers/RemoteWorkerChild.cpp
View File

@ -265,7 +265,6 @@ RemoteWorkerChild::RemoteWorkerChild(const RemoteWorkerData& aData)
RemoteWorkerChild::~RemoteWorkerChild() {
#ifdef DEBUG
MOZ_ASSERT(mTerminationPromise.IsEmpty());
auto lock = mState.Lock();
MOZ_ASSERT(lock->is<Terminated>());
#endif
@ -601,7 +600,7 @@ void RemoteWorkerChild::CreationSucceededOrFailedOnAnyThread(
Unused << self->SendCreated(didCreationSucceed);
});
Unused << GetOwningEventTarget()->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
GetOwningEventTarget()->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
}
void RemoteWorkerChild::CloseWorkerOnMainThread(State& aState) {
@ -769,7 +768,16 @@ void RemoteWorkerChild::TransitionStateToTerminated(State& aState) {
CancelAllPendingOps(aState);
}
mTerminationPromise.ResolveIfExists(true, __func__);
if (GetOwningEventTarget()->IsOnCurrentThread()) {
mTerminationPromise.ResolveIfExists(true, __func__);
} else {
SelfHolder self = this;
nsCOMPtr<nsIRunnable> r =
NS_NewRunnableFunction(__func__, [self = std::move(self)] {
self->mTerminationPromise.ResolveIfExists(true, __func__);
});
GetOwningEventTarget()->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
}
aState = VariantType<Terminated>();
}