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

Bug 1797688 - Part 5: Substitute gXPCOMThreadsShutDown with InOrBeyond(XPCOMShutdownThreads) in ProgressTracker::RemoveObserver. r=xpcom-reviewers,mccr8,tnikkel

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D160623
This commit is contained in:
Jens Stutte 2022-11-01 14:08:44 +00:00
parent 81a4773b22
commit c9e6f9840c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
image/ProgressTracker.cpp
View File

@ -13,6 +13,7 @@
#include "nsNetUtil.h"
#include "nsIObserverService.h"
#include "mozilla/AppShutdown.h"
#include "mozilla/Assertions.h"
#include "mozilla/Services.h"
@ -198,7 +199,8 @@ void ProgressTracker::Notify(IProgressObserver* aObserver) {
// unnecessarily delay onload.
if (mRunnable) {
mRunnable->AddObserver(aObserver);
} else {
} else if (!AppShutdown::IsInOrBeyond(ShutdownPhase::XPCOMShutdownThreads)) {
// Avoid dispatch if we are late in shutdown.
RefPtr<AsyncNotifyRunnable> ev = new AsyncNotifyRunnable(this, aObserver);
mRunnable = ProgressTracker::RenderBlockingRunnable::Create(ev.forget());
mEventTarget->Dispatch(mRunnable, NS_DISPATCH_NORMAL);
@ -253,9 +255,12 @@ void ProgressTracker::NotifyCurrentState(IProgressObserver* aObserver) {
aObserver->MarkPendingNotify();
nsCOMPtr<nsIRunnable> ev =
new AsyncNotifyCurrentStateRunnable(this, aObserver);
mEventTarget->Dispatch(ev.forget(), NS_DISPATCH_NORMAL);
// Avoid dispatch if we are late in shutdown.
if (!AppShutdown::IsInOrBeyond(ShutdownPhase::XPCOMShutdownThreads)) {
nsCOMPtr<nsIRunnable> ev =
new AsyncNotifyCurrentStateRunnable(this, aObserver);
mEventTarget->Dispatch(ev.forget(), NS_DISPATCH_NORMAL);
}
}
/**
@ -465,9 +470,9 @@ bool ProgressTracker::RemoveObserver(IProgressObserver* aObserver) {
MOZ_ASSERT(mObserversWithTargets > 0);
--mObserversWithTargets;
// If we've shutdown the main thread there's no need to update
// event targets.
if ((mObserversWithTargets == 0) && !gXPCOMThreadsShutDown) {
// If we're shutting down there's no need to update event targets.
if ((mObserversWithTargets == 0) &&
!AppShutdown::IsInOrBeyond(ShutdownPhase::XPCOMShutdownThreads)) {
MutexAutoLock lock(mMutex);
nsCOMPtr<nsIEventTarget> target(do_GetMainThread());
mEventTarget = WrapNotNull(target);