Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 05:30:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #34321,34350 --> be sure to set the web progress listener on the doc loader

Browse Source 
before every load.
r=travis
This commit is contained in:
mscott%netscape.com 2000-04-03 22:41:26 +00:00
parent 5be529fbad
commit c075035b09
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
uriloader/base/nsDocLoader.cpp
View File

@ -653,6 +653,9 @@ void nsDocLoaderImpl::FireOnEndDocumentLoad(nsDocLoaderImpl* aLoadInitiator,
if (mParent) {
mParent->FireOnEndDocumentLoad(aLoadInitiator, aDocChannel, aStatus);
}
// now forget about our progress listener...
mProgressListener = nsnull;
}

22
uriloader/base/nsURILoader.cpp
View File

@ -681,22 +681,24 @@ nsresult nsURILoader::SetupLoadCookie(nsISupports * aWindowContext, nsISupports
nsLoadCookie * newLoadCookie = new nsLoadCookie();
if (newLoadCookie)
{
newLoadCookie->Init(loadCookie);
// bind the web progress listener (if there is one) to the web progress
// instance of the doc loader..
nsCOMPtr<nsIDocumentLoader> docLoader (do_GetInterface(loadCookie));
nsCOMPtr<nsIWebProgress> webProgress (do_QueryInterface(docLoader));
nsCOMPtr<nsIWebProgressListener> webProgressListener (do_GetInterface(aWindowContext));
if (webProgress && webProgressListener)
webProgress->AddProgressListener(webProgressListener);
newLoadCookie->Init(loadCookie);
rv = cntListener->SetLoadCookie (NS_STATIC_CAST(nsISupports *, (nsIInterfaceRequestor *) newLoadCookie));
newLoadCookie->QueryInterface(NS_GET_IID(nsISupports), getter_AddRefs(loadCookie));
} // if we created a new cookie
} // if we don't have a load cookie already
} // if we have a cntListener
// every time we do a load, we should reset the progress listener on it...
if (loadCookie)
{
// bind the web progress listener (if there is one) to the web progress
// instance of the doc loader..
nsCOMPtr<nsIDocumentLoader> docLoader (do_GetInterface(loadCookie));
nsCOMPtr<nsIWebProgress> webProgress (do_QueryInterface(docLoader));
nsCOMPtr<nsIWebProgressListener> webProgressListener (do_GetInterface(aWindowContext));
if (webProgress && webProgressListener)
webProgress->AddProgressListener(webProgressListener);
}
*aLoadCookie = loadCookie;
NS_IF_ADDREF(*aLoadCookie);