Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #39381. The last channel in a document was not firing a request done notification - only a document done...

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@76994 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
2000-08-24 00:08:15 +00:00
parent 7d95d3d845
commit 9cb00c28be
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/uriloader/base/nsDocLoader.cpp
View File

@@ -534,17 +534,20 @@ nsDocLoaderImpl::OnStopRequest(nsIChannel *aChannel,
}
}
//
// Fire the OnStateChange(...) notification for stop request
//
doStopURLLoad(aChannel, aStatus);
FireOnEndURLLoad(this, aChannel, aStatus);
rv = mLoadGroup->GetActiveCount(&count);
if (NS_FAILED(rv)) return rv;
//
// The load group for this DocumentLoader is idle...
//
if (0 == count)
if (0 == count) {
DocLoaderIsEmpty(aStatus);
else {
doStopURLLoad(aChannel, aStatus);
FireOnEndURLLoad(this, aChannel, aStatus);
}
}
else {
@@ -569,16 +572,6 @@ nsresult nsDocLoaderImpl::RemoveChildGroup(nsDocLoaderImpl* aLoader)
void nsDocLoaderImpl::DocLoaderIsEmpty(nsresult aStatus)
{
#if 0
if (mParent) {
mParent->DocLoaderIsEmpty(aStatus);
//
// New code to break the circular reference between
// the load group and the docloader...
//
mLoadGroup->SetDefaultLoadChannel(nsnull);
}
#endif /* 0 */
if (mIsLoadingDocument) {
PRBool busy = PR_FALSE;
/* In the unimagineably rude circumstance that onload event handlers
@@ -705,7 +698,6 @@ void nsDocLoaderImpl::doStopDocumentLoad(nsIChannel* aChannel,
aChannel,
nsIWebProgressListener::flag_stop |
nsIWebProgressListener::flag_is_document |
nsIWebProgressListener::flag_is_request |
nsIWebProgressListener::flag_is_network,
aStatus);
}