Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-13 01:55:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 535004: Check if we've fired an unload event before calling OnPageShow, in DocumentViewerImpl::LoadComplete. (Now without NS_ABORT_IF_FALSE, since other things can trigger it.) r=smaug

Browse Source
This commit is contained in:
Daniel Holbert 2009-12-26 15:11:04 -08:00
parent b1750841d1
commit 3cc25d9e5a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/base/nsDocumentViewer.cpp
View File

@ -1067,10 +1067,9 @@ DocumentViewerImpl::LoadComplete(nsresult aStatus)
window = mDocument->GetWindow();
if (window) {
nsIDocShell *docShell = window->GetDocShell();
PRBool beingDestroyed;
if (docShell &&
NS_SUCCEEDED(docShell->IsBeingDestroyed(&beingDestroyed)) &&
!beingDestroyed) {
PRBool isInUnload;
if (docShell && NS_SUCCEEDED(docShell->GetIsInUnload(&isInUnload)) &&
!isInUnload) {
mDocument->OnPageShow(restoring, nsnull);
}
}