Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-19 07:26:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1415541 - No need to destroy frames if Destroy was called on the shell. r=bz

Browse Source 
MozReview-Commit-ID: CgiFqeKHF3N
This commit is contained in:
Mats Palmgren 2017-11-16 18:58:29 +01:00
parent b7af3313b9
commit e6b1085aea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/xml/nsXMLPrettyPrinter.cpp
View File

@ -48,7 +48,7 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument,
*aDidPrettyPrint = false;
// Check for iframe with display:none. Such iframes don't have presshells
nsIPresShell* shell = aDocument->GetShell();
nsCOMPtr<nsIPresShell> shell = aDocument->GetShell();
if (!shell) {
return NS_OK;
}
@ -153,7 +153,8 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument,
GetSystemPrincipal(getter_AddRefs(sysPrincipal));
// Destroy any existing frames before we unbind anonymous content.
if (rootCont->IsElement()) {
// Note that the shell might be Destroy'ed by now (see bug 1415541).
if (!shell->IsDestroying() && rootCont->IsElement()) {
shell->DestroyFramesForAndRestyle(rootCont->AsElement());
}