From b174cb490f8cc227da3da9eb71cd0d810c07c1e6 Mon Sep 17 00:00:00 2001 From: "rpotts%netscape.com" Date: Fri, 24 Jul 1998 10:02:50 +0000 Subject: [PATCH] Added IStreamListener::OnStatus(...)... git-svn-id: svn://10.0.0.236/trunk@6389 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/nsImageNetContextAsync.cpp | 11 +++++- mozilla/htmlparser/robot/nsDebugRobot.cpp | 3 +- mozilla/htmlparser/src/nsParser.cpp | 22 +++++++++-- mozilla/htmlparser/src/nsParser.h | 3 +- .../layout/html/document/src/nsHTMLFrame.cpp | 18 +++++++-- mozilla/network/module/nsIStreamListener.h | 14 ++++--- mozilla/network/module/nsStubContext.cpp | 11 ++---- mozilla/network/module/tests/nettest.cpp | 24 +++++++----- .../parser/htmlparser/robot/nsDebugRobot.cpp | 3 +- mozilla/parser/htmlparser/src/nsParser.cpp | 22 +++++++++-- mozilla/parser/htmlparser/src/nsParser.h | 3 +- mozilla/uriloader/base/nsDocLoader.cpp | 30 ++++++++++++--- mozilla/webshell/src/nsDocLoader.cpp | 30 ++++++++++++--- .../webshell/tests/viewer/nsBrowserWindow.cpp | 38 ++++++++++--------- .../webshell/tests/viewer/nsBrowserWindow.h | 4 +- mozilla/webshell/tests/viewer/nsDocLoader.cpp | 14 ++++++- mozilla/webshell/tests/viewer/nsDocLoader.h | 4 +- 17 files changed, 182 insertions(+), 72 deletions(-) diff --git a/mozilla/gfx/src/nsImageNetContextAsync.cpp b/mozilla/gfx/src/nsImageNetContextAsync.cpp index c24a547b730..5a9405308c3 100644 --- a/mozilla/gfx/src/nsImageNetContextAsync.cpp +++ b/mozilla/gfx/src/nsImageNetContextAsync.cpp @@ -80,7 +80,8 @@ public: ImageConsumer(ilIURL *aURL, ImageNetContextImpl *aContext); NS_IMETHOD GetBindInfo(nsIURL* aURL); - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMsg); + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax); + NS_IMETHOD OnStatus(nsIURL* aURL, const nsString &aMsg); 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); @@ -126,7 +127,13 @@ ImageConsumer::GetBindInfo(nsIURL* aURL) } NS_IMETHODIMP -ImageConsumer::OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMsg) +ImageConsumer::OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax) +{ + return 0; +} + +NS_IMETHODIMP +ImageConsumer::OnStatus(nsIURL* aURL, const nsString& aMsg) { return 0; } diff --git a/mozilla/htmlparser/robot/nsDebugRobot.cpp b/mozilla/htmlparser/robot/nsDebugRobot.cpp index 3d593d7b376..687d9cfad0f 100644 --- a/mozilla/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/htmlparser/robot/nsDebugRobot.cpp @@ -124,7 +124,8 @@ public: NS_DECL_ISUPPORTS - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMsg) { return NS_OK; } + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax) { return NS_OK; } + NS_IMETHOD OnStatus(nsIURL* aURL, 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); }; diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp index 4324691effd..9e4b34516b5 100644 --- a/mozilla/htmlparser/src/nsParser.cpp +++ b/mozilla/htmlparser/src/nsParser.cpp @@ -676,12 +676,28 @@ nsresult nsParser::GetBindInfo(nsIURL* aURL){ * @return error code -- 0 if ok, non-zero if error. */ nsresult -nsParser::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString& aMsg) +nsParser::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax) { nsresult result=0; if (nsnull != mObserver) { - mObserver->OnProgress(aURL, aProgress, aProgressMax, aMsg); + mObserver->OnProgress(aURL, aProgress, aProgressMax); + } + return result; +} + +/** + * + * + * @update gess 5/12/98 + * @param + * @return error code -- 0 if ok, non-zero if error. + */ +nsresult +nsParser::OnStatus(nsIURL* aURL, const nsString &aMsg) +{ + nsresult result=0; + if (nsnull != mObserver) { + mObserver->OnStatus(aURL, aMsg); } return result; } diff --git a/mozilla/htmlparser/src/nsParser.h b/mozilla/htmlparser/src/nsParser.h index befcd2843d9..4c2056a6d3a 100644 --- a/mozilla/htmlparser/src/nsParser.h +++ b/mozilla/htmlparser/src/nsParser.h @@ -187,7 +187,8 @@ friend class CTokenHandler; // net lib to let us know about our inputstream. //********************************************* NS_IMETHOD GetBindInfo(nsIURL* aURL); - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMmsg); + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax); + NS_IMETHOD OnStatus(nsIURL* aURL, 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); diff --git a/mozilla/layout/html/document/src/nsHTMLFrame.cpp b/mozilla/layout/html/document/src/nsHTMLFrame.cpp index 5d0c7e3d475..21af1188285 100644 --- a/mozilla/layout/html/document/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/document/src/nsHTMLFrame.cpp @@ -64,9 +64,9 @@ public: NS_DECL_ISUPPORTS // nsIStreamObserver - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString& aMsg); NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType); + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax); + NS_IMETHOD OnStatus(nsIURL* aURL, const nsString& aMsg); NS_IMETHOD OnStopBinding(nsIURL* aURL, PRInt32 status, const nsString& aMsg); protected: @@ -767,13 +767,23 @@ TempObserver::QueryInterface(const nsIID& aIID, NS_IMETHODIMP -TempObserver::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString& aMsg) +TempObserver::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax) { #if 0 fputs("[progress ", stdout); fputs(mURL, stdout); printf(" %d %d ", aProgress, aProgressMax); + fputs("]\n", stdout); +#endif + return NS_OK; +} + +NS_IMETHODIMP +TempObserver::OnStatus(nsIURL* aURL, const nsString& aMsg) +{ +#if 0 + fputs("[status ", stdout); + fputs(mURL, stdout); fputs(aMsg, stdout); fputs("]\n", stdout); #endif diff --git a/mozilla/network/module/nsIStreamListener.h b/mozilla/network/module/nsIStreamListener.h index 76c19335e98..aa3e3840b21 100644 --- a/mozilla/network/module/nsIStreamListener.h +++ b/mozilla/network/module/nsIStreamListener.h @@ -37,7 +37,7 @@ class nsIURL; class nsIStreamObserver : public nsISupports { public: /** - * Notify the client that the URL has started to load. This method is + * Notify the observer that the URL has started to load. This method is * called only once, at the beginning of a URL load.

