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

bug #46856 (r=valeski, sr=darin). API Changes to nsIWebProgress/nsIWebProgressListener)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@121674 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
2002-05-16 20:57:37 +00:00
parent 031b1251a3
commit 07329cd38e
71 changed files with 796 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -1861,7 +1861,8 @@ nsDocShell::SetTreeOwner(nsIDocShellTreeOwner * aTreeOwner)
}
if (newListener) {
webProgress->AddProgressListener(newListener);
webProgress->AddProgressListener(newListener,
nsIWebProgress::NOTIFY_ALL);
}
}
}
@@ -3812,7 +3813,7 @@ nsDocShell::OnProgressChange(nsIWebProgress * aProgress,
NS_IMETHODIMP
nsDocShell::OnStateChange(nsIWebProgress * aProgress, nsIRequest * aRequest,
PRInt32 aStateFlags, nsresult aStatus)
PRUint32 aStateFlags, nsresult aStatus)
{
nsresult rv;
@@ -3865,14 +3866,11 @@ nsDocShell::OnStateChange(nsIWebProgress * aProgress, nsIRequest * aRequest,
mainWidget->SetCursor(eCursor_standard);
}
}
if ((~aStateFlags & (STATE_IS_DOCUMENT | STATE_STOP)) == 0) {
nsCOMPtr<nsIWebProgress> webProgress(do_QueryInterface(mLoadCookie));
// Is the document stop notification for this document?
if (aProgress == webProgress.get()) {
nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
EndPageLoad(aProgress, channel, aStatus);
}
}
@@ -3919,6 +3917,7 @@ NS_IMETHODIMP
nsDocShell::OnLocationChange(nsIWebProgress * aProgress,
nsIRequest * aRequest, nsIURI * aURI)
{
NS_NOTREACHED("notification excluded in AddProgressListener(...)");
return NS_OK;
}
@@ -3927,14 +3926,16 @@ nsDocShell::OnStatusChange(nsIWebProgress * aWebProgress,
nsIRequest * aRequest,
nsresult aStatus, const PRUnichar * aMessage)
{
NS_NOTREACHED("notification excluded in AddProgressListener(...)");
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::OnSecurityChange(nsIWebProgress * aWebProgress,
nsIRequest * aRequest, PRInt32 state)
nsIRequest * aRequest, PRUint32 state)
{
return NS_ERROR_NOT_IMPLEMENTED;
NS_NOTREACHED("notification excluded in AddProgressListener(...)");
return NS_OK;
}
@@ -6053,7 +6054,9 @@ nsDocShell::SetLoadCookie(nsISupports * aCookie)
nsCOMPtr<nsIWebProgress> webProgress(do_QueryInterface(mLoadCookie));
if (webProgress) {
webProgress->AddProgressListener(this);
webProgress->AddProgressListener(this,
nsIWebProgress::NOTIFY_STATE_DOCUMENT |
nsIWebProgress::NOTIFY_STATE_NETWORK);
}
nsCOMPtr<nsILoadGroup> loadGroup(do_GetInterface(mLoadCookie));