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

Added nsIURL argument to the nsIStreamListener interface

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@5656 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
1998-07-15 22:38:01 +00:00
parent 34e87dc2dc
commit ced3fe0f75
18 changed files with 149 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/parser/htmlparser/robot/nsDebugRobot.cpp
View File

@@ -124,12 +124,12 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD OnProgress(PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMsg) { return NS_OK; }
NS_IMETHOD OnStartBinding(const char *aContentType) { return NS_OK; }
NS_IMETHOD OnStopBinding(PRInt32 status, const nsString& aMsg);
NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMsg) { return NS_OK; }
NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType) { return NS_OK; }
NS_IMETHOD OnStopBinding(nsIURL* aURL, PRInt32 status, const nsString& aMsg);
};
NS_IMETHODIMP CStreamListener::OnStopBinding(PRInt32 status, const nsString& aMsg)
NS_IMETHODIMP CStreamListener::OnStopBinding(nsIURL* aURL, PRInt32 status, const nsString& aMsg)
{
fputs("done.\n",stdout);
g_bReadyForNextUrl = PR_TRUE;

16
mozilla/parser/htmlparser/src/nsParser.cpp
View File

@@ -655,7 +655,7 @@ PRInt32 nsParser::CollectSkippedContent(nsCParserNode& aNode,PRInt32& aCount) {
* @param
* @return
*/
nsresult nsParser::GetBindInfo(void){
nsresult nsParser::GetBindInfo(nsIURL* aURL){
nsresult result=0;
return result;
}
@@ -668,12 +668,12 @@ nsresult nsParser::GetBindInfo(void){
* @return
*/
nsresult
nsParser::OnProgress(PRInt32 aProgress, PRInt32 aProgressMax,
nsParser::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax,
const nsString& aMsg)
{
nsresult result=0;
if (nsnull != mObserver) {
mObserver->OnProgress(aProgress, aProgressMax, aMsg);
mObserver->OnProgress(aURL, aProgress, aProgressMax, aMsg);
}
return result;
}
@@ -685,9 +685,9 @@ nsParser::OnProgress(PRInt32 aProgress, PRInt32 aProgressMax,
* @param
* @return
*/
nsresult nsParser::OnStartBinding(const char *aSourceType){
nsresult nsParser::OnStartBinding(nsIURL* aURL, const char *aSourceType){
if (nsnull != mObserver) {
mObserver->OnStartBinding(aSourceType);
mObserver->OnStartBinding(aURL, aSourceType);
}
mParserContext->mAutoDetectStatus=eUnknownDetect;
mParserContext->mDTD=0;
@@ -703,7 +703,7 @@ nsresult nsParser::OnStartBinding(const char *aSourceType){
* @param length is the number of bytes waiting input
* @return error code (usually 0)
*/
nsresult nsParser::OnDataAvailable(nsIInputStream *pIStream, PRInt32 length){
nsresult nsParser::OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRInt32 length){
/* if (nsnull != mListener) {
//Rick potts removed this.
//Does it need to be here?
@@ -747,10 +747,10 @@ nsresult nsParser::OnDataAvailable(nsIInputStream *pIStream, PRInt32 length){
* @param
* @return
*/
nsresult nsParser::OnStopBinding(PRInt32 status, const nsString& aMsg){
nsresult nsParser::OnStopBinding(nsIURL* aURL, PRInt32 status, const nsString& aMsg){
nsresult result=DidBuildModel(status);
if (nsnull != mObserver) {
mObserver->OnStopBinding(status, aMsg);
mObserver->OnStopBinding(aURL, status, aMsg);
}
return result;
}

10
mozilla/parser/htmlparser/src/nsParser.h
View File

@@ -205,11 +205,11 @@ friend class CTokenHandler;
// These methods are callback methods used by
// net lib to let us know about our inputstream.
//*********************************************
NS_IMETHOD GetBindInfo(void);
NS_IMETHOD OnProgress(PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMmsg);
NS_IMETHOD OnStartBinding(const char *aContentType);
NS_IMETHOD OnDataAvailable(nsIInputStream *pIStream, PRInt32 length);
NS_IMETHOD OnStopBinding(PRInt32 status, const nsString& aMsg);
NS_IMETHOD GetBindInfo(nsIURL* aURL);
NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMmsg);
NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType);
NS_IMETHOD OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRInt32 length);
NS_IMETHOD OnStopBinding(nsIURL* aURL, PRInt32 status, const nsString& aMsg);
protected: