Unhook subframe containers / link handlers when putting a document into bfcache, and restore them when restoring the document (bug 314549). r+sr=bzbarsky.

git-svn-id: svn://10.0.0.236/trunk@184218 18797224-902f-48f8-a5cc-f745e15eee43
2005-11-06 19:23:03 +00:00
parent 1efb6f96a8
commit e4f1520c9e
4 changed files with 103 additions and 5 deletions
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -5426,7 +5426,7 @@ nsDocShell::RestoreFromHistory()
    mLSHE->SetWindowState(nsnull);

    // Reattach to the window object.
-    rv = mContentViewer->Open(windowState);
+    rv = mContentViewer->Open(windowState, mLSHE);

    // Now remove it from the cached presentation.
    mLSHE->SetContentViewer(nsnull);