* * @return The return value is currently ignored. In the future it may be @@ -46,13 +46,17 @@ public: NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType) = 0; /** - * Notify the client that progress as occurred for the URL load.
+ * Notify the observer that progress as occurred for the URL load.
*/ - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString &aMsg) = 0; + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax) = 0; /** - * Notify the client that the URL has finished loading. This method is + * Notify the observer with a status message for the URL load.
+ */ + NS_IMETHOD OnStatus(nsIURL* aURL, const nsString &aMsg) = 0; + + /** + * Notify the observer that the URL has finished loading. This method is * called once when the networking library has finished processing the * URL transaction initiatied via the nsINetService::Open(...) call.

* diff --git a/mozilla/network/module/nsStubContext.cpp b/mozilla/network/module/nsStubContext.cpp index 679ba916ca0..bbc4ce0db8d 100644 --- a/mozilla/network/module/nsStubContext.cpp +++ b/mozilla/network/module/nsStubContext.cpp @@ -218,8 +218,7 @@ PRIVATE void stub_GraphProgressInit(MWContext *context, if (pListener = getStreamListener(URL_s)) { nsConnectionInfo *pConn = (nsConnectionInfo *) URL_s->fe_data; - nsAutoString status; - pListener->OnProgress(pConn->pURL, 0, content_length, status); + pListener->OnProgress(pConn->pURL, 0, content_length); pListener->Release(); } } @@ -238,9 +237,8 @@ PRIVATE void stub_GraphProgress(MWContext *context, if (pListener = getStreamListener(URL_s)) { nsConnectionInfo *pConn = (nsConnectionInfo *) URL_s->fe_data; - nsAutoString status; pListener->OnProgress(pConn->pURL, bytes_received, - content_length, status); + content_length); pListener->Release(); } } @@ -263,9 +261,8 @@ PRIVATE void stub_GraphProgressDestroy(MWContext *context, if (pListener = getStreamListener(URL_s)) { nsConnectionInfo *pConn = (nsConnectionInfo *) URL_s->fe_data; - nsAutoString status; pListener->OnProgress(pConn->pURL, total_bytes_read, - content_length, status); + content_length); } } @@ -277,7 +274,7 @@ PRIVATE void stub_Progress(MWContext *context, const char *msg) nsConnectionInfo *pConn = (nsConnectionInfo *) context->modular_data->fe_data; nsAutoString status(msg); - pListener->OnProgress(pConn->pURL, -1, -1, status); + pListener->OnStatus(pConn->pURL, status); pListener->Release(); } else { printf("%s\n", msg); diff --git a/mozilla/network/module/tests/nettest.cpp b/mozilla/network/module/tests/nettest.cpp index fd225867898..b143a30df31 100644 --- a/mozilla/network/module/tests/nettest.cpp +++ b/mozilla/network/module/tests/nettest.cpp @@ -55,7 +55,8 @@ public: TestConsumer(); NS_IMETHOD GetBindInfo(nsIURL* aURL); - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMsg); + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax); + NS_IMETHOD OnStatus(nsIURL* aURL, const nsString& aMsg); 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); @@ -93,16 +94,21 @@ NS_IMETHODIMP TestConsumer::GetBindInfo(nsIURL* aURL) } NS_IMETHODIMP TestConsumer::OnProgress(nsIURL* aURL, PRInt32 Progress, - PRInt32 ProgressMax, const nsString& aMsg) + PRInt32 ProgressMax) { if (bTraceEnabled) { - if (aMsg.Length()) { - printf("\n+++ TestConsumer::OnProgress: status "); - fputs(aMsg, stdout); - fputs("\n", stdout); - } else { - printf("\n+++ TestConsumer::OnProgress: URL: %p - %d of total %d\n", aURL, Progress, ProgressMax); - } + printf("\n+++ TestConsumer::OnProgress: URL: %p - %d of total %d\n", aURL, Progress, ProgressMax); + } + + return 0; +} + +NS_IMETHODIMP TestConsumer::OnStatus(nsIURL* aURL, const nsString& aMsg) +{ + if (bTraceEnabled) { + printf("\n+++ TestConsumer::OnStatus: "); + fputs(aMsg, stdout); + fputs("\n", stdout); } return 0; diff --git a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp index 3d593d7b376..687d9cfad0f 100644 --- a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp @@ -124,7 +124,8 @@ public: NS_DECL_ISUPPORTS - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMsg) { return NS_OK; } + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax) { return NS_OK; } + NS_IMETHOD OnStatus(nsIURL* aURL, 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); }; diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index 4324691effd..9e4b34516b5 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -676,12 +676,28 @@ nsresult nsParser::GetBindInfo(nsIURL* aURL){ * @return error code -- 0 if ok, non-zero if error. */ nsresult -nsParser::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString& aMsg) +nsParser::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax) { nsresult result=0; if (nsnull != mObserver) { - mObserver->OnProgress(aURL, aProgress, aProgressMax, aMsg); + mObserver->OnProgress(aURL, aProgress, aProgressMax); + } + return result; +} + +/** + * + * + * @update gess 5/12/98 + * @param + * @return error code -- 0 if ok, non-zero if error. + */ +nsresult +nsParser::OnStatus(nsIURL* aURL, const nsString &aMsg) +{ + nsresult result=0; + if (nsnull != mObserver) { + mObserver->OnStatus(aURL, aMsg); } return result; } diff --git a/mozilla/parser/htmlparser/src/nsParser.h b/mozilla/parser/htmlparser/src/nsParser.h index befcd2843d9..4c2056a6d3a 100644 --- a/mozilla/parser/htmlparser/src/nsParser.h +++ b/mozilla/parser/htmlparser/src/nsParser.h @@ -187,7 +187,8 @@ friend class CTokenHandler; // net lib to let us know about our inputstream. //********************************************* NS_IMETHOD GetBindInfo(nsIURL* aURL); - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax, const nsString& aMmsg); + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 Progress, PRInt32 ProgressMax); + NS_IMETHOD OnStatus(nsIURL* aURL, 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); diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 30b91df57d3..bb219ce75ac 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -83,8 +83,8 @@ public: /* nsIStreamListener interface methods... */ NS_IMETHOD GetBindInfo(nsIURL* aURL); - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString& aMsg); + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax); + NS_IMETHOD OnStatus(nsIURL* aURL, const nsString& aMsg); NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURL* aURL, nsIInputStream *aStream, PRInt32 aLength); NS_IMETHOD OnStopBinding(nsIURL* aURL, PRInt32 aStatus, const nsString& aMsg); @@ -704,20 +704,38 @@ NS_METHOD nsDocumentBindInfo::GetBindInfo(nsIURL* aURL) NS_METHOD nsDocumentBindInfo::OnProgress(nsIURL* aURL, PRInt32 aProgress, - PRInt32 aProgressMax, - const nsString& aMsg) + PRInt32 aProgressMax) { nsresult rv = NS_OK; /* Pass the notification out to the next stream listener... */ if (nsnull != m_NextStream) { - rv = m_NextStream->OnProgress(aURL, aProgress, aProgressMax, aMsg); + rv = m_NextStream->OnProgress(aURL, aProgress, aProgressMax); } /* Pass the notification out to the Observer... */ if (nsnull != m_Observer) { /* XXX: Should we ignore the return value? */ - (void) m_Observer->OnProgress(aURL, aProgress, aProgressMax, aMsg); + (void) m_Observer->OnProgress(aURL, aProgress, aProgressMax); + } + + return rv; +} + + +NS_METHOD nsDocumentBindInfo::OnStatus(nsIURL* aURL, const nsString& aMsg) +{ + nsresult rv = NS_OK; + + /* Pass the notification out to the next stream listener... */ + if (nsnull != m_NextStream) { + rv = m_NextStream->OnStatus(aURL, aMsg); + } + + /* Pass the notification out to the Observer... */ + if (nsnull != m_Observer) { + /* XXX: Should we ignore the return value? */ + (void) m_Observer->OnStatus(aURL, aMsg); } return rv; diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index 30b91df57d3..bb219ce75ac 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -83,8 +83,8 @@ public: /* nsIStreamListener interface methods... */ NS_IMETHOD GetBindInfo(nsIURL* aURL); - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString& aMsg); + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax); + NS_IMETHOD OnStatus(nsIURL* aURL, const nsString& aMsg); NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURL* aURL, nsIInputStream *aStream, PRInt32 aLength); NS_IMETHOD OnStopBinding(nsIURL* aURL, PRInt32 aStatus, const nsString& aMsg); @@ -704,20 +704,38 @@ NS_METHOD nsDocumentBindInfo::GetBindInfo(nsIURL* aURL) NS_METHOD nsDocumentBindInfo::OnProgress(nsIURL* aURL, PRInt32 aProgress, - PRInt32 aProgressMax, - const nsString& aMsg) + PRInt32 aProgressMax) { nsresult rv = NS_OK; /* Pass the notification out to the next stream listener... */ if (nsnull != m_NextStream) { - rv = m_NextStream->OnProgress(aURL, aProgress, aProgressMax, aMsg); + rv = m_NextStream->OnProgress(aURL, aProgress, aProgressMax); } /* Pass the notification out to the Observer... */ if (nsnull != m_Observer) { /* XXX: Should we ignore the return value? */ - (void) m_Observer->OnProgress(aURL, aProgress, aProgressMax, aMsg); + (void) m_Observer->OnProgress(aURL, aProgress, aProgressMax); + } + + return rv; +} + + +NS_METHOD nsDocumentBindInfo::OnStatus(nsIURL* aURL, const nsString& aMsg) +{ + nsresult rv = NS_OK; + + /* Pass the notification out to the next stream listener... */ + if (nsnull != m_NextStream) { + rv = m_NextStream->OnStatus(aURL, aMsg); + } + + /* Pass the notification out to the Observer... */ + if (nsnull != m_Observer) { + /* XXX: Should we ignore the return value? */ + (void) m_Observer->OnStatus(aURL, aMsg); } return rv; diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index 6348cb7835f..4e1822feb21 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -705,26 +705,30 @@ nsBrowserWindow::EndLoadURL(nsIWebShell* aShell, const nsString& aURL) NS_IMETHODIMP nsBrowserWindow::OnProgress(nsIURL* aURL, PRInt32 aProgress, - PRInt32 aProgressMax, - const nsString& aMsg) + PRInt32 aProgressMax) { if (mStatus) { - if (aMsg.Length() < 1) { - nsAutoString url; - if (nsnull != aURL) { - aURL->ToString(url); - } - url.Append(": progress "); - url.Append(aProgress, 10); - if (0 != aProgressMax) { - url.Append(" (out of "); - url.Append(aProgressMax, 10); - url.Append(")"); - } - mStatus->SetText(url); - } else { - mStatus->SetText(aMsg); + nsAutoString url; + if (nsnull != aURL) { + aURL->ToString(url); } + url.Append(": progress "); + url.Append(aProgress, 10); + if (0 != aProgressMax) { + url.Append(" (out of "); + url.Append(aProgressMax, 10); + url.Append(")"); + } + mStatus->SetText(url); + } + return NS_OK; +} + +NS_IMETHODIMP +nsBrowserWindow::OnStatus(nsIURL* aURL, const nsString& aMsg) +{ + if (mStatus) { + mStatus->SetText(aMsg); } return NS_OK; } diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.h b/mozilla/webshell/tests/viewer/nsBrowserWindow.h index e14eafcfa01..1cc81025621 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.h +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.h @@ -75,8 +75,8 @@ public: // nsIStreamObserver NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType); - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString& aMsg); + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax); + NS_IMETHOD OnStatus(nsIURL* aURL, const nsString& aMsg); NS_IMETHOD OnStopBinding(nsIURL* aURL, PRInt32 status, const nsString& aMsg); // nsIWebShellContainer diff --git a/mozilla/webshell/tests/viewer/nsDocLoader.cpp b/mozilla/webshell/tests/viewer/nsDocLoader.cpp index 50f365f51c2..d698928d9b7 100644 --- a/mozilla/webshell/tests/viewer/nsDocLoader.cpp +++ b/mozilla/webshell/tests/viewer/nsDocLoader.cpp @@ -316,8 +316,7 @@ nsDocLoader::OnStartBinding(nsIURL* aURL, const char *aContentType) } NS_IMETHODIMP -nsDocLoader::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString& aMsg) +nsDocLoader::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax) { nsString* url = (nsString*)mURLList->ElementAt(mDocNum); fputs(*url, stdout); @@ -329,6 +328,17 @@ nsDocLoader::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, return NS_OK; } +NS_IMETHODIMP +nsDocLoader::OnStatus(nsIURL* aURL, const nsString& aMsg) +{ + nsString* url = (nsString*)mURLList->ElementAt(mDocNum); + fputs(*url, stdout); + printf(": status "); + fputs(aMsg, stdout); + fputs("\n", stdout); + return NS_OK; +} + NS_IMETHODIMP nsDocLoader::OnStopBinding(nsIURL* aURL, PRInt32 status, const nsString& aMsg) { diff --git a/mozilla/webshell/tests/viewer/nsDocLoader.h b/mozilla/webshell/tests/viewer/nsDocLoader.h index 61211fb0c09..da67d01f03a 100644 --- a/mozilla/webshell/tests/viewer/nsDocLoader.h +++ b/mozilla/webshell/tests/viewer/nsDocLoader.h @@ -45,8 +45,8 @@ public: // nsIStreamObserver NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType); - NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax, - const nsString& aMsg); + NS_IMETHOD OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax); + NS_IMETHOD OnStatus(nsIURL* aURL, const nsString& aMsg); NS_IMETHOD OnStopBinding(nsIURL* aURL, PRInt32 status, const nsString& aMsg); // Add a URL to the doc loader