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

Bug 820067 - Check that mTiming is still around in case the beforeunload handler killed it. r=smaug,bz

Browse Source
This commit is contained in:
Benjamin Peterson 2012-12-10 15:34:01 -05:00
parent 489fed5530
commit 0b24745372
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docshell/base/nsDocShell.cpp
View File

@ -8982,8 +8982,8 @@ nsDocShell::InternalLoad(nsIURI * aURI,
if (!bIsJavascript) {
MaybeInitTiming();
}
bool timeBeforeUnload = mTiming && aFileName.IsVoid();
if (timeBeforeUnload) {
bool timeBeforeUnload = aFileName.IsVoid();
if (mTiming && timeBeforeUnload) {
mTiming->NotifyBeforeUnload();
}
// Check if the page doesn't want to be unloaded. The javascript:
@ -8999,7 +8999,7 @@ nsDocShell::InternalLoad(nsIURI * aURI,
}
}
if (timeBeforeUnload) {
if (mTiming && timeBeforeUnload) {
mTiming->NotifyUnloadAccepted(mCurrentURI);
}