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

Bug 1325919 - Allow EventTargetFor to be used after last window has been destroyed (r=smaug)

Browse Source 
MozReview-Commit-ID: 7p9dnf8KzIx
This commit is contained in:
Bill McCloskey 2016-12-27 13:35:07 -08:00
parent bc6e0e2c1f
commit d41fa7c941
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/base/TabGroup.cpp
View File

@ -51,6 +51,7 @@ TabGroup::~TabGroup()
{
MOZ_ASSERT(mDocGroups.IsEmpty());
MOZ_ASSERT(mWindows.IsEmpty());
MOZ_RELEASE_ASSERT(mLastWindowLeft);
}
void
@ -149,6 +150,7 @@ TabGroup::Join(nsPIDOMWindowOuter* aWindow, TabGroup* aTabGroup)
if (!tabGroup) {
tabGroup = new TabGroup();
}
MOZ_RELEASE_ASSERT(!tabGroup->mLastWindowLeft);
MOZ_ASSERT(!tabGroup->mWindows.Contains(aWindow));
tabGroup->mWindows.AppendElement(aWindow);
return tabGroup.forget();
@ -258,7 +260,13 @@ TabGroup::EventTargetFor(TaskCategory aCategory) const
MOZ_RELEASE_ASSERT(mThrottledQueuesInitialized || this == sChromeTabGroup);
}
MOZ_RELEASE_ASSERT(!mLastWindowLeft);
if (NS_WARN_IF(mLastWindowLeft)) {
// Once we've disconnected everything, we still allow people to
// dispatch. We'll just go directly to the main thread.
nsCOMPtr<nsIEventTarget> main = do_GetMainThread();
return main;
}
return mEventTargets[size_t(aCategory)];
}