corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1652849: Use NotifyWhenScriptSafe for some additional observers. r=nika

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D83845
This commit is contained in:
Kris Maglione
2020-07-16 20:44:51 +00:00
parent b244f0604c
commit b7c7968da8
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dom/base/nsFrameMessageManager.cpp
View File

@@ -810,13 +810,10 @@ void nsFrameMessageManager::SetCallback(MessageManagerCallback* aCallback) {
void nsFrameMessageManager::Close() {
if (!mClosed) {
nsContentUtils::AddScriptRunner(NS_NewRunnableFunction(
"nsFrameMessageManager::Close", [self = nsCOMPtr<nsISupports>(this)]() {
if (nsCOMPtr<nsIObserverService> obs =
mozilla::services::GetObserverService()) {
obs->NotifyObservers(self, "message-manager-close", nullptr);
}
}));
if (nsCOMPtr<nsIObserverService> obs =
mozilla::services::GetObserverService()) {
obs->NotifyWhenScriptSafe(this, "message-manager-close", nullptr);
}
}
mClosed = true;
mCallback = nullptr;
@@ -828,14 +825,10 @@ void nsFrameMessageManager::Disconnect(bool aRemoveFromParent) {
Close();
if (!mDisconnected) {
nsContentUtils::AddScriptRunner(NS_NewRunnableFunction(
"nsFrameMessageManager::Disconnect",
[self = nsCOMPtr<nsISupports>(this)]() {
if (nsCOMPtr<nsIObserverService> obs =
mozilla::services::GetObserverService()) {
obs->NotifyObservers(self, "message-manager-disconnect", nullptr);
}
}));
if (nsCOMPtr<nsIObserverService> obs =
mozilla::services::GetObserverService()) {
obs->NotifyWhenScriptSafe(this, "message-manager-disconnect", nullptr);
}
}
ClearParentManager(aRemoveFromParent);