sr=rpotts. cookie/wallet r=morse, xmlTerm r=saravn@mozdev.org, mailnews r=mscott, activeX r=adamlock, everything else covered by the sr from rpotts. 15345. These changes remove nsIDocumentLoaderObserver.idl from the build, and all of it's implementations and registrations have been moved over to nsIWebProgressListener.idl and nsIWebProgress.idl respectively. there are two (78762, 78760) mailnews printing bugs that I overturned *before* landing this. I've run this code through the mail-news and browser smoketests among other tests outlined in the patch description attatched to the bug.
git-svn-id: svn://10.0.0.236/trunk@93943 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -632,27 +632,6 @@ nsDocShell::StopLoad()
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::GetDocLoaderObserver(nsIDocumentLoaderObserver *
|
||||
*aDocLoaderObserver)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aDocLoaderObserver);
|
||||
|
||||
*aDocLoaderObserver = mDocLoaderObserver;
|
||||
NS_IF_ADDREF(*aDocLoaderObserver);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::SetDocLoaderObserver(nsIDocumentLoaderObserver *
|
||||
aDocLoaderObserver)
|
||||
{
|
||||
// it's legal for aDocLoaderObserver to be null.
|
||||
mDocLoaderObserver = aDocLoaderObserver;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::GetPresContext(nsIPresContext ** aPresContext)
|
||||
{
|
||||
@@ -1870,8 +1849,6 @@ nsDocShell::Destroy()
|
||||
mDocLoader->SetContainer(nsnull);
|
||||
}
|
||||
|
||||
SetDocLoaderObserver(nsnull);
|
||||
|
||||
// Save the state of the current document, before destroying the window.
|
||||
// This is needed to capture the state of a frameset when the new document
|
||||
// causes the frameset to be destroyed...
|
||||
@@ -1900,7 +1877,6 @@ nsDocShell::Destroy()
|
||||
DestroyChildren();
|
||||
|
||||
mDocLoader = nsnull;
|
||||
mDocLoaderObserver = nsnull;
|
||||
mParentWidget = nsnull;
|
||||
mPrefs = nsnull;
|
||||
mCurrentURI = nsnull;
|
||||
|
||||
Reference in New Issue
Block a user