Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix save/restore of form control contents when reloading (bug 294258). r=sicking, sr=bzbarsky.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@173534 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2005-05-18 03:52:33 +00:00
parent f7f11ce486
commit 7d8cc2fcc3
5 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -3392,7 +3392,7 @@ nsDocShell::Destroy()
docShellParentAsNode->RemoveChild(this);
if (mContentViewer) {
mContentViewer->Close();
mContentViewer->Close(nsnull);
mContentViewer->Destroy();
mContentViewer = nsnull;
}
@@ -5053,11 +5053,7 @@ nsDocShell::RestorePresentation(nsISHEntry *aSHEntry, PRBool aSavePresentation,
mFiredUnloadEvent = PR_FALSE;
if (mContentViewer) {
mContentViewer->Close();
if (aSavePresentation)
mContentViewer->SetHistoryEntry(mOSHE);
mContentViewer->Close(aSavePresentation ? mOSHE : nsnull);
mContentViewer->Destroy();
}
@@ -5572,15 +5568,11 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
}
}
mContentViewer->Close();
// Tell the old content viewer to hibernate in session history when
// it is destroyed.
mContentViewer->Close(mSavingOldViewer ? mOSHE : nsnull);
aNewViewer->SetPreviousViewer(mContentViewer);
if (mSavingOldViewer) {
// Tell the old content viewer to hibernate in session history when
// it is destroyed.
mContentViewer->SetHistoryEntry(mOSHE);
}
mContentViewer = nsnull;
}