зеркало из https://github.com/mozilla/gecko-dev.git
bug #17500 (r=warren). Added code to fire an OnStopNotification to the parent load group if an active group is canceled.
This commit is contained in:
Родитель
937ef70dee
Коммит
ee19ba5eca
|
@ -343,6 +343,9 @@ nsLoadGroup::Cancel()
|
|||
rv = mObserver->OnStopRequest(mDefaultLoadChannel, nsnull,
|
||||
NS_BINDING_ABORTED, nsnull);
|
||||
}
|
||||
if (mParent) {
|
||||
mParent->SubGroupIsEmpty(NS_BINDING_ABORTED);
|
||||
}
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
@ -585,8 +588,6 @@ nsLoadGroup::RemoveChannel(nsIChannel *channel, nsISupports* ctxt,
|
|||
this, channel, uriStr, status));
|
||||
nsCRT::free(uriStr);
|
||||
#endif
|
||||
mIsActive = PR_FALSE;
|
||||
|
||||
if (mObserver) {
|
||||
PR_LOG(gLoadGroupLog, PR_LOG_DEBUG,
|
||||
("LOADGROUP: %x Firing OnStopRequest(...).\n",
|
||||
|
@ -596,6 +597,8 @@ nsLoadGroup::RemoveChannel(nsIChannel *channel, nsISupports* ctxt,
|
|||
}
|
||||
// return with rv, below
|
||||
}
|
||||
mIsActive = PR_FALSE;
|
||||
|
||||
if (mParent) {
|
||||
mParent->SubGroupIsEmpty(status);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче