Rely on the docshell for the implementation of destroy.

git-svn-id: svn://10.0.0.236/trunk@64650 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tbogard%aol.net
2000-03-31 00:15:55 +00:00
parent aad71c84f5
commit 1ff1b067d3
2 changed files with 4 additions and 40 deletions

View File

@@ -3070,29 +3070,11 @@ NS_IMETHODIMP nsWebShell::Destroy()
rv = FireUnloadEvent();
}
// Stop any URLs that are currently being loaded...
Stop();
mDocLoader->Destroy();
nsDocShell::Destroy();
SetContainer(nsnull);
SetDocLoaderObserver(nsnull);
// Remove this docshell from its parent's child list
nsCOMPtr<nsIDocShellTreeNode> docShellParentAsNode(do_QueryInterface(mParent));
if (docShellParentAsNode) {
docShellParentAsNode->RemoveChild(this);
}
if (nsnull != mDocLoader) {
mDocLoader->SetContainer(nsnull);
}
mContentViewer = nsnull;
// Destroy our child web shells and release references to them
DestroyChildren();
return rv;
return NS_OK;
}
NS_IMETHODIMP nsWebShell::SetPositionAndSize(PRInt32 x, PRInt32 y, PRInt32 cx,