Reworked the nsIWebProgress interfaces and implementation...

git-svn-id: svn://10.0.0.236/trunk@72533 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
2000-06-19 05:54:37 +00:00
parent a5e58dbb84
commit 406f61beb3
30 changed files with 1207 additions and 1066 deletions

View File

@@ -377,46 +377,38 @@ NS_IMETHODIMP nsDocShellTreeOwner::SetTitle(const PRUnichar* aTitle)
// nsDocShellTreeOwner::nsIWebProgressListener
//*****************************************************************************
NS_IMETHODIMP nsDocShellTreeOwner::OnProgressChange(nsIChannel* aChannel,
PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress)
NS_IMETHODIMP
nsDocShellTreeOwner::OnProgressChange(nsIWebProgress* aProgress,
nsIRequest* aRequest,
PRInt32 aCurSelfProgress,
PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress,
PRInt32 aMaxTotalProgress)
{
if(!mOwnerProgressListener)
return NS_OK;
return mOwnerProgressListener->OnProgressChange(aChannel,
aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress,
aMaxTotalProgress);
return mOwnerProgressListener->OnProgressChange(aProgress,
aRequest,
aCurSelfProgress,
aMaxSelfProgress,
aCurTotalProgress,
aMaxTotalProgress);
}
NS_IMETHODIMP nsDocShellTreeOwner::OnChildProgressChange(nsIChannel* aChannel,
PRInt32 aCurChildProgress, PRInt32 aMaxChildProgress)
{
if(!mOwnerProgressListener)
return NS_OK;
return mOwnerProgressListener->OnChildProgressChange(aChannel,
aCurChildProgress, aMaxChildProgress);
}
NS_IMETHODIMP nsDocShellTreeOwner::OnStatusChange(nsIChannel* aChannel,
PRInt32 aProgressStatusFlags)
NS_IMETHODIMP
nsDocShellTreeOwner::OnStateChange(nsIWebProgress* aProgress,
nsIRequest* aRequest,
PRInt32 aProgressStateFlags,
nsresult aStatus)
{
if(!mOwnerProgressListener)
return NS_OK;
return mOwnerProgressListener->OnStatusChange(aChannel,
aProgressStatusFlags);
}
NS_IMETHODIMP nsDocShellTreeOwner::OnChildStatusChange(nsIChannel* aChannel,
PRInt32 aProgressStatusFlags)
{
if(!mOwnerProgressListener)
return NS_OK;
return mOwnerProgressListener->OnChildStatusChange(aChannel,
aProgressStatusFlags);
return mOwnerProgressListener->OnStateChange(aProgress,
aRequest,
aProgressStateFlags,
aStatus);
}
NS_IMETHODIMP nsDocShellTreeOwner::OnLocationChange(nsIURI* aURI)