Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1265795 P4 Always call nsDocument::SetScriptGlobalObject(nullptr) from nsDocument::Destroy(). r=bz

Browse Source 
Currently there are certain paths in nsDocumentViewer that can call
nsDocument::Destroy(), but fail to call SetScriptGlobalObject(nullptr).  This
results in the global never being cleared.

This patch refactors things so nsDocument::Destroy() always clears the global.
This ensures a more consistent document teardown since we don't rely on
external callers to get multiple method calls correct.
This commit is contained in:
Ben Kelly 2016-04-21 16:10:40 -07:00
parent d78f4aec16
commit 67cfa5a9ee
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/base/nsDocument.cpp
View File

@ -8943,6 +8943,7 @@ nsDocument::Destroy()
mIsGoingAway = true;
SetScriptGlobalObject(nullptr);
RemovedFromDocShell();
bool oldVal = mInUnlinkOrDeletion;

2
layout/base/nsDocumentViewer.cpp
View File

@ -1758,7 +1758,6 @@ nsDocumentViewer::SetDocumentInternal(nsIDocument* aDocument,
}
if (mDocument->IsStaticDocument()) {
mDocument->SetScriptGlobalObject(nullptr);
mDocument->Destroy();
}
@ -4306,7 +4305,6 @@ nsDocumentViewer::OnDonePrinting()
}
} else if (mClosingWhilePrinting) {
if (mDocument) {
mDocument->SetScriptGlobalObject(nullptr);
mDocument->Destroy();
mDocument = nullptr;
}