Backing out changes for 80203 and 89626 to fix blocker 92325 and probably also blocker 92443.

2001-07-26 20:53:21 +00:00
parent 5e9e00c988
commit 2badd618ea
10 changed files with 361 additions and 375 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -2451,7 +2451,6 @@ nsDocShell::Destroy()
        docShellParentAsNode->RemoveChild(this);

    if (mContentViewer) {
-        mContentViewer->Close();
        mContentViewer->Destroy();
        mContentViewer = nsnull;
    }
@@ -4107,7 +4106,7 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
            }
        }

-        mContentViewer->Close();
+        mContentViewer->Destroy();
        aNewViewer->SetPreviousViewer(mContentViewer);
        mContentViewer = nsnull;
    }