mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 04:05:32 +00:00
Backout Bug 472260 (CLOSED TREE)
This commit is contained in:
parent
0b99da49f5
commit
f30c53458e
@ -215,11 +215,8 @@ nsFrameLoader::ReallyStartLoading()
|
||||
loadInfo->SetReferrer(referrer);
|
||||
|
||||
// Kick off the load...
|
||||
PRBool tmpState = mNeedsAsyncDestroy;
|
||||
mNeedsAsyncDestroy = PR_TRUE;
|
||||
rv = mDocShell->LoadURI(mURIToLoad, loadInfo,
|
||||
nsIWebNavigation::LOAD_FLAGS_NONE, PR_FALSE);
|
||||
mNeedsAsyncDestroy = tmpState;
|
||||
mURIToLoad = nsnull;
|
||||
#ifdef DEBUG
|
||||
if (NS_FAILED(rv)) {
|
||||
@ -750,7 +747,7 @@ nsFrameLoader::Destroy()
|
||||
win_private->SetFrameElementInternal(nsnull);
|
||||
}
|
||||
|
||||
if ((mNeedsAsyncDestroy || !doc ||
|
||||
if ((mInDestructor || !doc ||
|
||||
NS_FAILED(doc->FinalizeFrameLoader(this))) && mDocShell) {
|
||||
nsCOMPtr<nsIRunnable> event = new nsAsyncDocShellDestroyer(mDocShell);
|
||||
NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
|
||||
|
@ -60,12 +60,12 @@ public:
|
||||
mDepthTooGreat(PR_FALSE),
|
||||
mIsTopLevelContent(PR_FALSE),
|
||||
mDestroyCalled(PR_FALSE),
|
||||
mNeedsAsyncDestroy(PR_FALSE),
|
||||
mInDestructor(PR_FALSE),
|
||||
mInSwap(PR_FALSE)
|
||||
{}
|
||||
|
||||
~nsFrameLoader() {
|
||||
mNeedsAsyncDestroy = PR_TRUE;
|
||||
mInDestructor = PR_TRUE;
|
||||
nsFrameLoader::Destroy();
|
||||
}
|
||||
|
||||
@ -95,7 +95,7 @@ private:
|
||||
PRPackedBool mDepthTooGreat : 1;
|
||||
PRPackedBool mIsTopLevelContent : 1;
|
||||
PRPackedBool mDestroyCalled : 1;
|
||||
PRPackedBool mNeedsAsyncDestroy : 1;
|
||||
PRPackedBool mInDestructor : 1;
|
||||
PRPackedBool mInSwap : 1;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user