Split nsIContentViewer::destroy into close and destroy so we can trigger teardown both at the beginning and at the end of paint suppression. Move the PresShell's teardown from its destructor into EndObservingDocument so it happens at the end of paint suppression. b=80203,89626 r=hyatt sr=waterson

git-svn-id: svn://10.0.0.236/trunk@99882 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/docshell/base/nsDocShell.cpp

@@ -2451,6 +2451,7 @@ nsDocShell::Destroy()
         docShellParentAsNode->RemoveChild(this);
 
     if (mContentViewer) {
+        mContentViewer->Close();
         mContentViewer->Destroy();
         mContentViewer = nsnull;
     }
@@ -4105,7 +4106,7 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
             }
         }
 
-        mContentViewer->Destroy();
+        mContentViewer->Close();
         aNewViewer->SetPreviousViewer(mContentViewer);
         mContentViewer = nsnull;
     }