From 8b1231e0aec3217955f6fc942add8c06f107f065 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Thu, 1 Jul 1999 19:30:20 +0000 Subject: [PATCH] Renamed OnStartBinding/OnStopBinding to OnStartRequest/OnStopRequest (removing the redundant ones from necko). Numerous necko fixes. Necko now using nsIPrompt interface instead of nsINetSupport. git-svn-id: svn://10.0.0.236/trunk@37754 18797224-902f-48f8-a5cc-f745e15eee43 --- .../html/document/src/nsImageDocument.cpp | 37 ++-- .../xml/document/src/nsXMLContentSink.cpp | 9 +- mozilla/docshell/base/nsWebShell.cpp | 165 +++++++++++++---- mozilla/editor/base/nsEditorShell.h | 1 + mozilla/editor/composer/src/nsEditorShell.h | 1 + mozilla/extensions/cookie/nsCookie.cpp | 2 +- mozilla/extensions/wallet/src/singsign.cpp | 121 ++++++++++++- mozilla/extensions/wallet/src/wallet.cpp | 90 +++++++++- mozilla/gfx/src/nsImageNetContextAsync.cpp | 20 +-- mozilla/htmlparser/robot/nsDebugRobot.cpp | 12 +- mozilla/htmlparser/src/nsParser.cpp | 32 +--- mozilla/htmlparser/src/nsParser.h | 6 +- .../htmlparser/tests/grabpage/grabpage.cpp | 8 +- mozilla/layout/base/src/nsPluginViewer.cpp | 26 ++- mozilla/layout/generic/nsFrameFrame.cpp | 18 +- .../layout/html/document/src/nsFrameFrame.cpp | 18 +- .../html/document/src/nsImageDocument.cpp | 37 ++-- .../html/forms/src/nsGfxTextControlFrame.cpp | 8 +- .../html/forms/src/nsGfxTextControlFrame.h | 10 +- .../xml/document/src/nsXMLContentSink.cpp | 9 +- .../base/src/nsCopyMessageStreamListener.cpp | 4 +- .../base/src/nsCopyMessageStreamListener.h | 4 +- mozilla/mailnews/base/util/nsMsgProtocol.cpp | 4 +- mozilla/mailnews/base/util/nsMsgProtocol.h | 4 +- mozilla/mailnews/compose/src/nsMsgPrompts.cpp | 16 ++ mozilla/mailnews/compose/src/nsMsgQuote.cpp | 4 +- .../mailnews/compose/src/nsSmtpProtocol.cpp | 4 +- mozilla/mailnews/compose/src/nsSmtpProtocol.h | 2 +- mozilla/mailnews/compose/src/nsURLFetcher.cpp | 8 +- mozilla/mailnews/compose/src/nsURLFetcher.h | 4 +- .../compose/tests/geturl/nsURLFetcher.cpp | 8 +- .../compose/tests/geturl/nsURLFetcher.h | 4 +- mozilla/mailnews/imap/src/nsImapProtocol.cpp | 4 +- mozilla/mailnews/imap/src/nsImapProtocol.h | 4 +- .../mailnews/local/src/nsMailboxProtocol.cpp | 16 +- .../mailnews/local/src/nsMailboxProtocol.h | 4 +- mozilla/mailnews/local/src/nsParseMailbox.cpp | 8 +- mozilla/mailnews/local/src/nsParseMailbox.h | 4 +- mozilla/mailnews/local/src/nsPop3Protocol.cpp | 4 +- mozilla/mailnews/local/src/nsPop3Sink.cpp | 2 +- .../local/tests/mailbox/mailboxTest.cpp | 10 +- .../tests/mailbox/nsMsgMailboxParserStub.cpp | 12 +- .../mailnews/mime/src/nsStreamConverter.cpp | 8 +- mozilla/mailnews/mime/src/nsStreamConverter.h | 4 +- .../mailnews/mime/tests/mimetest/mimetest.cpp | 4 +- mozilla/mailnews/news/src/nsNNTPProtocol.cpp | 12 +- mozilla/mailnews/news/src/nsNNTPProtocol.h | 2 +- mozilla/mailnews/news/src/nsNntpService.cpp | 4 + mozilla/modules/libpref/src/nsPref.cpp | 4 + .../plugin/base/src/nsPluginHostImpl.cpp | 65 ++++--- .../plugin/base/src/nsPluginViewer.cpp | 26 ++- .../plugin/nglsrc/nsPluginHostImpl.cpp | 65 ++++--- .../modules/plugin/nglsrc/nsPluginViewer.cpp | 26 ++- mozilla/netwerk/base/public/nsIChannel.idl | 4 +- mozilla/netwerk/base/public/nsIIOService.idl | 2 +- mozilla/netwerk/base/public/nsILoadGroup.idl | 23 +++ mozilla/netwerk/base/public/nsIPrompt.idl | 44 ++++- mozilla/netwerk/base/public/nsIRequest.idl | 7 + .../netwerk/base/public/nsIStreamObserver.idl | 15 +- mozilla/netwerk/base/public/nsIURI.idl | 36 +++- mozilla/netwerk/base/public/nsIURL.idl | 1 - mozilla/netwerk/base/src/Makefile.in | 1 + mozilla/netwerk/base/src/makefile.win | 1 + .../base/src/nsAsyncStreamListener.cpp | 138 --------------- mozilla/netwerk/base/src/nsFileTransport.cpp | 13 +- mozilla/netwerk/base/src/nsFileTransport.h | 1 + mozilla/netwerk/base/src/nsIOService.cpp | 22 ++- mozilla/netwerk/base/src/nsIOService.h | 2 +- mozilla/netwerk/base/src/nsLoadGroup.cpp | 167 +++++++++++++++++- mozilla/netwerk/base/src/nsLoadGroup.h | 41 ++++- .../netwerk/base/src/nsSocketTransport.cpp | 16 +- mozilla/netwerk/base/src/nsSocketTransport.h | 1 + mozilla/netwerk/base/src/nsStandardUrl.cpp | 9 +- mozilla/netwerk/base/src/nsStandardUrl.h | 5 +- .../netwerk/base/src/nsSyncStreamListener.cpp | 19 -- mozilla/netwerk/base/tests/urltest.cpp | 12 +- mozilla/netwerk/dns/src/nsDnsService.cpp | 1 + mozilla/netwerk/protocol/Makefile.in | 1 + .../protocol/file/src/nsFileChannel.cpp | 13 +- .../netwerk/protocol/file/src/nsFileChannel.h | 3 + .../netwerk/protocol/ftp/src/nsFTPChannel.cpp | 19 +- .../netwerk/protocol/ftp/src/nsFTPChannel.h | 9 +- .../ftp/src/nsFtpConnectionThread.cpp | 8 +- .../ftp/src/nsFtpStreamListenerEvent.cpp | 28 +-- .../ftp/src/nsFtpStreamListenerEvent.h | 12 +- .../protocol/http/src/nsHTTPChannel.cpp | 6 + .../netwerk/protocol/http/src/nsHTTPChannel.h | 1 + .../protocol/http/src/nsHTTPRequest.cpp | 22 +-- .../netwerk/protocol/http/src/nsHTTPRequest.h | 12 +- .../http/src/nsHTTPRequestObserver.cpp | 8 +- .../protocol/http/src/nsHTTPRequestObserver.h | 6 +- .../http/src/nsHTTPResponseListener.h | 10 +- mozilla/netwerk/protocol/makefile.win | 1 + mozilla/netwerk/test/TestFileInput.cpp | 18 +- mozilla/netwerk/test/TestProtocols.cpp | 19 +- mozilla/netwerk/test/TestSocketIO.cpp | 45 ++--- mozilla/netwerk/test/TestSocketInput.cpp | 22 +-- mozilla/netwerk/test/TestSocketTransport.cpp | 44 ++--- mozilla/netwerk/test/nettest.cpp | 12 +- mozilla/netwerk/util/public/nsNeckoUtil.h | 2 +- mozilla/netwerk/util/src/nsNeckoUtil.cpp | 10 +- .../netwerk/util/src/nsNetStreamLoader.cpp | 20 +-- mozilla/network/module/nsNetService.cpp | 2 +- mozilla/network/module/nsNetStreamLoader.cpp | 8 +- mozilla/network/module/nsNetThread.cpp | 50 +++--- mozilla/network/module/nsSocketTransport.cpp | 6 +- mozilla/network/module/nsSocketTransport.h | 4 +- mozilla/network/module/nsStubContext.cpp | 14 +- mozilla/network/module/tests/nettest.cpp | 12 +- .../network/module/tests/transportTest.cpp | 12 +- mozilla/network/public/nsIStreamObserver.h | 6 +- .../parser/htmlparser/robot/nsDebugRobot.cpp | 12 +- mozilla/parser/htmlparser/src/nsParser.cpp | 32 +--- mozilla/parser/htmlparser/src/nsParser.h | 6 +- .../htmlparser/tests/grabpage/grabpage.cpp | 8 +- mozilla/profile/src/nsProfile.cpp | 4 + mozilla/rdf/base/src/nsRDFXMLDataSource.cpp | 4 +- .../rdf/datasource/src/nsFTPDataSource.cpp | 18 +- .../rdf/datasource/src/nsSearchDataSource.cpp | 22 ++- mozilla/silentdl/nsSilentDownload.cpp | 4 +- mozilla/silentdl/nsSilentDownloadPrivate.h | 4 +- mozilla/uriloader/base/nsDocLoader.cpp | 79 ++++----- .../embed/ActiveX/WebShellContainer.cpp | 8 +- .../embed/ActiveX/WebShellContainer.h | 4 +- .../embed/gtk/lib/GtkMozillaContainer.cpp | 6 +- mozilla/webshell/public/nsIDocumentLoader.h | 4 +- mozilla/webshell/public/nsIWebShell.h | 6 +- mozilla/webshell/src/nsDocLoader.cpp | 79 ++++----- mozilla/webshell/src/nsWebShell.cpp | 165 +++++++++++++---- .../webshell/tests/viewer/nsBrowserWindow.cpp | 9 +- .../webshell/tests/viewer/nsBrowserWindow.h | 10 +- .../webshell/tests/viewer/nsXPBaseWindow.cpp | 12 +- .../webshell/tests/viewer/nsXPBaseWindow.h | 13 +- .../AppCores/public/nsIDOMBrowserAppCore.h | 16 +- .../xpfe/AppCores/src/nsBrowserAppCore.cpp | 88 ++++++++- mozilla/xpfe/AppCores/src/nsBrowserAppCore.h | 18 +- .../public/nsINetSupportDialogService.h | 45 +++-- .../xpfe/appshell/public/nsISessionHistory.h | 6 +- mozilla/xpfe/appshell/src/nsDefaultHelper.cpp | 22 ++- .../xpfe/appshell/src/nsNetSupportDialog.cpp | 113 +++++++++--- .../xpfe/appshell/src/nsNetSupportDialog.h | 50 ++++-- .../xpfe/appshell/src/nsSessionHistory.cpp | 4 +- .../related/src/nsRelatedLinksHandler.cpp | 19 +- .../xfer/src/nsDownloadProgressDialog.cpp | 8 +- .../xfer/src/nsDownloadProgressDialog.h | 10 +- mozilla/xpinstall/src/nsXPInstallManager.cpp | 8 +- mozilla/xpinstall/src/nsXPInstallManager.h | 11 +- 147 files changed, 1781 insertions(+), 1176 deletions(-) diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 76c9fbb16a9..1392268d38a 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -31,6 +31,9 @@ #include "nsIPresShell.h" #include "nsIPresContext.h" #include "nsIViewManager.h" +#ifdef NECKO +#include "nsIChannel.h" +#endif // XXX TODO: @@ -79,17 +82,15 @@ public: NS_DECL_ISUPPORTS #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream, @@ -117,15 +118,23 @@ NS_IMPL_ISUPPORTS(ImageListener, kIStreamListenerIID) NS_IMETHODIMP #ifdef NECKO -ImageListener::OnStartBinding(nsISupports *ctxt) +ImageListener::OnStartRequest(nsISupports *ctxt) #else -ImageListener::OnStartBinding(nsIURI* aURL, const char *aContentType) +ImageListener::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { #ifdef NECKO + nsresult rv; + nsIChannel* channel; + rv = ctxt->QueryInterface(nsIChannel::GetIID(), (void**)&channel); + if (NS_FAILED(rv)) return rv; nsIURI* uri; + rv = channel->GetURI(&uri); + if (NS_FAILED(rv)) return rv; mDocument->StartImageLoad(uri, mNextStream); + NS_RELEASE(uri); + NS_RELEASE(channel); #else mDocument->StartImageLoad(aURL, mNextStream); #endif @@ -133,9 +142,9 @@ ImageListener::OnStartBinding(nsIURI* aURL, const char *aContentType) return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStartBinding(ctxt); + return mNextStream->OnStartRequest(ctxt); #else - return mNextStream->OnStartBinding(aURL, aContentType); + return mNextStream->OnStartRequest(aURL, aContentType); #endif } @@ -162,10 +171,10 @@ ImageListener::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -ImageListener::OnStopBinding(nsISupports *ctxt, nsresult status, +ImageListener::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -ImageListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, +ImageListener::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { @@ -173,9 +182,9 @@ ImageListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStopBinding(ctxt, status, errorMsg); + return mNextStream->OnStopRequest(ctxt, status, errorMsg); #else - return mNextStream->OnStopBinding(aURL, aStatus, aMsg); + return mNextStream->OnStopRequest(aURL, aStatus, aMsg); #endif } diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index f4d6c53c199..54633aeeef0 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -1299,6 +1299,7 @@ nsXMLContentSink::ProcessCSSStyleLink(nsIContent* aElement, if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { nsIURI* url = nsnull; #ifdef NECKO // XXX we need to get passed in the nsILoadGroup here! +// nsILoadGroup* group = mDocument->GetDocumentLoadGroup(); result = NS_NewURI(&url, aHref, mDocumentBaseURL/*, group*/); #else nsILoadGroup* LoadGroup = nsnull; @@ -1842,11 +1843,11 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode) // Use the SRC attribute value to load the URL nsIURI* url = nsnull; nsAutoString absURL; - nsIURI* docURL = mDocument->GetDocumentURL(); -#ifdef NECKO - // XXX we need to be passed the nsILoadGroup here +#ifdef NECKO // XXX we need to get passed in the nsILoadGroup here! +// nsILoadGroup* group = mDocument->GetDocumentLoadGroup(); rv = NS_NewURI(&url, absURL/*, group*/); #else + nsIURI* docURL = mDocument->GetDocumentURL(); nsILoadGroup* group = nsnull; rv = docURL->GetLoadGroup(&group); if ((NS_OK == rv) && group) { @@ -1856,8 +1857,8 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode) else { rv = NS_NewURL(&url, absURL); } -#endif NS_RELEASE(docURL); +#endif if (NS_OK != rv) { return rv; } diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 58fde3d4957..314fc15552f 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -24,7 +24,9 @@ #include "nsIDeviceContext.h" #include "nsILinkHandler.h" #include "nsIStreamListener.h" -#ifndef NECKO +#ifdef NECKO +#include "nsIPrompt.h" +#else #include "nsINetSupport.h" #include "nsIRefreshUrl.h" #endif @@ -133,7 +135,9 @@ class nsWebShell : public nsIWebShell, public nsILinkHandler, public nsIScriptContextOwner, public nsIDocumentLoaderObserver, -#ifndef NECKO +#ifdef NECKO + public nsIPrompt, +#else public nsIRefreshUrl, public nsINetSupport, #endif @@ -216,7 +220,7 @@ public: nsIPostData* aPostData=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif @@ -226,7 +230,7 @@ public: nsIPostData* aPostData=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif @@ -234,7 +238,7 @@ public: NS_IMETHOD Stop(void); #ifdef NECKO - NS_IMETHOD Reload(PRUint32 aType); + NS_IMETHOD Reload(nsLoadFlags aType); #else NS_IMETHOD Reload(nsURLReloadType aType); #endif @@ -352,13 +356,21 @@ public: #if 0 // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); #endif /* 0 */ - +#ifdef NECKO + // nsIPrompt + NS_IMETHOD Alert(const PRUnichar *text); + NS_IMETHOD Confirm(const PRUnichar *text, PRBool *_retval); + NS_IMETHOD ConfirmCheck(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); + NS_IMETHOD Prompt(const PRUnichar *text, const PRUnichar *defaultText, PRUnichar **result, PRBool *_retval); + NS_IMETHOD PromptUsernameAndPassword(const PRUnichar *text, PRUnichar **user, PRUnichar **pwd, PRBool *_retval); + NS_IMETHOD PromptPassword(const PRUnichar *text, PRUnichar **pwd, PRBool *_retval); +#else // nsINetSupport interface methods NS_IMETHOD_(void) Alert(const nsString &aText); NS_IMETHOD_(PRBool) Confirm(const nsString &aText); @@ -370,6 +382,7 @@ public: nsString &aPassword); NS_IMETHOD_(PRBool) PromptPassword(const nsString &aText, nsString &aPassword); +#endif // nsIClipboardCommands NS_IMETHOD CanCutSelection (PRBool* aResult); @@ -437,7 +450,9 @@ protected: nsIWidget* mWindow; nsIDocumentLoader* mDocLoader; nsIDocumentLoaderObserver* mDocLoaderObserver; -#ifndef NECKO +#ifdef NECKO + nsIPrompt* mPrompter; +#else nsINetSupport* mNetSupport; #endif @@ -475,7 +490,7 @@ protected: const char* aCommand, nsIPostData* aPostData, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -617,6 +632,11 @@ nsWebShell::nsWebShell() mHintCharsetSource = kCharsetUninitialized; mForceCharacterSet = ""; mHistoryService = nsnull; +#ifdef NECKO + mPrompter = nsnull; +#else + mNetSupport = nsnull; +#endif } nsWebShell::~nsWebShell() @@ -646,7 +666,9 @@ nsWebShell::~nsWebShell() NS_IF_RELEASE(mPrefs); NS_IF_RELEASE(mContainer); NS_IF_RELEASE(mObserver); -#ifndef NECKO +#ifdef NECKO + NS_IF_RELEASE(mPrompter); +#else NS_IF_RELEASE(mNetSupport); #endif @@ -787,6 +809,14 @@ nsWebShell::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_ADDREF_THIS(); return NS_OK; } +#endif +#ifdef NECKO + if (aIID.Equals(nsIPrompt::GetIID())) { + *aInstancePtr = (void*) ((nsIPrompt*)this); + NS_ADDREF_THIS(); + return NS_OK; + } +#else if (aIID.Equals(kINetSupportIID)) { *aInstancePtr = (void*) ((nsINetSupport*)this); NS_ADDREF_THIS(); @@ -1243,13 +1273,17 @@ NS_IMETHODIMP nsWebShell::SetObserver(nsIStreamObserver* anObserver) { NS_IF_RELEASE(mObserver); -#ifndef NECKO +#ifdef NECKO + NS_IF_RELEASE(mPrompter); +#else NS_IF_RELEASE(mNetSupport); #endif mObserver = anObserver; if (nsnull != mObserver) { -#ifndef NECKO +#ifdef NECKO + mObserver->QueryInterface(nsIPrompt::GetIID(), (void**)&mPrompter); +#else mObserver->QueryInterface(kINetSupportIID, (void **) &mNetSupport); #endif NS_ADDREF(mObserver); @@ -1700,7 +1734,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, nsIPostData* aPostData, PRBool aModifyHistory, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -1718,7 +1752,7 @@ nsWebShell::DoLoadURL(const nsString& aUrlSpec, const char* aCommand, nsIPostData* aPostData, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -1833,7 +1867,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, nsIPostData* aPostData, PRBool aModifyHistory, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -1966,7 +2000,7 @@ NS_IMETHODIMP nsWebShell::Stop(void) } #ifdef NECKO -NS_IMETHODIMP nsWebShell::Reload(PRUint32 aType) +NS_IMETHODIMP nsWebShell::Reload(nsLoadFlags aType) #else NS_IMETHODIMP nsWebShell::Reload(nsURLReloadType aType) #endif @@ -3160,12 +3194,12 @@ nsresult nsWebShell::CheckForTrailingSlash(nsIURI* aURL) #if 0 NS_IMETHODIMP -nsWebShell::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsWebShell::OnStartRequest(nsIURI* aURL, const char *aContentType) { nsresult rv = NS_OK; if (nsnull != mObserver) { - rv = mObserver->OnStartBinding(aURL, aContentType); + rv = mObserver->OnStartRequest(aURL, aContentType); } return rv; } @@ -3216,12 +3250,12 @@ nsWebShell::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP -nsWebShell::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +nsWebShell::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { nsresult rv = NS_OK; if (nsnull != mObserver) { - rv = mObserver->OnStopBinding(aURL, aStatus, aMsg); + rv = mObserver->OnStopRequest(aURL, aStatus, aMsg); } return rv; } @@ -3230,11 +3264,18 @@ nsWebShell::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) //---------------------------------------------------------------------- +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::Alert(const PRUnichar *text) +#else NS_IMETHODIMP_(void) nsWebShell::Alert(const nsString &aText) +#endif { #ifdef NECKO - NS_ASSERTION(0, "help"); + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->Alert(text); #else if (nsnull != mNetSupport) { mNetSupport->Alert(aText); @@ -3242,69 +3283,117 @@ nsWebShell::Alert(const nsString &aText) #endif } +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::Confirm(const PRUnichar *text, + PRBool *result) +#else NS_IMETHODIMP_(PRBool) nsWebShell::Confirm(const nsString &aText) +#endif { +#ifdef NECKO + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->Confirm(text, result); +#else PRBool bResult = PR_FALSE; -#ifdef NECKO - NS_ASSERTION(0, "help"); -#else if (nsnull != mNetSupport) { bResult = mNetSupport->Confirm(aText); } -#endif return bResult; +#endif } +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::ConfirmCheck(const PRUnichar *text, + const PRUnichar *checkMsg, + PRBool *checkValue, + PRBool *result) +{ + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->ConfirmCheck(text, checkMsg, checkValue, result); +} +#endif + +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::Prompt(const PRUnichar *text, + const PRUnichar *defaultText, + PRUnichar **result, + PRBool *_retval) +#else NS_IMETHODIMP_(PRBool) nsWebShell::Prompt(const nsString &aText, const nsString &aDefault, nsString &aResult) +#endif { - PRBool bResult = PR_FALSE; - #ifdef NECKO - NS_ASSERTION(0, "help"); + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->Prompt(text, defaultText, result, _retval); #else + PRBool bResult = PR_FALSE; if (nsnull != mNetSupport) { bResult = mNetSupport->Prompt(aText, aDefault, aResult); } -#endif return bResult; +#endif } +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::PromptUsernameAndPassword(const PRUnichar *text, + PRUnichar **user, + PRUnichar **pwd, + PRBool *_retval) +#else NS_IMETHODIMP_(PRBool) nsWebShell::PromptUserAndPassword(const nsString &aText, nsString &aUser, nsString &aPassword) +#endif { - PRBool bResult = PR_FALSE; - #ifdef NECKO - NS_ASSERTION(0, "help"); + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->PromptUsernameAndPassword(text, user, pwd, _retval); #else + PRBool bResult = PR_FALSE; if (nsnull != mNetSupport) { bResult = mNetSupport->PromptUserAndPassword(aText, aUser, aPassword); } -#endif return bResult; +#endif } +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::PromptPassword(const PRUnichar *text, + PRUnichar **pwd, + PRBool *_retval) +#else NS_IMETHODIMP_(PRBool) nsWebShell::PromptPassword(const nsString &aText, nsString &aPassword) +#endif { +#ifdef NECKO + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->PromptPassword(text, pwd, _retval); +#else PRBool bResult = PR_FALSE; -#ifdef NECKO - NS_ASSERTION(0, "help"); -#else if (nsnull != mNetSupport) { bResult = mNetSupport->PromptPassword(aText, aPassword); } -#endif return bResult; +#endif } //---------------------------------------------------- diff --git a/mozilla/editor/base/nsEditorShell.h b/mozilla/editor/base/nsEditorShell.h index 9401c904d22..1d44439cad7 100644 --- a/mozilla/editor/base/nsEditorShell.h +++ b/mozilla/editor/base/nsEditorShell.h @@ -28,6 +28,7 @@ #include "nsIEditorShell.h" #include "nsIDocumentLoaderObserver.h" #ifdef NECKO +#include "nsIPrompt.h" #else #include "nsINetSupport.h" #endif diff --git a/mozilla/editor/composer/src/nsEditorShell.h b/mozilla/editor/composer/src/nsEditorShell.h index 9401c904d22..1d44439cad7 100644 --- a/mozilla/editor/composer/src/nsEditorShell.h +++ b/mozilla/editor/composer/src/nsEditorShell.h @@ -28,6 +28,7 @@ #include "nsIEditorShell.h" #include "nsIDocumentLoaderObserver.h" #ifdef NECKO +#include "nsIPrompt.h" #else #include "nsINetSupport.h" #endif diff --git a/mozilla/extensions/cookie/nsCookie.cpp b/mozilla/extensions/cookie/nsCookie.cpp index f01d11fc076..582694b6d11 100644 --- a/mozilla/extensions/cookie/nsCookie.cpp +++ b/mozilla/extensions/cookie/nsCookie.cpp @@ -147,9 +147,9 @@ static int cookie_lock_count = 0; PRIVATE char* cookie_Localize(char* genericString) { +#ifdef newI18NFinished nsresult ret; nsAutoString v(""); -#ifdef newI18NFinished /* create a URL for the string resource file *//* nsINetService* pNetService = nsnull; ret = nsServiceManager::GetService(kNetServiceCID, kINetServiceIID, diff --git a/mozilla/extensions/wallet/src/singsign.cpp b/mozilla/extensions/wallet/src/singsign.cpp index 71d3b69cf69..3865ac83026 100644 --- a/mozilla/extensions/wallet/src/singsign.cpp +++ b/mozilla/extensions/wallet/src/singsign.cpp @@ -172,8 +172,34 @@ SI_GetBoolPref(const char * prefname, PRBool defaultvalue) { } PRBool -si_PromptUsernameAndPassword - (char *szMessage, char **szUsername, char **szPassword) { +si_PromptUsernameAndPassword(char *szMessage, char **szUsername, char **szPassword) +{ +#ifdef NECKO + nsString username; + nsString password; + PRBool retval; + + nsresult res; + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res); + if (NS_FAILED(res)) { + return NULL; /* failure value */ + } + + const nsString message = szMessage; + PRUnichar* usr; + PRUnichar* pwd; + res = dialog->PromptUsernameAndPassword(message.GetUnicode(), &usr, &pwd, &retval); + if (NS_FAILED(res)) { + return NULL; /* failure value */ + } + username = usr; + delete[] usr; + password = pwd; + delete[] pwd; + *szUsername = username.ToNewCString(); + *szPassword = password.ToNewCString(); + return retval; +#else nsString username; nsString password; PRBool retval; @@ -191,10 +217,37 @@ si_PromptUsernameAndPassword *szUsername = username.ToNewCString(); *szPassword = password.ToNewCString(); return retval; +#endif } char* -si_PromptPassword (char *szMessage) { +si_PromptPassword(char *szMessage) +{ +#ifdef NECKO + nsString password; + PRBool retval; + + nsresult res; + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res); + if (NS_FAILED(res)) { + return NULL; /* failure value */ + } + + const nsString message = szMessage; + PRUnichar* pwd; + res = dialog->PromptPassword(message.GetUnicode(), &pwd, &retval); + if (NS_FAILED(res)) { + return NULL; /* failure value */ + } + password = pwd; + delete[] pwd; + + if (retval) { + return password.ToNewCString(); + } else { + return NULL; /* user pressed cancel */ + } +#else nsString password; PRBool retval; nsINetSupportDialogService* dialog = NULL; @@ -213,10 +266,39 @@ si_PromptPassword (char *szMessage) { } else { return NULL; /* user pressed cancel */ } +#endif } char* -si_Prompt(char *szMessage, char* szDefaultUsername) { +si_Prompt(char *szMessage, char* szDefaultUsername) +{ +#ifdef NECKO + nsString defaultUsername = szDefaultUsername; + nsString username; + PRBool retval; + + nsresult res; + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res); + if (NS_FAILED(res)) { + return NULL; /* failure value */ + } + + const nsString message = szMessage; + PRUnichar* usr; + res = dialog->Prompt(message.GetUnicode(), defaultUsername.GetUnicode(), + &usr, &retval); + if (NS_FAILED(res)) { + return NULL; /* failure value */ + } + username = usr; + delete[] usr; + + if (retval) { + return username.ToNewCString(); + } else { + return NULL; /* user pressed cancel */ + } +#else nsString defaultUsername = szDefaultUsername; nsString username; PRBool retval; @@ -236,12 +318,38 @@ si_Prompt(char *szMessage, char* szDefaultUsername) { } else { return NULL; /* user pressed cancel */ } +#endif } PRBool -si_SelectDialog - (const char* szMessage, char** pList, int16* pCount) +si_SelectDialog(const char* szMessage, char** pList, int16* pCount) { +#ifdef NECKO + PRBool retval = PR_TRUE; /* default value */ + + nsresult res; + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res); + if (NS_FAILED(res)) { + return NULL; /* failure value */ + } + + const nsString message = szMessage; +#ifdef xxx + dialog->Select(message, pList, pCount, &retval); +#else + for (int i=0; i<*pCount; i++) { + nsString msg = "user = "; + msg += pList[i]; + msg += "?"; + res = dialog->Confirm(msg.GetUnicode(), &retval); + if (NS_SUCCEEDED(res) && retval) { + *pCount = i; + break; + } + } +#endif + return retval; +#else PRBool retval = PR_TRUE; /* default value */ nsINetSupportDialogService* dialog = NULL; nsresult res = nsServiceManager::GetService(kNetSupportDialogCID, @@ -268,6 +376,7 @@ si_SelectDialog } nsServiceManager::ReleaseService(kNetSupportDialogCID, dialog); return retval; +#endif } /* diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp index b258b3d6cd7..38c4709f0d5 100644 --- a/mozilla/extensions/wallet/src/wallet.cpp +++ b/mozilla/extensions/wallet/src/wallet.cpp @@ -420,7 +420,25 @@ Wallet_Localize(char* genericString) { /**********************/ PUBLIC PRBool -Wallet_Confirm(char * szMessage) { +Wallet_Confirm(char * szMessage) +{ +#ifdef NECKO + PRBool retval = PR_TRUE; /* default value */ + + nsresult res; + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res); + if (NS_FAILED(res)) { + return retval; + } + + const nsString message = szMessage; + res = dialog->Confirm(message.GetUnicode(), &retval); + if (NS_FAILED(res)) { + return retval; + } + + return retval; +#else PRBool retval = PR_TRUE; /* default value */ nsINetSupportDialogService* dialog = NULL; nsresult res = nsServiceManager::GetService(kNetSupportDialogCID, @@ -434,10 +452,23 @@ Wallet_Confirm(char * szMessage) { } nsServiceManager::ReleaseService(kNetSupportDialogCID, dialog); return retval; +#endif } PUBLIC void -Wallet_Alert(char * szMessage) { +Wallet_Alert(char * szMessage) +{ +#ifdef NECKO + nsresult res; + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res); + if (NS_FAILED(res)) { + return; // XXX should return the error + } + + const nsString message = szMessage; + res = dialog->Alert(message.GetUnicode()); + return; // XXX should return the error +#else nsINetSupportDialogService* dialog = NULL; nsresult res = nsServiceManager::GetService(kNetSupportDialogCID, nsINetSupportDialogService::GetIID(), (nsISupports**)&dialog); @@ -450,10 +481,33 @@ Wallet_Alert(char * szMessage) { } nsServiceManager::ReleaseService(kNetSupportDialogCID, dialog); return; +#endif } PUBLIC PRBool -Wallet_CheckConfirm(char * szMessage, char * szCheckMessage, PRBool* checkValue) { +Wallet_CheckConfirm(char * szMessage, char * szCheckMessage, PRBool* checkValue) +{ +#ifdef NECKO + PRBool retval = PR_TRUE; /* default value */ + + nsresult res; + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res); + if (NS_FAILED(res)) { + *checkValue = 0; + return retval; + } + + const nsString message = szMessage; + const nsString checkMessage = szCheckMessage; + res = dialog->ConfirmCheck(message.GetUnicode(), checkMessage.GetUnicode(), checkValue, &retval); + if (NS_FAILED(res)) { + *checkValue = 0; + } + if (*checkValue!=0 && *checkValue!=1) { + *checkValue = 0; /* this should never happen but it is happening!!! */ + } + return retval; +#else PRBool retval = PR_TRUE; /* default value */ nsINetSupportDialogService* dialog = NULL; nsresult res = nsServiceManager::GetService(kNetSupportDialogCID, @@ -471,9 +525,36 @@ Wallet_CheckConfirm(char * szMessage, char * szCheckMessage, PRBool* checkValue) } nsServiceManager::ReleaseService(kNetSupportDialogCID, dialog); return retval; +#endif } -char * wallet_GetString(char * szMessage) { +char * wallet_GetString(char * szMessage) +{ +#ifdef NECKO + nsString password; + PRBool retval; + + nsresult res; + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res); + if (NS_FAILED(res)) { + return NULL; // XXX should return the error + } + + const nsString message = szMessage; + PRUnichar* pwd; + res = dialog->PromptPassword(message.GetUnicode(), &pwd, &retval); + if (NS_FAILED(res)) { + return NULL; + } + password = pwd; + delete[] pwd; + + if (retval) { + return password.ToNewCString(); + } else { + return NULL; /* user pressed cancel */ + } +#else nsString password; PRBool retval; nsINetSupportDialogService* dialog = NULL; @@ -492,6 +573,7 @@ char * wallet_GetString(char * szMessage) { } else { return NULL; /* user pressed cancel */ } +#endif } /**********************************************************************************/ diff --git a/mozilla/gfx/src/nsImageNetContextAsync.cpp b/mozilla/gfx/src/nsImageNetContextAsync.cpp index bb3443736e8..89ae3dd632f 100644 --- a/mozilla/gfx/src/nsImageNetContextAsync.cpp +++ b/mozilla/gfx/src/nsImageNetContextAsync.cpp @@ -110,19 +110,17 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif void Interrupt(); @@ -185,9 +183,9 @@ ImageConsumer::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -ImageConsumer::OnStartBinding(nsISupports* aContext) +ImageConsumer::OnStartRequest(nsISupports* aContext) #else -ImageConsumer::OnStartBinding(nsIURI* aURL, const char *aContentType) +ImageConsumer::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { if (mInterrupted) { @@ -311,16 +309,16 @@ ImageConsumer::KeepPumpingStream(nsITimer *aTimer, void *aClosure) if (consumer->mURL) { consumer->mURL->QueryInterface(kIURLIID, (void**)&url); } - consumer->OnStopBinding(url, NS_BINDING_SUCCEEDED, status.GetUnicode()); + consumer->OnStopRequest(url, NS_BINDING_SUCCEEDED, status.GetUnicode()); NS_IF_RELEASE(url); } NS_IMETHODIMP #ifdef NECKO -ImageConsumer::OnStopBinding(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) +ImageConsumer::OnStopRequest(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) #else -ImageConsumer::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +ImageConsumer::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif { if (mTimer != nsnull) { diff --git a/mozilla/htmlparser/robot/nsDebugRobot.cpp b/mozilla/htmlparser/robot/nsDebugRobot.cpp index 18222ccbd20..7e1df4efec0 100644 --- a/mozilla/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/htmlparser/robot/nsDebugRobot.cpp @@ -134,22 +134,20 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); #else NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax) { return NS_OK; } NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg) { return NS_OK; } - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType) { return NS_OK; } - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType) { return NS_OK; } + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif }; #ifdef NECKO -NS_IMETHODIMP CStreamListener::OnStopBinding(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) +NS_IMETHODIMP CStreamListener::OnStopRequest(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) #else -NS_IMETHODIMP CStreamListener::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +NS_IMETHODIMP CStreamListener::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif { fputs("done.\n",stdout); diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp index 7cdcf86c2af..9903a77ea6d 100644 --- a/mozilla/htmlparser/src/nsParser.cpp +++ b/mozilla/htmlparser/src/nsParser.cpp @@ -51,7 +51,7 @@ static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); static const char* kNullURL = "Error: Null URL given"; -static const char* kOnStartNotCalled = "Error: OnStartBinding() must be called before OnDataAvailable()"; +static const char* kOnStartNotCalled = "Error: OnStartRequest() must be called before OnDataAvailable()"; static const char* kBadListenerInit = "Error: Parser's IStreamListener API was not setup correctly in constructor."; //------------------------------------------------------------------- @@ -1035,18 +1035,18 @@ nsParser::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) * @return error code -- 0 if ok, non-zero if error. */ #ifdef NECKO -nsresult nsParser::OnStartBinding(nsISupports* aContext) +nsresult nsParser::OnStartRequest(nsISupports* aContext) #else -nsresult nsParser::OnStartBinding(nsIURI* aURL, const char *aSourceType) +nsresult nsParser::OnStartRequest(nsIURI* aURL, const char *aSourceType) #endif { NS_PRECONDITION((eNone==mParserContext->mStreamListenerState),kBadListenerInit); if (nsnull != mObserver) { #ifdef NECKO - mObserver->OnStartBinding(aContext); + mObserver->OnStartRequest(aContext); #else - mObserver->OnStartBinding(aURL, aSourceType); + mObserver->OnStartRequest(aURL, aSourceType); #endif } mParserContext->mStreamListenerState=eOnStart; @@ -1077,20 +1077,6 @@ nsresult nsParser::OnStartBinding(nsIURI* aURL, const char *aSourceType) return NS_OK; } -#ifdef NECKO -NS_IMETHODIMP -nsParser::OnStartRequest(nsISupports *ctxt) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP -nsParser::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} -#endif // NECKO - /** * * @@ -1173,9 +1159,9 @@ nsresult nsParser::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUin * @return */ #ifdef NECKO -nsresult nsParser::OnStopBinding(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) +nsresult nsParser::OnStopRequest(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) #else -nsresult nsParser::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +nsresult nsParser::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif { mParserContext->mStreamListenerState=eOnStop; @@ -1193,9 +1179,9 @@ nsresult nsParser::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* // parser isn't yet enabled? if (nsnull != mObserver) { #ifdef NECKO - mObserver->OnStopBinding(aContext, status, aMsg); + mObserver->OnStopRequest(aContext, status, aMsg); #else - mObserver->OnStopBinding(aURL, status, aMsg); + mObserver->OnStopRequest(aURL, status, aMsg); #endif } diff --git a/mozilla/htmlparser/src/nsParser.h b/mozilla/htmlparser/src/nsParser.h index ea5806c73e1..746ccde3e0f 100644 --- a/mozilla/htmlparser/src/nsParser.h +++ b/mozilla/htmlparser/src/nsParser.h @@ -244,8 +244,6 @@ friend class CTokenHandler; NS_IMETHOD OnProgress(nsISupports* context, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsISupports* context, const PRUnichar* aMmsg); // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: @@ -254,9 +252,9 @@ friend class CTokenHandler; NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMmsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif void PushContext(CParserContext& aContext); diff --git a/mozilla/htmlparser/tests/grabpage/grabpage.cpp b/mozilla/htmlparser/tests/grabpage/grabpage.cpp index c6deb415c4d..1aa90b42efa 100644 --- a/mozilla/htmlparser/tests/grabpage/grabpage.cpp +++ b/mozilla/htmlparser/tests/grabpage/grabpage.cpp @@ -53,9 +53,9 @@ public: NS_IMETHOD GetBindInfo(nsIURI* aURL); NS_IMETHOD OnProgress(nsIURI* aURL, PRInt32 Progress, PRInt32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const nsString& aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRInt32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, PRInt32 status, const nsString& aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, PRInt32 status, const nsString& aMsg); PRBool IsDone() const { return mDone; } PRBool HaveError() const { return mError; } @@ -104,7 +104,7 @@ StreamToFile::OnStatus(nsIURI* aURL, const nsString& aMsg) } NS_IMETHODIMP -StreamToFile::OnStartBinding(nsIURI* aURL, const char *aContentType) +StreamToFile::OnStartRequest(nsIURI* aURL, const char *aContentType) { return 0; } @@ -128,7 +128,7 @@ StreamToFile::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, NS_IMETHODIMP -StreamToFile::OnStopBinding(nsIURI* aURL, PRInt32 status, const nsString& aMsg) +StreamToFile::OnStopRequest(nsIURI* aURL, PRInt32 status, const nsString& aMsg) { mDone = PR_TRUE; if (0 != status) { diff --git a/mozilla/layout/base/src/nsPluginViewer.cpp b/mozilla/layout/base/src/nsPluginViewer.cpp index a3e4ef1ec38..fd813b36575 100644 --- a/mozilla/layout/base/src/nsPluginViewer.cpp +++ b/mozilla/layout/base/src/nsPluginViewer.cpp @@ -64,18 +64,16 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else // nsIStreamListener - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream, @@ -607,9 +605,9 @@ NS_IMPL_ISUPPORTS(PluginListener, kIStreamListenerIID) NS_IMETHODIMP #ifdef NECKO -PluginListener::OnStartBinding(nsISupports *ctxt) +PluginListener::OnStartRequest(nsISupports *ctxt) #else -PluginListener::OnStartBinding(nsIURI* aURL, const char *contentType) +PluginListener::OnStartRequest(nsIURI* aURL, const char *contentType) #endif { #ifdef NECKO @@ -634,9 +632,9 @@ PluginListener::OnStartBinding(nsIURI* aURL, const char *contentType) return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStartBinding(ctxt); + return mNextStream->OnStartRequest(ctxt); #else - return mNextStream->OnStartBinding(aURL, contentType); + return mNextStream->OnStartRequest(aURL, contentType); #endif } @@ -663,9 +661,9 @@ PluginListener::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -PluginListener::OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +PluginListener::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -PluginListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, +PluginListener::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { @@ -673,9 +671,9 @@ PluginListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStopBinding(ctxt, status, errorMsg); + return mNextStream->OnStopRequest(ctxt, status, errorMsg); #else - return mNextStream->OnStopBinding(aURL, aStatus, aMsg); + return mNextStream->OnStopRequest(aURL, aStatus, aMsg); #endif } diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index 2dde99ea4e5..ca4eb47fd1c 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -77,16 +77,14 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); #else // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif protected: @@ -1107,9 +1105,9 @@ TempObserver::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -TempObserver::OnStartBinding(nsISupports *ctxt) +TempObserver::OnStartRequest(nsISupports *ctxt) #else -TempObserver::OnStartBinding(nsIURI* aURL, const char *aContentType) +TempObserver::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { #if 0 @@ -1122,9 +1120,9 @@ TempObserver::OnStartBinding(nsIURI* aURL, const char *aContentType) NS_IMETHODIMP #ifdef NECKO -TempObserver::OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +TempObserver::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -TempObserver::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +TempObserver::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif { #if 0 diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index 2dde99ea4e5..ca4eb47fd1c 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -77,16 +77,14 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); #else // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif protected: @@ -1107,9 +1105,9 @@ TempObserver::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -TempObserver::OnStartBinding(nsISupports *ctxt) +TempObserver::OnStartRequest(nsISupports *ctxt) #else -TempObserver::OnStartBinding(nsIURI* aURL, const char *aContentType) +TempObserver::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { #if 0 @@ -1122,9 +1120,9 @@ TempObserver::OnStartBinding(nsIURI* aURL, const char *aContentType) NS_IMETHODIMP #ifdef NECKO -TempObserver::OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +TempObserver::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -TempObserver::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +TempObserver::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif { #if 0 diff --git a/mozilla/layout/html/document/src/nsImageDocument.cpp b/mozilla/layout/html/document/src/nsImageDocument.cpp index 76c9fbb16a9..1392268d38a 100644 --- a/mozilla/layout/html/document/src/nsImageDocument.cpp +++ b/mozilla/layout/html/document/src/nsImageDocument.cpp @@ -31,6 +31,9 @@ #include "nsIPresShell.h" #include "nsIPresContext.h" #include "nsIViewManager.h" +#ifdef NECKO +#include "nsIChannel.h" +#endif // XXX TODO: @@ -79,17 +82,15 @@ public: NS_DECL_ISUPPORTS #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream, @@ -117,15 +118,23 @@ NS_IMPL_ISUPPORTS(ImageListener, kIStreamListenerIID) NS_IMETHODIMP #ifdef NECKO -ImageListener::OnStartBinding(nsISupports *ctxt) +ImageListener::OnStartRequest(nsISupports *ctxt) #else -ImageListener::OnStartBinding(nsIURI* aURL, const char *aContentType) +ImageListener::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { #ifdef NECKO + nsresult rv; + nsIChannel* channel; + rv = ctxt->QueryInterface(nsIChannel::GetIID(), (void**)&channel); + if (NS_FAILED(rv)) return rv; nsIURI* uri; + rv = channel->GetURI(&uri); + if (NS_FAILED(rv)) return rv; mDocument->StartImageLoad(uri, mNextStream); + NS_RELEASE(uri); + NS_RELEASE(channel); #else mDocument->StartImageLoad(aURL, mNextStream); #endif @@ -133,9 +142,9 @@ ImageListener::OnStartBinding(nsIURI* aURL, const char *aContentType) return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStartBinding(ctxt); + return mNextStream->OnStartRequest(ctxt); #else - return mNextStream->OnStartBinding(aURL, aContentType); + return mNextStream->OnStartRequest(aURL, aContentType); #endif } @@ -162,10 +171,10 @@ ImageListener::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -ImageListener::OnStopBinding(nsISupports *ctxt, nsresult status, +ImageListener::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -ImageListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, +ImageListener::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { @@ -173,9 +182,9 @@ ImageListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStopBinding(ctxt, status, errorMsg); + return mNextStream->OnStopRequest(ctxt, status, errorMsg); #else - return mNextStream->OnStopBinding(aURL, aStatus, aMsg); + return mNextStream->OnStopRequest(aURL, aStatus, aMsg); #endif } diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp index 9b6d29942c4..a6d9d1d9620 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp @@ -1632,9 +1632,9 @@ EnderTempObserver::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -EnderTempObserver::OnStartBinding(nsISupports *ctxt) +EnderTempObserver::OnStartRequest(nsISupports *ctxt) #else -EnderTempObserver::OnStartBinding(nsIURI* aURL, const char *aContentType) +EnderTempObserver::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { return NS_OK; @@ -1642,10 +1642,10 @@ EnderTempObserver::OnStartBinding(nsIURI* aURL, const char *aContentType) NS_IMETHODIMP #ifdef NECKO -EnderTempObserver::OnStopBinding(nsISupports *ctxt, nsresult status, +EnderTempObserver::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -EnderTempObserver::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +EnderTempObserver::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif { if (PR_TRUE==mFirstCall) diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.h b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.h index 2a9dbe47f33..b2d55df587c 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.h +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.h @@ -55,16 +55,14 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); #else // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif protected: diff --git a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp index f4d6c53c199..54633aeeef0 100644 --- a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp @@ -1299,6 +1299,7 @@ nsXMLContentSink::ProcessCSSStyleLink(nsIContent* aElement, if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { nsIURI* url = nsnull; #ifdef NECKO // XXX we need to get passed in the nsILoadGroup here! +// nsILoadGroup* group = mDocument->GetDocumentLoadGroup(); result = NS_NewURI(&url, aHref, mDocumentBaseURL/*, group*/); #else nsILoadGroup* LoadGroup = nsnull; @@ -1842,11 +1843,11 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode) // Use the SRC attribute value to load the URL nsIURI* url = nsnull; nsAutoString absURL; - nsIURI* docURL = mDocument->GetDocumentURL(); -#ifdef NECKO - // XXX we need to be passed the nsILoadGroup here +#ifdef NECKO // XXX we need to get passed in the nsILoadGroup here! +// nsILoadGroup* group = mDocument->GetDocumentLoadGroup(); rv = NS_NewURI(&url, absURL/*, group*/); #else + nsIURI* docURL = mDocument->GetDocumentURL(); nsILoadGroup* group = nsnull; rv = docURL->GetLoadGroup(&group); if ((NS_OK == rv) && group) { @@ -1856,8 +1857,8 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode) else { rv = NS_NewURL(&url, absURL); } -#endif NS_RELEASE(docURL); +#endif if (NS_OK != rv) { return rv; } diff --git a/mozilla/mailnews/base/src/nsCopyMessageStreamListener.cpp b/mozilla/mailnews/base/src/nsCopyMessageStreamListener.cpp index 0887e3fd3c4..8411ef36b0d 100644 --- a/mozilla/mailnews/base/src/nsCopyMessageStreamListener.cpp +++ b/mozilla/mailnews/base/src/nsCopyMessageStreamListener.cpp @@ -167,7 +167,7 @@ NS_IMETHODIMP nsCopyMessageStreamListener::OnDataAvailable(nsIURI* aURL, nsIInpu rv = mDestination->CopyData(aIStream, aLength); return rv; } -NS_IMETHODIMP nsCopyMessageStreamListener::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsCopyMessageStreamListener::OnStartRequest(nsIURI* aURL, const char *aContentType) { nsCOMPtr message; nsresult rv; @@ -190,7 +190,7 @@ NS_IMETHODIMP nsCopyMessageStreamListener::OnStatus(nsIURI* aURL, const PRUnicha return NS_OK; } -NS_IMETHODIMP nsCopyMessageStreamListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsCopyMessageStreamListener::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { nsresult rv = NS_OK; PRBool copySucceeded = (aStatus == NS_BINDING_SUCCEEDED); diff --git a/mozilla/mailnews/base/src/nsCopyMessageStreamListener.h b/mozilla/mailnews/base/src/nsCopyMessageStreamListener.h index 080619582c4..a7a0a5d949e 100644 --- a/mozilla/mailnews/base/src/nsCopyMessageStreamListener.h +++ b/mozilla/mailnews/base/src/nsCopyMessageStreamListener.h @@ -40,13 +40,13 @@ public: NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); protected: nsCOMPtr mDestination; diff --git a/mozilla/mailnews/base/util/nsMsgProtocol.cpp b/mozilla/mailnews/base/util/nsMsgProtocol.cpp index 849251a2f2e..f360f4998dd 100644 --- a/mozilla/mailnews/base/util/nsMsgProtocol.cpp +++ b/mozilla/mailnews/base/util/nsMsgProtocol.cpp @@ -142,14 +142,14 @@ NS_IMETHODIMP nsMsgProtocol::OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStr return ProcessProtocolState(aURL, aIStream, aLength); } -NS_IMETHODIMP nsMsgProtocol::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsMsgProtocol::OnStartRequest(nsIURI* aURL, const char *aContentType) { nsCOMPtr aMsgUrl = do_QueryInterface(aURL); return aMsgUrl->SetUrlState(PR_TRUE, NS_OK); } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsMsgProtocol::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsMsgProtocol::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { nsCOMPtr aMsgUrl = do_QueryInterface(aURL); return aMsgUrl->SetUrlState(PR_FALSE, aStatus); diff --git a/mozilla/mailnews/base/util/nsMsgProtocol.h b/mozilla/mailnews/base/util/nsMsgProtocol.h index bf6665d0be7..586412934ee 100644 --- a/mozilla/mailnews/base/util/nsMsgProtocol.h +++ b/mozilla/mailnews/base/util/nsMsgProtocol.h @@ -48,11 +48,11 @@ public: // I expect most protocols to override this method AND call into the base class // the base class takes the url and sets the state of the url passed in to be running - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); // stop binding is a "notification" informing us that the stream associated with aURL is going away. // the base class implementation takes the url and sets the url state to NOT running. - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); // Ideally, a protocol should only have to support the stream listener methods covered above. // However, we don't have this nsIStreamListenerLite interface defined yet. Until then, we are using diff --git a/mozilla/mailnews/compose/src/nsMsgPrompts.cpp b/mozilla/mailnews/compose/src/nsMsgPrompts.cpp index 235551962d2..1a30597b1ad 100644 --- a/mozilla/mailnews/compose/src/nsMsgPrompts.cpp +++ b/mozilla/mailnews/compose/src/nsMsgPrompts.cpp @@ -33,7 +33,11 @@ nsMsgDisplayMessageByID(PRInt32 msgID) if (!msg) return NS_ERROR_FAILURE; +#ifdef NECKO + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv); +#else NS_WITH_SERVICE(nsINetSupportDialogService, dialog, kNetSupportDialogCID, &rv); +#endif if (NS_FAILED(rv)) return NS_ERROR_FAILURE; @@ -61,7 +65,11 @@ nsMsgDisplayMessageByString(char *msg) if ((!msg) || (!*msg)) return NS_ERROR_FAILURE; +#ifdef NECKO + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv); +#else NS_WITH_SERVICE(nsINetSupportDialogService, dialog, kNetSupportDialogCID, &rv); +#endif if (NS_FAILED(rv)) return NS_ERROR_FAILURE; @@ -90,7 +98,11 @@ nsMsgAskBooleanQuestionByID(PRInt32 msgID, PRBool *answer) if (!msg) return NS_ERROR_FAILURE; +#ifdef NECKO + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv); +#else NS_WITH_SERVICE(nsINetSupportDialogService, dialog, kNetSupportDialogCID, &rv); +#endif if (NS_FAILED(rv)) return NS_ERROR_FAILURE; @@ -121,7 +133,11 @@ nsMsgAskBooleanQuestionByID(char *msg, PRBool *answer) if ((!msg) || (!*msg)) return NS_ERROR_FAILURE; +#ifdef NECKO + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv); +#else NS_WITH_SERVICE(nsINetSupportDialogService, dialog, kNetSupportDialogCID, &rv); +#endif if (NS_FAILED(rv)) return NS_ERROR_FAILURE; diff --git a/mozilla/mailnews/compose/src/nsMsgQuote.cpp b/mozilla/mailnews/compose/src/nsMsgQuote.cpp index b6da1dd3c68..50ce2d4dfca 100644 --- a/mozilla/mailnews/compose/src/nsMsgQuote.cpp +++ b/mozilla/mailnews/compose/src/nsMsgQuote.cpp @@ -243,7 +243,7 @@ SaveQuoteMessageCompleteCallback(nsIURI *aURL, nsresult aExitCode, void *tagData } // Assuming this is an RFC822 message... - mimeParser->OnStartBinding(aURL, MESSAGE_RFC822); + mimeParser->OnStartRequest(aURL, MESSAGE_RFC822); // Just pump all of the data from the file into libmime... while (NS_SUCCEEDED(fileStream->PumpFileStream())) @@ -253,7 +253,7 @@ SaveQuoteMessageCompleteCallback(nsIURI *aURL, nsresult aExitCode, void *tagData mimeParser->OnDataAvailable(aURL, in, len); } - mimeParser->OnStopBinding(aURL, NS_OK, nsnull); + mimeParser->OnStopRequest(aURL, NS_OK, nsnull); in->Close(); ptr->mTmpFileSpec->Delete(PR_FALSE); NS_RELEASE(ptr); diff --git a/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp b/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp index 0db41bb96c1..44be26dd6f3 100644 --- a/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp @@ -293,9 +293,9 @@ const char * nsSmtpProtocol::GetUserDomainName() //////////////////////////////////////////////////////////////////////////////////////////// // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsSmtpProtocol::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsSmtpProtocol::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { - nsMsgProtocol::OnStopBinding(aURL, aStatus, aMsg); + nsMsgProtocol::OnStopRequest(aURL, aStatus, aMsg); // okay, we've been told that the send is done and the connection is going away. So // we need to release all of our state diff --git a/mozilla/mailnews/compose/src/nsSmtpProtocol.h b/mozilla/mailnews/compose/src/nsSmtpProtocol.h index 3cd37223740..89088dbb0d4 100644 --- a/mozilla/mailnews/compose/src/nsSmtpProtocol.h +++ b/mozilla/mailnews/compose/src/nsSmtpProtocol.h @@ -81,7 +81,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// // stop binding is a "notification" informing us that the stream associated with aURL is going away. - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); private: // Smtp Event Sinks diff --git a/mozilla/mailnews/compose/src/nsURLFetcher.cpp b/mozilla/mailnews/compose/src/nsURLFetcher.cpp index cff60786c26..46d1e6386c6 100644 --- a/mozilla/mailnews/compose/src/nsURLFetcher.cpp +++ b/mozilla/mailnews/compose/src/nsURLFetcher.cpp @@ -163,10 +163,10 @@ nsURLFetcher::OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, * used to cancel the URL load.. */ nsresult -nsURLFetcher::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsURLFetcher::OnStartRequest(nsIURI* aURL, const char *aContentType) { #ifdef NS_DEBUG_richie - printf("nsURLFetcher::OnStartBinding() for Content-Type: %s\n", aContentType); + printf("nsURLFetcher::OnStartRequest() for Content-Type: %s\n", aContentType); #endif if (aContentType) @@ -216,10 +216,10 @@ nsURLFetcher::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) * @return The return value is currently ignored. */ nsresult -nsURLFetcher::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +nsURLFetcher::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { #ifdef NS_DEBUG_richie - printf("nsURLFetcher::OnStopBinding()\n"); + printf("nsURLFetcher::OnStopRequest()\n"); #endif // diff --git a/mozilla/mailnews/compose/src/nsURLFetcher.h b/mozilla/mailnews/compose/src/nsURLFetcher.h index a51febff9d9..36b78c7769b 100644 --- a/mozilla/mailnews/compose/src/nsURLFetcher.h +++ b/mozilla/mailnews/compose/src/nsURLFetcher.h @@ -81,7 +81,7 @@ public: * @return The return value is currently ignored. In the future it may be * used to cancel the URL load.. */ - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); /** * Notify the observer that progress as occurred for the URL load.
@@ -104,7 +104,7 @@ public: * @param msg A text string describing the error. * @return The return value is currently ignored. */ - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); private: diff --git a/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.cpp b/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.cpp index 80151bca805..920678ad817 100644 --- a/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.cpp +++ b/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.cpp @@ -155,10 +155,10 @@ nsURLFetcher::OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, * used to cancel the URL load.. */ nsresult -nsURLFetcher::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsURLFetcher::OnStartRequest(nsIURI* aURL, const char *aContentType) { #ifdef NS_DEBUG_richie - printf("nsURLFetcher::OnStartBinding() for Content-Type: %s\n", aContentType); + printf("nsURLFetcher::OnStartRequest() for Content-Type: %s\n", aContentType); #endif return NS_OK; @@ -205,10 +205,10 @@ nsURLFetcher::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) * @return The return value is currently ignored. */ nsresult -nsURLFetcher::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +nsURLFetcher::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { #ifdef NS_DEBUG_richie - printf("nsURLFetcher::OnStopBinding()\n"); + printf("nsURLFetcher::OnStopRequest()\n"); #endif // diff --git a/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.h b/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.h index 69ae54ce607..3abd7043dbe 100644 --- a/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.h +++ b/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.h @@ -78,7 +78,7 @@ public: * @return The return value is currently ignored. In the future it may be * used to cancel the URL load.. */ - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); /** * Notify the observer that progress as occurred for the URL load.
@@ -101,7 +101,7 @@ public: * @param msg A text string describing the error. * @return The return value is currently ignored. */ - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); private: diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.cpp b/mozilla/mailnews/imap/src/nsImapProtocol.cpp index 91fdb017aaf..e935a70cefb 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.cpp +++ b/mozilla/mailnews/imap/src/nsImapProtocol.cpp @@ -945,7 +945,7 @@ NS_IMETHODIMP nsImapProtocol::OnDataAvailable(nsIURI* aURL, nsIInputStream *aISt return res; } -NS_IMETHODIMP nsImapProtocol::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsImapProtocol::OnStartRequest(nsIURI* aURL, const char *aContentType) { PR_CEnterMonitor(this); nsresult rv = NS_OK; @@ -957,7 +957,7 @@ NS_IMETHODIMP nsImapProtocol::OnStartBinding(nsIURI* aURL, const char *aContentT } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsImapProtocol::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsImapProtocol::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { PR_CEnterMonitor(this); nsresult rv = NS_OK; diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.h b/mozilla/mailnews/imap/src/nsImapProtocol.h index 7f0c4d0fa02..988ffcd00b6 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.h +++ b/mozilla/mailnews/imap/src/nsImapProtocol.h @@ -87,10 +87,10 @@ public: // OnDataAvailable. We then read and process the incoming data from the input stream. NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); // stop binding is a "notification" informing us that the stream associated with aURL is going away. - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); // Ideally, a protocol should only have to support the stream listener methods covered above. // However, we don't have this nsIStreamListenerLite interface defined yet. Until then, we are using diff --git a/mozilla/mailnews/local/src/nsMailboxProtocol.cpp b/mozilla/mailnews/local/src/nsMailboxProtocol.cpp index eb1dc5b5c44..22fdb9011a0 100644 --- a/mozilla/mailnews/local/src/nsMailboxProtocol.cpp +++ b/mozilla/mailnews/local/src/nsMailboxProtocol.cpp @@ -92,7 +92,7 @@ void nsMailboxProtocol::Initialize(nsIURI * aURL) // we suppport the nsIStreamListener interface //////////////////////////////////////////////////////////////////////////////////////////// -NS_IMETHODIMP nsMailboxProtocol::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsMailboxProtocol::OnStartRequest(nsIURI* aURL, const char *aContentType) { // extract the appropriate event sinks from the url and initialize them in our protocol data // the URL should be queried for a nsINewsURL. If it doesn't support a news URL interface then @@ -101,26 +101,26 @@ NS_IMETHODIMP nsMailboxProtocol::OnStartBinding(nsIURI* aURL, const char *aConte if (m_nextState == MAILBOX_READ_FOLDER && m_mailboxParser) { // we need to inform our mailbox parser that it's time to start... - m_mailboxParser->OnStartBinding(aURL, aContentType); + m_mailboxParser->OnStartRequest(aURL, aContentType); } else if(m_mailboxCopyHandler) - m_mailboxCopyHandler->OnStartBinding(aURL, aContentType); + m_mailboxCopyHandler->OnStartRequest(aURL, aContentType); return NS_OK; } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsMailboxProtocol::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsMailboxProtocol::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { if (m_nextState == MAILBOX_READ_FOLDER && m_mailboxParser) { // we need to inform our mailbox parser that there is no more incoming data... - m_mailboxParser->OnStopBinding(aURL, 0, nsnull); + m_mailboxParser->OnStopRequest(aURL, 0, nsnull); } else if (m_mailboxCopyHandler) - m_mailboxCopyHandler->OnStopBinding(aURL, 0, nsnull); + m_mailboxCopyHandler->OnStopRequest(aURL, 0, nsnull); else if (m_nextState == MAILBOX_READ_MESSAGE) { DoneReadingMessage(); @@ -148,7 +148,7 @@ NS_IMETHODIMP nsMailboxProtocol::OnStopBinding(nsIURI* aURL, nsresult aStatus, c // is coming from netlib so they are never going to ping us again with on data available. This means // we'll never be going through the Process loop... - nsMsgProtocol::OnStopBinding(aURL, aStatus, aMsg); + nsMsgProtocol::OnStopRequest(aURL, aStatus, aMsg); return CloseSocket(); } @@ -293,7 +293,7 @@ PRInt32 nsMailboxProtocol::ReadFolderResponse(nsIInputStream * inputStream, PRUi // leave our state alone so when the next chunk of the mailbox comes in we jump to this state // and repeat....how does this process end? Well when the file is done being read in, core net lib - // will issue an ::OnStopBinding to us...we'll use that as our sign to drop out of this state and to + // will issue an ::OnStopRequest to us...we'll use that as our sign to drop out of this state and to // close the protocol instance... return 0; diff --git a/mozilla/mailnews/local/src/nsMailboxProtocol.h b/mozilla/mailnews/local/src/nsMailboxProtocol.h index d773d190da3..9fc193f5d16 100644 --- a/mozilla/mailnews/local/src/nsMailboxProtocol.h +++ b/mozilla/mailnews/local/src/nsMailboxProtocol.h @@ -86,10 +86,10 @@ public: // we suppport the nsIStreamListener interface //////////////////////////////////////////////////////////////////////////////////////// - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); // stop binding is a "notification" informing us that the stream associated with aURL is going away. - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); //////////////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp index dc9ca29d14f..587b6d9a249 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.cpp +++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp @@ -59,14 +59,14 @@ NS_IMETHODIMP nsMsgMailboxParser::OnDataAvailable(nsIURI* aURL, nsIInputStream * return NS_OK; } -NS_IMETHODIMP nsMsgMailboxParser::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsMsgMailboxParser::OnStartRequest(nsIURI* aURL, const char *aContentType) { // extract the appropriate event sinks from the url and initialize them in our protocol data // the URL should be queried for a nsIMailboxURL. If it doesn't support a mailbox URL interface then // we have an error. nsresult rv = NS_OK; nsCOMPtr runningUrl = do_QueryInterface(aURL, &rv); - printf("\n+++ nsMsgMailboxParser::OnStartBinding: URL: %p, Content type: %s\n", aURL, aContentType); + printf("\n+++ nsMsgMailboxParser::OnStartRequest: URL: %p, Content type: %s\n", aURL, aContentType); if (NS_SUCCEEDED(rv) && runningUrl) { @@ -99,7 +99,7 @@ NS_IMETHODIMP nsMsgMailboxParser::OnStartBinding(nsIURI* aURL, const char *aCont } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsMsgMailboxParser::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsMsgMailboxParser::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { DoneParsingFolder(); // what can we do? we can close the stream? @@ -1361,7 +1361,7 @@ nsParseNewMailState::Init(nsIFolder *rootFolder, nsFileSpec &folder, nsIOFileStr m_inboxFileStream = inboxFileStream; #endif // the new mail parser isn't going to get the stream input, it seems, so we can't use - // the OnStartBinding mechanism the mailbox parser uses. So, let's open the db right now. + // the OnStartRequest mechanism the mailbox parser uses. So, let's open the db right now. nsCOMPtr mailDB; rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, nsIMsgDatabase::GetIID(), (void **) getter_AddRefs(mailDB)); if (NS_SUCCEEDED(rv) && mailDB) diff --git a/mozilla/mailnews/local/src/nsParseMailbox.h b/mozilla/mailnews/local/src/nsParseMailbox.h index 30d48163bcc..7a594bd33a3 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.h +++ b/mozilla/mailnews/local/src/nsParseMailbox.h @@ -176,10 +176,10 @@ public: // OnDataAvailable. We then read and process the incoming data from the input stream. NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); // stop binding is a "notification" informing us that the stream associated with aURL is going away. - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); // Ideally, a protocol should only have to support the stream listener methods covered above. // However, we don't have this nsIStreamListenerLite interface defined yet. Until then, we are using diff --git a/mozilla/mailnews/local/src/nsPop3Protocol.cpp b/mozilla/mailnews/local/src/nsPop3Protocol.cpp index f98e2104e21..21ff1c950d9 100644 --- a/mozilla/mailnews/local/src/nsPop3Protocol.cpp +++ b/mozilla/mailnews/local/src/nsPop3Protocol.cpp @@ -2648,7 +2648,7 @@ nsresult nsPop3Protocol::ProcessProtocolState (nsIURI* aURL, nsIInputStream* aIn m_nsIPop3Sink->EndMailDelivery(); if (m_transport) - m_transport->OnStopBinding(mailnewsurl, 0, nsnull); + m_transport->OnStopRequest(mailnewsurl, 0, nsnull); if (mailnewsurl) mailnewsurl->SetUrlState(PR_FALSE, NS_OK); @@ -2715,7 +2715,7 @@ nsresult nsPop3Protocol::ProcessProtocolState (nsIURI* aURL, nsIInputStream* aIn m_pop3ConData->next_state = POP3_FREE; if (m_transport) - m_transport->OnStopBinding(mailnewsurl, 0, nsnull); + m_transport->OnStopRequest(mailnewsurl, 0, nsnull); if (mailnewsurl) mailnewsurl->SetUrlState(PR_FALSE, NS_ERROR_FAILURE); diff --git a/mozilla/mailnews/local/src/nsPop3Sink.cpp b/mozilla/mailnews/local/src/nsPop3Sink.cpp index cdd4d3e3220..c31c0e2fc56 100644 --- a/mozilla/mailnews/local/src/nsPop3Sink.cpp +++ b/mozilla/mailnews/local/src/nsPop3Sink.cpp @@ -168,7 +168,7 @@ nsPop3Sink::EndMailDelivery() { if (m_outFileStream) m_outFileStream->flush(); // try this. - m_newMailParser->OnStopBinding(nsnull, NS_OK, nsnull); + m_newMailParser->OnStopRequest(nsnull, NS_OK, nsnull); delete m_newMailParser; m_newMailParser = NULL; } diff --git a/mozilla/mailnews/local/tests/mailbox/mailboxTest.cpp b/mozilla/mailnews/local/tests/mailbox/mailboxTest.cpp index 2ac820dfa7b..c774769526f 100644 --- a/mozilla/mailnews/local/tests/mailbox/mailboxTest.cpp +++ b/mozilla/mailnews/local/tests/mailbox/mailboxTest.cpp @@ -39,7 +39,7 @@ // Oh one more thing. Data is passed from the mailbox protocol to the mailbox parse // through calls to ::OnDataAvailable which provides the mailbox parser with the url, // stream and the number of bytes available to be read. -// A call to ::OnStopBinding is a signal to the mailbox parser that you've reached +// A call to ::OnStopRequest is a signal to the mailbox parser that you've reached // the end of the file. ////////////////////////////////////////////////////////////////////////////////// @@ -203,8 +203,8 @@ public: NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo) { return NS_OK;} NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); //////////////////////////////////////////////////////////////////////////////////////// // End of nsIStreamListenerSupport @@ -597,7 +597,7 @@ NS_IMETHODIMP nsMailboxTestDriver::OnDataAvailable(nsIURI* aURL, nsIInputStream return NS_OK; } -NS_IMETHODIMP nsMailboxTestDriver::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsMailboxTestDriver::OnStartRequest(nsIURI* aURL, const char *aContentType) { nsIMailboxUrl * mailboxUrl = nsnull; if (aURL) @@ -615,7 +615,7 @@ NS_IMETHODIMP nsMailboxTestDriver::OnStartBinding(nsIURI* aURL, const char *aCon return NS_OK; } -NS_IMETHODIMP nsMailboxTestDriver::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsMailboxTestDriver::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { nsIMailboxUrl * mailboxUrl = nsnull; if (aURL) diff --git a/mozilla/mailnews/local/tests/mailbox/nsMsgMailboxParserStub.cpp b/mozilla/mailnews/local/tests/mailbox/nsMsgMailboxParserStub.cpp index 5caff193be5..6210cbecae6 100644 --- a/mozilla/mailnews/local/tests/mailbox/nsMsgMailboxParserStub.cpp +++ b/mozilla/mailnews/local/tests/mailbox/nsMsgMailboxParserStub.cpp @@ -45,9 +45,9 @@ public: NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* info); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); protected: ~nsMsgMailboxParserStub(); @@ -88,9 +88,9 @@ NS_IMETHODIMP nsMsgMailboxParserStub::OnStatus(nsIURI* aURL, const PRUnichar* aM return 0; } -NS_IMETHODIMP nsMsgMailboxParserStub::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsMsgMailboxParserStub::OnStartRequest(nsIURI* aURL, const char *aContentType) { - printf("\n+++ nsMsgMailboxParserStub::OnStartBinding: URL: %p, Content type: %s\n", aURL, aContentType); + printf("\n+++ nsMsgMailboxParserStub::OnStartRequest: URL: %p, Content type: %s\n", aURL, aContentType); return 0; } @@ -127,11 +127,11 @@ NS_IMETHODIMP nsMsgMailboxParserStub::OnDataAvailable(nsIURI* aURL, nsIInputStre } -NS_IMETHODIMP nsMsgMailboxParserStub::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +NS_IMETHODIMP nsMsgMailboxParserStub::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) { // on stop binding is called by the mailbox protocol when there is no more data forthcoming... - printf("\n+++ nsMsgMailboxParserStub::OnStopBinding... URL: %p status: %d\n", aURL, status); + printf("\n+++ nsMsgMailboxParserStub::OnStopRequest... URL: %p status: %d\n", aURL, status); /* The document has been loaded, so drop out of the message pump... */ return 0; diff --git a/mozilla/mailnews/mime/src/nsStreamConverter.cpp b/mozilla/mailnews/mime/src/nsStreamConverter.cpp index b73da52cd8b..5dc41933a72 100644 --- a/mozilla/mailnews/mime/src/nsStreamConverter.cpp +++ b/mozilla/mailnews/mime/src/nsStreamConverter.cpp @@ -339,10 +339,10 @@ nsStreamConverter::OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, * used to cancel the URL load.. */ nsresult -nsStreamConverter::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsStreamConverter::OnStartRequest(nsIURI* aURL, const char *aContentType) { #ifdef NS_DEBUG - // printf("nsStreamConverter::OnStartBinding() for Content-Type: %s\n", aContentType); + // printf("nsStreamConverter::OnStartRequest() for Content-Type: %s\n", aContentType); #endif return NS_OK; @@ -386,10 +386,10 @@ nsStreamConverter::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) * @return The return value is currently ignored. */ nsresult -nsStreamConverter::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +nsStreamConverter::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { #ifdef NS_DEBUG - // printf("nsStreamConverter::OnStopBinding()\n"); + // printf("nsStreamConverter::OnStopRequest()\n"); #endif // diff --git a/mozilla/mailnews/mime/src/nsStreamConverter.h b/mozilla/mailnews/mime/src/nsStreamConverter.h index 900425d14a8..835f7ed15a4 100644 --- a/mozilla/mailnews/mime/src/nsStreamConverter.h +++ b/mozilla/mailnews/mime/src/nsStreamConverter.h @@ -84,7 +84,7 @@ public: * @return The return value is currently ignored. In the future it may be * used to cancel the URL load.. */ - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); /** * Notify the observer that progress as occurred for the URL load.
@@ -107,7 +107,7 @@ public: * @param msg A text string describing the error. * @return The return value is currently ignored. */ - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); //////////////////////////////////////////////////////////////////////////// // nsStreamConverter specific methods: diff --git a/mozilla/mailnews/mime/tests/mimetest/mimetest.cpp b/mozilla/mailnews/mime/tests/mimetest/mimetest.cpp index d2ceff377e6..d069be92e18 100644 --- a/mozilla/mailnews/mime/tests/mimetest/mimetest.cpp +++ b/mozilla/mailnews/mime/tests/mimetest/mimetest.cpp @@ -442,7 +442,7 @@ DoRFC822toHTMLConversion(char *filename) } // Assuming this is an RFC822 message... - mimeParser->OnStartBinding(aURL, MESSAGE_RFC822); + mimeParser->OnStartRequest(aURL, MESSAGE_RFC822); // Just pump all of the data from the file into libmime... while (NS_SUCCEEDED(in->PumpFileStream())) @@ -452,7 +452,7 @@ DoRFC822toHTMLConversion(char *filename) mimeParser->OnDataAvailable(aURL, in, len); } - mimeParser->OnStopBinding(aURL, NS_OK, nsnull); + mimeParser->OnStopRequest(aURL, NS_OK, nsnull); NS_RELEASE(aURL); return NS_OK; } diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp index efbf1882a17..b027d78511a 100644 --- a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp +++ b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp @@ -797,9 +797,9 @@ nsresult nsNNTPProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer) } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsNNTPProtocol::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsNNTPProtocol::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { - nsMsgProtocol::OnStopBinding(aURL, aStatus, aMsg); + nsMsgProtocol::OnStopRequest(aURL, aStatus, aMsg); // okay, we've been told that the send is done and the connection is going away. So // we need to release all of our state @@ -3728,7 +3728,11 @@ PRInt32 nsNNTPProtocol::Cancel() old_from = m_cancelFromHdr; id = m_cancelID; +#ifdef NECKO + NS_WITH_SERVICE(nsIPrompt, dialog, kCNetSupportDialogCID, &rv); +#else NS_WITH_SERVICE(nsINetSupportDialogService,dialog,kCNetSupportDialogCID,&rv); +#endif if (NS_FAILED(rv)) return -1; /* unable to get the dialog service */ PR_ASSERT (id && newsgroups); @@ -4883,9 +4887,9 @@ nsresult nsNNTPProtocol::ProcessProtocolState(nsIURI * url, nsIInputStream * inp // cache so we aren't creating new connections to process each request... // but until that time, we always want to properly shutdown the connection - // SendData(m_runningURL, "quit"CRLF); // this will cause OnStopBinding to get called + // SendData(m_runningURL, "quit"CRLF); // this will cause OnStopRequest to get called if (m_transport) - m_transport->OnStopBinding(mailnewsurl, 0, nsnull); + m_transport->OnStopRequest(mailnewsurl, 0, nsnull); CloseSocket(); return NS_OK; //SetFlag(NNTP_PAUSE_FOR_READ); diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.h b/mozilla/mailnews/news/src/nsNNTPProtocol.h index be71c9b49ce..e95f570ca8f 100644 --- a/mozilla/mailnews/news/src/nsNNTPProtocol.h +++ b/mozilla/mailnews/news/src/nsNNTPProtocol.h @@ -164,7 +164,7 @@ public: virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer = nsnull); // stop binding is a "notification" informing us that the stream associated with aURL is going away. - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); char * m_ProxyServer; /* proxy server hostname */ diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp index 1da38d49b86..7aba7942264 100644 --- a/mozilla/mailnews/news/src/nsNntpService.cpp +++ b/mozilla/mailnews/news/src/nsNntpService.cpp @@ -743,7 +743,11 @@ NS_IMETHODIMP nsNntpService::CancelMessages(const char *hostname, const char *ne if (!hostname) return NS_ERROR_NULL_POINTER; if (PL_strlen(hostname) == 0) return NS_ERROR_FAILURE; +#ifdef NECKO + NS_WITH_SERVICE(nsIPrompt, dialog, kCNetSupportDialogCID, &rv); +#else NS_WITH_SERVICE(nsINetSupportDialogService,dialog,kCNetSupportDialogCID,&rv); +#endif if (NS_FAILED(rv)) return rv; if (!messages) { diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp index ea58ef77bf1..922a533ec08 100644 --- a/mozilla/modules/libpref/src/nsPref.cpp +++ b/mozilla/modules/libpref/src/nsPref.cpp @@ -25,7 +25,11 @@ #include "nsIFactory.h" #include "nsIComponentManager.h" #ifdef XP_MAC +#ifdef NECKO +#include "nsIPrompt.h" +#else #include "nsINetSupport.h" +#endif #include "nsIStreamListener.h" #endif /* XP_MAC */ #include "nsIServiceManager.h" diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index ebdde9f04e7..f5604aaa656 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -392,23 +392,21 @@ public: NS_IMETHOD OnProgress(nsISupports* context, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsISupports* context, const PRUnichar* aMmsg); // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else //nsIStreamObserver interface - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); //nsIStreamListener interface @@ -449,10 +447,10 @@ private: nsPluginStreamType mStreamType; nsIPluginHost *mHost; PRBool mGotProgress; - PRBool mOnStartBinding; + PRBool mOnStartRequest; PRBool mCacheDone; - PRBool mOnStopBinding; + PRBool mOnStopRequest; nsresult mStatus; #ifdef USE_CACHE @@ -480,27 +478,24 @@ public: NS_IMETHOD OnStatus(nsISupports* context, const PRUnichar* aMsg); // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg) { return NS_OK; } + const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, - PRUint32 sourceOffset, PRUint32 count); + PRUint32 sourceOffset, PRUint32 count); #else //nsIStreamObserver interface - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); //nsIStreamListener interface @@ -564,7 +559,7 @@ NS_IMPL_ISUPPORTS(nsPluginCacheListener, kIStreamListenerIID); #ifdef NECKO NS_IMETHODIMP -nsPluginCacheListener::OnStartBinding(nsISupports* ctxt) +nsPluginCacheListener::OnStartRequest(nsISupports* ctxt) { char* aContentType = nsnull; nsIURI* aURL = nsnull; @@ -579,7 +574,7 @@ nsPluginCacheListener::OnStartBinding(nsISupports* ctxt) } // I have delibrately left out the remaining processing. // which should just be copied over from the other version of - // OnStartBinding. + // OnStartRequest. if (aContentType) nsCRT::free(aContentType); @@ -588,7 +583,7 @@ nsPluginCacheListener::OnStartBinding(nsISupports* ctxt) } #else NS_IMETHODIMP -nsPluginCacheListener::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsPluginCacheListener::OnStartRequest(nsIURI* aURL, const char *aContentType) { #ifdef USE_CACHE nsString urlString; @@ -697,11 +692,11 @@ nsPluginCacheListener::OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, P NS_IMETHODIMP #ifdef NECKO -nsPluginCacheListener::OnStopBinding(nsISupports* aContext, +nsPluginCacheListener::OnStopRequest(nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg) #else -nsPluginCacheListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +nsPluginCacheListener::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif // NECKO { #ifdef USE_CACHE @@ -772,10 +767,10 @@ nsPluginStreamListenerPeer::nsPluginStreamListenerPeer() mSetUpListener = PR_FALSE; mHost = nsnull; mGotProgress = PR_FALSE; - mOnStartBinding = PR_FALSE; + mOnStartRequest = PR_FALSE; mStreamType = nsPluginStreamType_Normal; - mOnStopBinding = PR_FALSE; + mOnStopRequest = PR_FALSE; mCacheDone = PR_FALSE; mStatus = NS_OK; } @@ -935,9 +930,9 @@ nsresult nsPluginStreamListenerPeer::InitializeFullPage(nsIPluginInstance *aInst #ifdef NECKO -NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartBinding(nsISupports* aContext) +NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartRequest(nsISupports* aContext) #else -NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { nsresult rv = NS_OK; @@ -993,7 +988,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartBinding(nsIURI* aURL, const cha if(mGotProgress == PR_TRUE && mSetUpListener == PR_FALSE) rv = SetUpStreamListener(aURL); - mOnStartBinding = PR_TRUE; + mOnStartRequest = PR_TRUE; #ifdef NECKO nsCRT::free(aContentType); #endif //NECKO @@ -1021,7 +1016,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnProgress(nsIURI* aURL, PRUint32 aPro if (NS_FAILED(rv)) return rv; #endif mPluginStreamInfo->SetLength(aProgressMax); - if(mOnStartBinding == PR_TRUE && mSetUpListener == PR_FALSE) + if(mOnStartRequest == PR_TRUE && mSetUpListener == PR_FALSE) rv = SetUpStreamListener(aURL); mGotProgress = PR_TRUE; @@ -1097,7 +1092,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(nsIURI* aURL, nsIInput } else { - // if we don't read from the stream, OnStopBinding will never be called + // if we don't read from the stream, OnStopRequest will never be called char* buffer = new char[aLength]; PRUint32 amountRead; rv = aIStream->Read(buffer, aLength, &amountRead); @@ -1107,12 +1102,12 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(nsIURI* aURL, nsIInput } #ifdef NECKO -NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopBinding( +NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest( nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg) #else -NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif // NECKO { nsresult rv = NS_OK; @@ -1146,7 +1141,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopBinding(nsIURI* aURL, nsresult a mStatus = aStatus; } - mOnStopBinding = PR_TRUE; + mOnStopRequest = PR_TRUE; #ifdef NECKO } #endif @@ -1222,9 +1217,9 @@ nsPluginStreamListenerPeer::OnFileAvailable(const char* aFilename) if((rv = mPStreamListener->OnFileAvailable((nsIPluginStreamInfo*)mPluginStreamInfo, aFilename)) != NS_OK) return rv; - // if OnStopBinding has already been called, we need to make sure the plugin gets notified - // we do this here because OnStopBinding must always be called after OnFileAvailable - if(mOnStopBinding) + // if OnStopRequest has already been called, we need to make sure the plugin gets notified + // we do this here because OnStopRequest must always be called after OnFileAvailable + if(mOnStopRequest) rv = mPStreamListener->OnStopBinding((nsIPluginStreamInfo*)mPluginStreamInfo, mStatus); mCacheDone = PR_TRUE; @@ -2068,7 +2063,7 @@ nsPluginHostImpl::GetPlugins(PRUint32 aPluginCount, nsIDOMPlugin* aPluginArray[] LoadPlugins(); nsPluginTag* plugin = mPlugins; - for (int i = 0; i < aPluginCount && plugin != nsnull; i++, plugin = plugin->mNext) { + for (PRUint32 i = 0; i < aPluginCount && plugin != nsnull; i++, plugin = plugin->mNext) { nsIDOMPlugin* domPlugin = new DOMPluginImpl(plugin); NS_IF_ADDREF(domPlugin); aPluginArray[i] = domPlugin; diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp index a3e4ef1ec38..fd813b36575 100644 --- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp @@ -64,18 +64,16 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else // nsIStreamListener - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream, @@ -607,9 +605,9 @@ NS_IMPL_ISUPPORTS(PluginListener, kIStreamListenerIID) NS_IMETHODIMP #ifdef NECKO -PluginListener::OnStartBinding(nsISupports *ctxt) +PluginListener::OnStartRequest(nsISupports *ctxt) #else -PluginListener::OnStartBinding(nsIURI* aURL, const char *contentType) +PluginListener::OnStartRequest(nsIURI* aURL, const char *contentType) #endif { #ifdef NECKO @@ -634,9 +632,9 @@ PluginListener::OnStartBinding(nsIURI* aURL, const char *contentType) return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStartBinding(ctxt); + return mNextStream->OnStartRequest(ctxt); #else - return mNextStream->OnStartBinding(aURL, contentType); + return mNextStream->OnStartRequest(aURL, contentType); #endif } @@ -663,9 +661,9 @@ PluginListener::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -PluginListener::OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +PluginListener::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -PluginListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, +PluginListener::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { @@ -673,9 +671,9 @@ PluginListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStopBinding(ctxt, status, errorMsg); + return mNextStream->OnStopRequest(ctxt, status, errorMsg); #else - return mNextStream->OnStopBinding(aURL, aStatus, aMsg); + return mNextStream->OnStopRequest(aURL, aStatus, aMsg); #endif } diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index ebdde9f04e7..f5604aaa656 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -392,23 +392,21 @@ public: NS_IMETHOD OnProgress(nsISupports* context, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsISupports* context, const PRUnichar* aMmsg); // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else //nsIStreamObserver interface - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); //nsIStreamListener interface @@ -449,10 +447,10 @@ private: nsPluginStreamType mStreamType; nsIPluginHost *mHost; PRBool mGotProgress; - PRBool mOnStartBinding; + PRBool mOnStartRequest; PRBool mCacheDone; - PRBool mOnStopBinding; + PRBool mOnStopRequest; nsresult mStatus; #ifdef USE_CACHE @@ -480,27 +478,24 @@ public: NS_IMETHOD OnStatus(nsISupports* context, const PRUnichar* aMsg); // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg) { return NS_OK; } + const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, - PRUint32 sourceOffset, PRUint32 count); + PRUint32 sourceOffset, PRUint32 count); #else //nsIStreamObserver interface - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); //nsIStreamListener interface @@ -564,7 +559,7 @@ NS_IMPL_ISUPPORTS(nsPluginCacheListener, kIStreamListenerIID); #ifdef NECKO NS_IMETHODIMP -nsPluginCacheListener::OnStartBinding(nsISupports* ctxt) +nsPluginCacheListener::OnStartRequest(nsISupports* ctxt) { char* aContentType = nsnull; nsIURI* aURL = nsnull; @@ -579,7 +574,7 @@ nsPluginCacheListener::OnStartBinding(nsISupports* ctxt) } // I have delibrately left out the remaining processing. // which should just be copied over from the other version of - // OnStartBinding. + // OnStartRequest. if (aContentType) nsCRT::free(aContentType); @@ -588,7 +583,7 @@ nsPluginCacheListener::OnStartBinding(nsISupports* ctxt) } #else NS_IMETHODIMP -nsPluginCacheListener::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsPluginCacheListener::OnStartRequest(nsIURI* aURL, const char *aContentType) { #ifdef USE_CACHE nsString urlString; @@ -697,11 +692,11 @@ nsPluginCacheListener::OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, P NS_IMETHODIMP #ifdef NECKO -nsPluginCacheListener::OnStopBinding(nsISupports* aContext, +nsPluginCacheListener::OnStopRequest(nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg) #else -nsPluginCacheListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +nsPluginCacheListener::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif // NECKO { #ifdef USE_CACHE @@ -772,10 +767,10 @@ nsPluginStreamListenerPeer::nsPluginStreamListenerPeer() mSetUpListener = PR_FALSE; mHost = nsnull; mGotProgress = PR_FALSE; - mOnStartBinding = PR_FALSE; + mOnStartRequest = PR_FALSE; mStreamType = nsPluginStreamType_Normal; - mOnStopBinding = PR_FALSE; + mOnStopRequest = PR_FALSE; mCacheDone = PR_FALSE; mStatus = NS_OK; } @@ -935,9 +930,9 @@ nsresult nsPluginStreamListenerPeer::InitializeFullPage(nsIPluginInstance *aInst #ifdef NECKO -NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartBinding(nsISupports* aContext) +NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartRequest(nsISupports* aContext) #else -NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { nsresult rv = NS_OK; @@ -993,7 +988,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStartBinding(nsIURI* aURL, const cha if(mGotProgress == PR_TRUE && mSetUpListener == PR_FALSE) rv = SetUpStreamListener(aURL); - mOnStartBinding = PR_TRUE; + mOnStartRequest = PR_TRUE; #ifdef NECKO nsCRT::free(aContentType); #endif //NECKO @@ -1021,7 +1016,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnProgress(nsIURI* aURL, PRUint32 aPro if (NS_FAILED(rv)) return rv; #endif mPluginStreamInfo->SetLength(aProgressMax); - if(mOnStartBinding == PR_TRUE && mSetUpListener == PR_FALSE) + if(mOnStartRequest == PR_TRUE && mSetUpListener == PR_FALSE) rv = SetUpStreamListener(aURL); mGotProgress = PR_TRUE; @@ -1097,7 +1092,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(nsIURI* aURL, nsIInput } else { - // if we don't read from the stream, OnStopBinding will never be called + // if we don't read from the stream, OnStopRequest will never be called char* buffer = new char[aLength]; PRUint32 amountRead; rv = aIStream->Read(buffer, aLength, &amountRead); @@ -1107,12 +1102,12 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(nsIURI* aURL, nsIInput } #ifdef NECKO -NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopBinding( +NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest( nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg) #else -NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif // NECKO { nsresult rv = NS_OK; @@ -1146,7 +1141,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopBinding(nsIURI* aURL, nsresult a mStatus = aStatus; } - mOnStopBinding = PR_TRUE; + mOnStopRequest = PR_TRUE; #ifdef NECKO } #endif @@ -1222,9 +1217,9 @@ nsPluginStreamListenerPeer::OnFileAvailable(const char* aFilename) if((rv = mPStreamListener->OnFileAvailable((nsIPluginStreamInfo*)mPluginStreamInfo, aFilename)) != NS_OK) return rv; - // if OnStopBinding has already been called, we need to make sure the plugin gets notified - // we do this here because OnStopBinding must always be called after OnFileAvailable - if(mOnStopBinding) + // if OnStopRequest has already been called, we need to make sure the plugin gets notified + // we do this here because OnStopRequest must always be called after OnFileAvailable + if(mOnStopRequest) rv = mPStreamListener->OnStopBinding((nsIPluginStreamInfo*)mPluginStreamInfo, mStatus); mCacheDone = PR_TRUE; @@ -2068,7 +2063,7 @@ nsPluginHostImpl::GetPlugins(PRUint32 aPluginCount, nsIDOMPlugin* aPluginArray[] LoadPlugins(); nsPluginTag* plugin = mPlugins; - for (int i = 0; i < aPluginCount && plugin != nsnull; i++, plugin = plugin->mNext) { + for (PRUint32 i = 0; i < aPluginCount && plugin != nsnull; i++, plugin = plugin->mNext) { nsIDOMPlugin* domPlugin = new DOMPluginImpl(plugin); NS_IF_ADDREF(domPlugin); aPluginArray[i] = domPlugin; diff --git a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp index a3e4ef1ec38..fd813b36575 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp @@ -64,18 +64,16 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else // nsIStreamListener - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream, @@ -607,9 +605,9 @@ NS_IMPL_ISUPPORTS(PluginListener, kIStreamListenerIID) NS_IMETHODIMP #ifdef NECKO -PluginListener::OnStartBinding(nsISupports *ctxt) +PluginListener::OnStartRequest(nsISupports *ctxt) #else -PluginListener::OnStartBinding(nsIURI* aURL, const char *contentType) +PluginListener::OnStartRequest(nsIURI* aURL, const char *contentType) #endif { #ifdef NECKO @@ -634,9 +632,9 @@ PluginListener::OnStartBinding(nsIURI* aURL, const char *contentType) return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStartBinding(ctxt); + return mNextStream->OnStartRequest(ctxt); #else - return mNextStream->OnStartBinding(aURL, contentType); + return mNextStream->OnStartRequest(aURL, contentType); #endif } @@ -663,9 +661,9 @@ PluginListener::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -PluginListener::OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +PluginListener::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -PluginListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, +PluginListener::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { @@ -673,9 +671,9 @@ PluginListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, return NS_ERROR_FAILURE; } #ifdef NECKO - return mNextStream->OnStopBinding(ctxt, status, errorMsg); + return mNextStream->OnStopRequest(ctxt, status, errorMsg); #else - return mNextStream->OnStopBinding(aURL, aStatus, aMsg); + return mNextStream->OnStopRequest(aURL, aStatus, aMsg); #endif } diff --git a/mozilla/netwerk/base/public/nsIChannel.idl b/mozilla/netwerk/base/public/nsIChannel.idl index a06c553f64a..6b07c1d026e 100644 --- a/mozilla/netwerk/base/public/nsIChannel.idl +++ b/mozilla/netwerk/base/public/nsIChannel.idl @@ -24,6 +24,8 @@ interface nsIOutputStream; interface nsIStreamObserver; interface nsIStreamListener; +typedef unsigned long nsLoadFlags; + /** * nsIChannel is the abstract base class for transports and URLs. * It's abstract in that it doesn't provide a means to specify the @@ -100,7 +102,7 @@ interface nsIChannel : nsIRequest * attributes with the LOAD_QUIET bit set causes the loading process to * not deliver status notifications to the program performing the load. */ - attribute unsigned long LoadAttributes; + attribute nsLoadFlags LoadAttributes; /** * Returns the content MIME type of the channel if available. Note that the diff --git a/mozilla/netwerk/base/public/nsIIOService.idl b/mozilla/netwerk/base/public/nsIIOService.idl index deeefd46751..1551cfaa4bc 100644 --- a/mozilla/netwerk/base/public/nsIIOService.idl +++ b/mozilla/netwerk/base/public/nsIIOService.idl @@ -139,7 +139,7 @@ interface nsIIOService : nsISupports * their use is not required by other parts of the system, they are primarily * a convenience for the caller. */ - nsILoadGroup NewLoadGroup(); + nsILoadGroup NewLoadGroup(in nsILoadGroup parent); }; %{C++ diff --git a/mozilla/netwerk/base/public/nsILoadGroup.idl b/mozilla/netwerk/base/public/nsILoadGroup.idl index 3bdc75b1b9b..b6fb5beb2e8 100644 --- a/mozilla/netwerk/base/public/nsILoadGroup.idl +++ b/mozilla/netwerk/base/public/nsILoadGroup.idl @@ -20,10 +20,16 @@ interface nsIChannel; interface nsISimpleEnumerator; +interface nsIStreamObserver; +/** + * A load group maintains a collection of active URL requests. + */ [scriptable, uuid(19845248-29ab-11d3-8cce-0060b0fc14a3)] interface nsILoadGroup : nsIRequest { + void Init(in nsILoadGroup parent); + /** * Accesses the default load attributes for the group, returned as * a flag word. Setting the default load attributes will cause them @@ -48,6 +54,23 @@ interface nsILoadGroup : nsIRequest */ readonly attribute nsISimpleEnumerator Channels; + /** + * Adds an observer to the group. The observer's methods will be + * called for each channel in the group. + */ + void AddObserver(in nsIStreamObserver observer); + + /** + * Removes an observer from the group. + */ + void RemoveObserver(in nsIStreamObserver observer); + + /** + * Returns the observers contained directly in this group. + * Enumerator element type: nsIStreamObserver. + */ + readonly attribute nsISimpleEnumerator Observers; + /** * Adds a new sub-group to the group. */ diff --git a/mozilla/netwerk/base/public/nsIPrompt.idl b/mozilla/netwerk/base/public/nsIPrompt.idl index ea59265b77f..6f0c92737dc 100644 --- a/mozilla/netwerk/base/public/nsIPrompt.idl +++ b/mozilla/netwerk/base/public/nsIPrompt.idl @@ -21,14 +21,46 @@ [scriptable, uuid(a63f70c0-148b-11d3-9333-00104ba0fd40)] interface nsIPrompt : nsISupports { - boolean Confirm(in nsISupports ctxt, in wstring text); + /** + * Puts up an alert dialog with an OK button. + */ + void Alert(in wstring text); - boolean Prompt(in nsISupports ctxt, in wstring text, - in wstring defaultText, out wstring result); + /** + * Puts up a dialog with OK and Cancel buttons. + * @return true for OK, false for Cancel + */ + boolean Confirm(in wstring text); - boolean PromptUsernameAndPassword(in nsISupports ctxt, in wstring text, - out wstring user, out wstring pwd); + /** + * Puts up a dialog with OK and Cancel buttons, and + * a message with a single checkbox. + * @return true for OK, false for Cancel + */ + boolean ConfirmCheck(in wstring text, + in wstring checkMsg, + out boolean checkValue); - boolean PromptPassword(in nsISupports ctxt, in wstring text, + /** + * Puts up a text input dialog with OK and Cancel buttons. + * @return true for OK, false for Cancel + */ + boolean Prompt(in wstring text, + in wstring defaultText, + out wstring result); + + /** + * Puts up a username/password dialog with OK and Cancel buttons. + * @return true for OK, false for Cancel + */ + boolean PromptUsernameAndPassword(in wstring text, + out wstring user, + out wstring pwd); + + /** + * Puts up a password dialog with OK and Cancel buttons. + * @return true for OK, false for Cancel + */ + boolean PromptPassword(in wstring text, out wstring pwd); }; diff --git a/mozilla/netwerk/base/public/nsIRequest.idl b/mozilla/netwerk/base/public/nsIRequest.idl index 69e4602d640..c2a4365ed4a 100644 --- a/mozilla/netwerk/base/public/nsIRequest.idl +++ b/mozilla/netwerk/base/public/nsIRequest.idl @@ -21,6 +21,13 @@ [scriptable, uuid(F2CAABA0-2F25-11d3-A164-0050041CAF44)] interface nsIRequest : nsISupports { + /** + * Returns true if the request is pending (active). Returns false + * after completion or successful calling Cancel. Suspended requests + * are still considered pending. + */ + boolean IsPending(); + /** * Cancels the current request. This will close any open input or * output streams and terminate any async requests. diff --git a/mozilla/netwerk/base/public/nsIStreamObserver.idl b/mozilla/netwerk/base/public/nsIStreamObserver.idl index 09e14d61588..8bfaccac20d 100644 --- a/mozilla/netwerk/base/public/nsIStreamObserver.idl +++ b/mozilla/netwerk/base/public/nsIStreamObserver.idl @@ -23,20 +23,9 @@ interface nsIEventQueue; [scriptable, uuid(fd91e2e0-1481-11d3-9333-00104ba0fd40)] interface nsIStreamObserver : nsISupports { - void OnStartBinding(in nsISupports ctxt); - - void OnStopBinding(in nsISupports ctxt, - in nsresult status, - in wstring errorMsg); - - /** - * Called after the stream is opened for reading or writing. - * The content type or headers may be accessed after this method - * is called. - */ void OnStartRequest(in nsISupports ctxt); - void OnStopRequest(in nsISupports ctxt, + void OnStopRequest(in nsISupports ctxt, in nsresult status, in wstring errorMsg); }; @@ -51,7 +40,7 @@ NS_NewAsyncStreamObserver(nsIStreamObserver* *result, nsIEventQueue* eventQueue, nsIStreamObserver* receiver); -// Generic status codes for OnStopBinding: +// Generic status codes for OnStopRequest: #define NS_BINDING_SUCCEEDED NS_OK #define NS_BINDING_FAILED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 1) #define NS_BINDING_ABORTED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 2) diff --git a/mozilla/netwerk/base/public/nsIURI.idl b/mozilla/netwerk/base/public/nsIURI.idl index b092aeb3a6d..4924e5ba07b 100644 --- a/mozilla/netwerk/base/public/nsIURI.idl +++ b/mozilla/netwerk/base/public/nsIURI.idl @@ -116,12 +116,34 @@ interface nsIURI : nsISupports * channel is opened the URI may get redirected to a new location. */ nsIURI Clone(); - - /** - * Returns a new URI string that merges the relative part with defaults - * from the current URI's location. If the relative part actually - * specifies an absolute URI, the string is returned as is. - */ - string MakeAbsolute(in string relativePart); }; +%{C++ + +/** + * Protocol writers can obtain a very basic (ok, degenerate) implementation + * of nsIURI by calling the component manager with NS_SIMPLEURI_CID. The + * implementation returned will only parse things of the form: + * + * about:cache + * \ / \ / + * --- --- + * | | + * Scheme Path + * + * where the path is everything after the colon. Note that this is probably + * only useful for cases like about: or javascript: URIs. + * + * *** What you most likely will want is NS_STANDARDURL_CID which is much more + * full featured. Look at nsIURL.idl for more details on it. + */ + +#define NS_SIMPLEURI_CID \ +{ /* e0da1d70-2f7b-11d3-8cd0-0060b0fc14a3 */ \ + 0xe0da1d70, \ + 0x2f7b, \ + 0x11d3, \ + {0x8c, 0xd0, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \ +} + +%} diff --git a/mozilla/netwerk/base/public/nsIURL.idl b/mozilla/netwerk/base/public/nsIURL.idl index 6f631c88ea8..2e6671b3815 100644 --- a/mozilla/netwerk/base/public/nsIURL.idl +++ b/mozilla/netwerk/base/public/nsIURL.idl @@ -63,7 +63,6 @@ interface nsIURL : nsIURI %{C++ - /** * Protocol writers can obtain a default nsIURL implementation by calling the * component manager with NS_STANDARDURL_CID. The implementation returned will diff --git a/mozilla/netwerk/base/src/Makefile.in b/mozilla/netwerk/base/src/Makefile.in index b22117b15ee..86c25f83da9 100644 --- a/mozilla/netwerk/base/src/Makefile.in +++ b/mozilla/netwerk/base/src/Makefile.in @@ -32,6 +32,7 @@ CPPSRCS = \ nsSocketTransport.cpp \ nsSocketTransportService.cpp \ nsStandardUrl.cpp \ + nsSimpleURI.cpp \ nsNetModuleMgr.cpp \ nsNetModRegEntry.cpp \ nsLoadGroup.cpp \ diff --git a/mozilla/netwerk/base/src/makefile.win b/mozilla/netwerk/base/src/makefile.win index d2570287acb..2ae5316f1bc 100644 --- a/mozilla/netwerk/base/src/makefile.win +++ b/mozilla/netwerk/base/src/makefile.win @@ -34,6 +34,7 @@ CPP_OBJS = \ .\$(OBJDIR)\nsSocketTransport.obj \ .\$(OBJDIR)\nsSocketTransportService.obj \ .\$(OBJDIR)\nsStandardUrl.obj \ + .\$(OBJDIR)\nsSimpleURI.obj \ .\$(OBJDIR)\nsNetModuleMgr.obj \ .\$(OBJDIR)\nsNetModRegEntry.obj \ .\$(OBJDIR)\nsLoadGroup.obj \ diff --git a/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp b/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp index 21e3deed5d1..42a19c18558 100644 --- a/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp +++ b/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp @@ -29,10 +29,6 @@ public: NS_DECL_ISUPPORTS // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports* context); - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg); NS_IMETHOD OnStartRequest(nsISupports* context); NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, @@ -72,18 +68,6 @@ public: NS_DECL_ISUPPORTS_INHERITED // nsIStreamListener methods: - NS_IMETHOD OnStartBinding(nsISupports* context) - { - return nsAsyncStreamObserver::OnStartBinding(context); - } - - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg) - { - return nsAsyncStreamObserver::OnStopBinding(context, aStatus, aMsg); - } - NS_IMETHOD OnStartRequest(nsISupports* context) { return nsAsyncStreamObserver::OnStartRequest(context); @@ -194,128 +178,6 @@ NS_IMPL_ISUPPORTS_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver, nsIStreamListener); -//////////////////////////////////////////////////////////////////////////////// -// -// OnStartBinding... -// -//////////////////////////////////////////////////////////////////////////////// - -class nsOnStartBindingEvent : public nsStreamListenerEvent -{ -public: - nsOnStartBindingEvent(nsAsyncStreamObserver* listener, - nsISupports* context) - : nsStreamListenerEvent(listener, context), mContentType(nsnull) {} - virtual ~nsOnStartBindingEvent(); - - NS_IMETHOD HandleEvent(); - -protected: - char* mContentType; -}; - -nsOnStartBindingEvent::~nsOnStartBindingEvent() -{ - if (mContentType) - delete[] mContentType; -} - -NS_IMETHODIMP -nsOnStartBindingEvent::HandleEvent() -{ - nsIStreamObserver* receiver = (nsIStreamObserver*)mListener->GetReceiver(); - return receiver->OnStartBinding(mContext); -} - -NS_IMETHODIMP -nsAsyncStreamObserver::OnStartBinding(nsISupports* context) -{ - nsresult rv = GetStatus(); - if (NS_FAILED(rv)) return rv; - - nsOnStartBindingEvent* event = - new nsOnStartBindingEvent(this, context); - if (event == nsnull) - return NS_ERROR_OUT_OF_MEMORY; - - rv = event->Fire(mEventQueue); - if (NS_FAILED(rv)) goto failed; - return rv; - - failed: - delete event; - return rv; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// OnStopBinding -// -//////////////////////////////////////////////////////////////////////////////// - -class nsOnStopBindingEvent : public nsStreamListenerEvent -{ -public: - nsOnStopBindingEvent(nsAsyncStreamObserver* listener, - nsISupports* context) - : nsStreamListenerEvent(listener, context), - mStatus(NS_OK), mMessage(nsnull) {} - virtual ~nsOnStopBindingEvent(); - - nsresult Init(nsresult status, const PRUnichar* aMsg); - NS_IMETHOD HandleEvent(); - -protected: - nsresult mStatus; - PRUnichar* mMessage; -}; - -nsOnStopBindingEvent::~nsOnStopBindingEvent() -{ -} - -nsresult -nsOnStopBindingEvent::Init(nsresult status, const PRUnichar* aMsg) -{ - mStatus = status; - mMessage = (PRUnichar*)aMsg; - return NS_OK; -} - -NS_IMETHODIMP -nsOnStopBindingEvent::HandleEvent() -{ - nsIStreamObserver* receiver = (nsIStreamObserver*)mListener->GetReceiver(); - return receiver->OnStopBinding(mContext, mStatus, mMessage); -} - -NS_IMETHODIMP -nsAsyncStreamObserver::OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg) -{ - nsresult rv; - - // - // The OnStopBindiong event should always be fired, so do not - // check the status... - // - nsOnStopBindingEvent* event = - new nsOnStopBindingEvent(this, context); - if (event == nsnull) - return NS_ERROR_OUT_OF_MEMORY; - - rv = event->Init(aStatus, aMsg); - if (NS_FAILED(rv)) goto failed; - rv = event->Fire(mEventQueue); - if (NS_FAILED(rv)) goto failed; - return rv; - - failed: - delete event; - return rv; -} - //////////////////////////////////////////////////////////////////////////////// // // OnStartRequest... diff --git a/mozilla/netwerk/base/src/nsFileTransport.cpp b/mozilla/netwerk/base/src/nsFileTransport.cpp index b6894a2fca2..5a6d2c3a44a 100644 --- a/mozilla/netwerk/base/src/nsFileTransport.cpp +++ b/mozilla/netwerk/base/src/nsFileTransport.cpp @@ -121,6 +121,13 @@ nsFileTransport::QueryInterface(const nsIID& aIID, void* *aInstancePtr) //////////////////////////////////////////////////////////////////////////////// // nsIRequest methods: +NS_IMETHODIMP +nsFileTransport::IsPending(PRBool *result) +{ + *result = mState != ENDED; + return NS_OK; +} + NS_IMETHODIMP nsFileTransport::Cancel(void) { @@ -265,7 +272,7 @@ nsFileTransport::Process(void) nsISupports* fs; nsFileSpec spec(mPath); - mStatus = mListener->OnStartBinding(mContext); // always send the start notification + mStatus = mListener->OnStartRequest(mContext); // always send the start notification if (NS_FAILED(mStatus)) goto error; mStatus = NS_NewTypicalInputFileStream(&fs, spec); @@ -312,7 +319,7 @@ nsFileTransport::Process(void) nsISupports* fs; nsFileSpec spec(mPath); - mStatus = mListener->OnStartBinding(mContext); // always send the start notification + mStatus = mListener->OnStartRequest(mContext); // always send the start notification if (NS_FAILED(mStatus)) goto error; mStatus = NS_NewTypicalOutputFileStream(&fs, spec); @@ -342,7 +349,7 @@ nsFileTransport::Process(void) mFileStream = nsnull; // XXX where do we get the error message? - (void)mListener->OnStopBinding(mContext, mStatus, nsnull); + (void)mListener->OnStopRequest(mContext, mStatus, nsnull); mState = ENDED; break; diff --git a/mozilla/netwerk/base/src/nsFileTransport.h b/mozilla/netwerk/base/src/nsFileTransport.h index c2d93c1a56f..8d7152f4be2 100644 --- a/mozilla/netwerk/base/src/nsFileTransport.h +++ b/mozilla/netwerk/base/src/nsFileTransport.h @@ -37,6 +37,7 @@ public: NS_DECL_ISUPPORTS // nsIRequest methods: + NS_IMETHOD IsPending(PRBool *result); NS_IMETHOD Cancel(void); NS_IMETHOD Suspend(void); NS_IMETHOD Resume(void); diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp index 50e5d81b0b3..87a26743941 100644 --- a/mozilla/netwerk/base/src/nsIOService.cpp +++ b/mozilla/netwerk/base/src/nsIOService.cpp @@ -93,10 +93,7 @@ nsIOService::GetProtocolHandler(const char* scheme, nsIProtocolHandler* *result) progID += scheme; progID.ToCString(buf, MAX_NET_PROGID_LENGTH); - nsIProtocolHandler* handler; - rv = nsServiceManager::GetService(buf, nsCOMTypeInfo::GetIID(), - (nsISupports**)&handler); - + NS_WITH_SERVICE(nsIProtocolHandler, handler, buf, &rv); if (NS_FAILED(rv)) return rv; *result = handler; @@ -328,10 +325,21 @@ nsIOService::NewChannelFromNativePath(const char *nativePath, nsIFileChannel **r } NS_IMETHODIMP -nsIOService::NewLoadGroup(nsILoadGroup **result) +nsIOService::NewLoadGroup(nsILoadGroup* parent, nsILoadGroup **result) { - return nsLoadGroup::Create(nsnull, nsCOMTypeInfo::GetIID(), - (void**)result); + nsresult rv; + nsILoadGroup* group; + rv = nsLoadGroup::Create(nsnull, nsCOMTypeInfo::GetIID(), + (void**)&group); + if (NS_FAILED(rv)) return rv; + + rv = group->Init(parent); + if (NS_FAILED(rv)) { + NS_RELEASE(group); + return rv; + } + *result = group; + return NS_OK; } //////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/base/src/nsIOService.h b/mozilla/netwerk/base/src/nsIOService.h index 16ca92ddd3c..74faf8c01fd 100644 --- a/mozilla/netwerk/base/src/nsIOService.h +++ b/mozilla/netwerk/base/src/nsIOService.h @@ -52,7 +52,7 @@ public: NS_IMETHOD NewAsyncStreamListener(nsIStreamListener *receiver, nsIEventQueue *eventQueue, nsIStreamListener **_retval); NS_IMETHOD NewSyncStreamListener(nsIInputStream **inStream, nsIBufferOutputStream **outStream, nsIStreamListener **_retval); NS_IMETHOD NewChannelFromNativePath(const char *nativePath, nsIFileChannel **_retval); - NS_IMETHOD NewLoadGroup(nsILoadGroup **result); + NS_IMETHOD NewLoadGroup(nsILoadGroup* parent, nsILoadGroup **result); // nsIOService methods: nsIOService(); diff --git a/mozilla/netwerk/base/src/nsLoadGroup.cpp b/mozilla/netwerk/base/src/nsLoadGroup.cpp index 8adf3a25fcb..8dbe70c235f 100644 --- a/mozilla/netwerk/base/src/nsLoadGroup.cpp +++ b/mozilla/netwerk/base/src/nsLoadGroup.cpp @@ -24,6 +24,7 @@ #include "nsEnumeratorUtils.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); +static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); //////////////////////////////////////////////////////////////////////////////// @@ -36,6 +37,8 @@ nsLoadGroup::nsLoadGroup(nsISupports* outer) nsLoadGroup::~nsLoadGroup() { + nsresult rv = Cancel(); + NS_ASSERTION(NS_SUCCEEDED(rv), "Cancel failed"); NS_IF_RELEASE(mChannels); NS_IF_RELEASE(mSubGroups); } @@ -72,7 +75,7 @@ nsLoadGroup::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr) // nsIRequest methods: nsresult -nsLoadGroup::Iterate(IterateFun fun) +nsLoadGroup::PropagateDown(PropagateDownFun fun) { nsresult rv; PRUint32 i; @@ -101,6 +104,38 @@ nsLoadGroup::Iterate(IterateFun fun) return NS_OK; } +NS_IMETHODIMP +nsLoadGroup::IsPending(PRBool *result) +{ + nsresult rv; + PRUint32 count; + rv = mChannels->Count(&count); + if (count > 0) { + *result = PR_FALSE; + return NS_OK; + } + + PRUint32 i; + rv = mSubGroups->Count(&count); + if (NS_FAILED(rv)) return rv; + for (i = 0; i < count; i++) { + nsIRequest* req = NS_STATIC_CAST(nsIRequest*, mSubGroups->ElementAt(i)); + if (req == nsnull) + return NS_ERROR_FAILURE; + PRBool pending; + rv = req->IsPending(&pending); + NS_RELEASE(req); + if (NS_FAILED(rv)) return rv; + if (pending) { + *result = PR_FALSE; + return NS_OK; + } + } + + *result = PR_TRUE; + return NS_OK; +} + static nsresult CancelFun(nsIRequest* req) { @@ -110,7 +145,7 @@ CancelFun(nsIRequest* req) NS_IMETHODIMP nsLoadGroup::Cancel() { - return Iterate(CancelFun); + return PropagateDown(CancelFun); } static nsresult @@ -122,7 +157,7 @@ SuspendFun(nsIRequest* req) NS_IMETHODIMP nsLoadGroup::Suspend() { - return Iterate(SuspendFun); + return PropagateDown(SuspendFun); } static nsresult @@ -134,11 +169,19 @@ ResumeFun(nsIRequest* req) NS_IMETHODIMP nsLoadGroup::Resume() { - return Iterate(ResumeFun); + return PropagateDown(ResumeFun); } //////////////////////////////////////////////////////////////////////////////// // nsILoadGroup methods: + +NS_IMETHODIMP +nsLoadGroup::Init(nsILoadGroup *parent) +{ +// mParent = parent; // weak ref + parent->AddSubGroup(this); // XXX + return NS_OK; +} NS_IMETHODIMP nsLoadGroup::GetDefaultLoadAttributes(PRUint32 *aDefaultLoadAttributes) @@ -176,15 +219,35 @@ nsLoadGroup::GetChannels(nsISimpleEnumerator * *aChannels) return NS_NewArrayEnumerator(aChannels, mChannels); } +NS_IMETHODIMP +nsLoadGroup::AddObserver(nsIStreamObserver *observer) +{ + return mObservers->AppendElement(observer); +} + +NS_IMETHODIMP +nsLoadGroup::RemoveObserver(nsIStreamObserver *observer) +{ + return mObservers->RemoveElement(observer); +} + +NS_IMETHODIMP +nsLoadGroup::GetObservers(nsISimpleEnumerator * *aObservers) +{ + return NS_NewArrayEnumerator(aObservers, mObservers); +} + NS_IMETHODIMP nsLoadGroup::AddSubGroup(nsILoadGroup *group) { +// group->mParent = this; // XXX return mSubGroups->AppendElement(group); } NS_IMETHODIMP nsLoadGroup::RemoveSubGroup(nsILoadGroup *group) { +// group->mParent = nsnull; // XXX return mSubGroups->RemoveElement(group); } @@ -195,3 +258,99 @@ nsLoadGroup::GetSubGroups(nsISimpleEnumerator * *aSubGroups) } //////////////////////////////////////////////////////////////////////////////// +// nsIStreamObserver methods: + +nsresult +nsLoadGroup::PropagateUp(PropagateUpFun fun, void* closure) +{ + nsresult rv; + PRUint32 i; + PRUint32 count; + + for (nsLoadGroup* group = this; group != nsnull; group = group->mParent) { + rv = group->mObservers->Count(&count); + if (NS_FAILED(rv)) return rv; + for (i = 0; i < count; i++) { + nsIStreamObserver* obs = + NS_STATIC_CAST(nsIStreamObserver*, group->mObservers->ElementAt(i)); + if (obs == nsnull) + return NS_ERROR_FAILURE; + rv = fun(obs, closure); + NS_RELEASE(obs); + if (NS_FAILED(rv)) return rv; + } + } + return NS_OK; +} + +static nsresult +OnStartRequestFun(nsIStreamObserver* obs, void* closure) +{ + nsISupports* ctxt = (nsISupports*)closure; + return obs->OnStartRequest(ctxt); +} + +NS_IMETHODIMP +nsLoadGroup::OnStartRequest(nsISupports *ctxt) +{ + return PropagateUp(OnStartRequestFun, ctxt); +} + +struct OnStopRequestArgs { + nsISupports* ctxt; + nsresult status; + const PRUnichar* errorMsg; +}; + +static nsresult +OnStopRequestFun(nsIStreamObserver* obs, void* closure) +{ + OnStopRequestArgs* args = (OnStopRequestArgs*)closure; + return obs->OnStopRequest(args->ctxt, args->status, args->errorMsg); +} + +NS_IMETHODIMP +nsLoadGroup::OnStopRequest(nsISupports *ctxt, nsresult status, + const PRUnichar *errorMsg) +{ + OnStopRequestArgs args; + args.ctxt = ctxt; + args.status = status; + args.errorMsg = errorMsg; + return PropagateUp(OnStartRequestFun, &args); +} + +//////////////////////////////////////////////////////////////////////////////// +// nsIStreamListener methods: + +struct OnDataAvailableArgs { + nsISupports* ctxt; + nsIInputStream *inStr; + PRUint32 sourceOffset; + PRUint32 count; +}; + +static nsresult +OnDataAvailableFun(nsIStreamObserver* obs, void* closure) +{ + OnDataAvailableArgs* args = (OnDataAvailableArgs*)closure; + nsIStreamListener* l = NS_STATIC_CAST(nsIStreamListener*, obs); + return l->OnDataAvailable(args->ctxt, args->inStr, + args->sourceOffset, args->count); +} + +NS_IMETHODIMP +nsLoadGroup::OnDataAvailable(nsISupports *ctxt, + nsIInputStream *inStr, + PRUint32 sourceOffset, + PRUint32 count) +{ + OnDataAvailableArgs args; + args.ctxt = ctxt; + args.inStr = inStr; + args.sourceOffset = sourceOffset; + args.count = count; + return PropagateUp(OnDataAvailableFun, &args); +} + +//////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/base/src/nsLoadGroup.h b/mozilla/netwerk/base/src/nsLoadGroup.h index eb8f671922e..dfdd254da9b 100644 --- a/mozilla/netwerk/base/src/nsLoadGroup.h +++ b/mozilla/netwerk/base/src/nsLoadGroup.h @@ -20,17 +20,21 @@ #define nsLoadGroup_h__ #include "nsILoadGroup.h" +#include "nsIStreamListener.h" #include "nsAgg.h" class nsISupportsArray; -class nsLoadGroup : public nsILoadGroup +class nsLoadGroup : public nsILoadGroup, public nsIStreamListener { public: NS_DECL_AGGREGATED //////////////////////////////////////////////////////////////////////////// // nsIRequest methods: + + /* boolean IsPending (); */ + NS_IMETHOD IsPending(PRBool *result); /* void Cancel (); */ NS_IMETHOD Cancel(); @@ -44,6 +48,9 @@ public: //////////////////////////////////////////////////////////////////////////// // nsILoadGroup methods: + /* void Init (in nsILoadGroup parent); */ + NS_IMETHOD Init(nsILoadGroup *parent); + /* attribute unsigned long DefaultLoadAttributes; */ NS_IMETHOD GetDefaultLoadAttributes(PRUint32 *aDefaultLoadAttributes); NS_IMETHOD SetDefaultLoadAttributes(PRUint32 aDefaultLoadAttributes); @@ -57,6 +64,15 @@ public: /* readonly attribute nsISimpleEnumerator Channels; */ NS_IMETHOD GetChannels(nsISimpleEnumerator * *aChannels); + /* void AddObserver (in nsIStreamObserver observer); */ + NS_IMETHOD AddObserver(nsIStreamObserver *observer); + + /* void RemoveObserver (in nsIStreamObserver observer); */ + NS_IMETHOD RemoveObserver(nsIStreamObserver *observer); + + /* readonly attribute nsISimpleEnumerator Observers; */ + NS_IMETHOD GetObservers(nsISimpleEnumerator * *aObservers); + /* void AddSubGroup (in nsILoadGroup group); */ NS_IMETHOD AddSubGroup(nsILoadGroup *group); @@ -66,6 +82,20 @@ public: /* readonly attribute nsISimpleEnumerator SubGroups; */ NS_IMETHOD GetSubGroups(nsISimpleEnumerator * *aSubGroups); + //////////////////////////////////////////////////////////////////////////// + // nsIStreamObserver methods: + + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); + + //////////////////////////////////////////////////////////////////////////// + // nsIStreamListener methods: + + NS_IMETHOD OnDataAvailable(nsISupports *ctxt, + nsIInputStream *inStr, + PRUint32 sourceOffset, + PRUint32 count); + //////////////////////////////////////////////////////////////////////////// // nsLoadGroup methods: @@ -76,13 +106,18 @@ public: Create(nsISupports *aOuter, REFNSIID aIID, void **aResult); protected: - typedef nsresult (*IterateFun)(nsIRequest* request); - nsresult Iterate(IterateFun fun); + typedef nsresult (*PropagateDownFun)(nsIRequest* request); + nsresult PropagateDown(PropagateDownFun fun); + typedef nsresult (*PropagateUpFun)(nsIStreamObserver* obs, void* closure); + nsresult PropagateUp(PropagateUpFun fun, void* closure); protected: PRUint32 mDefaultLoadAttributes; nsISupportsArray* mChannels; + nsISupportsArray* mObservers; nsISupportsArray* mSubGroups; + nsLoadGroup* mParent; // weak ref + nsIStreamObserver* mObserver; // might be an nsIStreamListener too }; #endif // nsLoadGroup_h__ diff --git a/mozilla/netwerk/base/src/nsSocketTransport.cpp b/mozilla/netwerk/base/src/nsSocketTransport.cpp index 872fd944c5d..867b65855b6 100644 --- a/mozilla/netwerk/base/src/nsSocketTransport.cpp +++ b/mozilla/netwerk/base/src/nsSocketTransport.cpp @@ -294,11 +294,11 @@ nsresult nsSocketTransport::Process(PRInt16 aSelectFlags) case eSocketState_Connected: // Fire a notification for read... if (mReadListener) { - mReadListener->OnStartBinding(mReadContext); + mReadListener->OnStartRequest(mReadContext); } // Fire a notification for write... if (mWriteObserver) { - mWriteObserver->OnStartBinding(mWriteContext); + mWriteObserver->OnStartRequest(mWriteContext); } break; @@ -312,7 +312,7 @@ nsresult nsSocketTransport::Process(PRInt16 aSelectFlags) // Fire a notification that the read has finished... if (eSocketState_DoneWrite != mCurrentState) { if (mReadListener) { - mReadListener->OnStopBinding(mReadContext, rv, nsnull); + mReadListener->OnStopRequest(mReadContext, rv, nsnull); NS_RELEASE(mReadListener); NS_IF_RELEASE(mReadContext); } @@ -324,7 +324,7 @@ nsresult nsSocketTransport::Process(PRInt16 aSelectFlags) // Fire a notification that the write has finished... if (eSocketState_DoneRead != mCurrentState) { if (mWriteObserver) { - mWriteObserver->OnStopBinding(mWriteContext, rv, nsnull); + mWriteObserver->OnStopRequest(mWriteContext, rv, nsnull); NS_RELEASE(mWriteObserver); NS_IF_RELEASE(mWriteContext); } @@ -912,6 +912,14 @@ nsSocketTransport::QueryInterface(const nsIID& aIID, void* *aInstancePtr) // nsIRequest implementation... // -------------------------------------------------------------------------- // +NS_IMETHODIMP +nsSocketTransport::IsPending(PRBool *result) +{ + *result = mCurrentState != eSocketState_Created + && mCurrentState != eSocketState_Closed; + return NS_OK; +} + NS_IMETHODIMP nsSocketTransport::Cancel(void) { diff --git a/mozilla/netwerk/base/src/nsSocketTransport.h b/mozilla/netwerk/base/src/nsSocketTransport.h index e7e913ffeca..b49c06beae4 100644 --- a/mozilla/netwerk/base/src/nsSocketTransport.h +++ b/mozilla/netwerk/base/src/nsSocketTransport.h @@ -75,6 +75,7 @@ public: NS_DECL_ISUPPORTS // nsIRequest methods: + NS_IMETHOD IsPending(PRBool *result); NS_IMETHOD Cancel(void); NS_IMETHOD Suspend(void); NS_IMETHOD Resume(void); diff --git a/mozilla/netwerk/base/src/nsStandardUrl.cpp b/mozilla/netwerk/base/src/nsStandardUrl.cpp index ae3cb1d243a..d96b4cbcec4 100644 --- a/mozilla/netwerk/base/src/nsStandardUrl.cpp +++ b/mozilla/netwerk/base/src/nsStandardUrl.cpp @@ -48,6 +48,7 @@ nsStandardURL::~nsStandardURL() if (mScheme) delete[] mScheme; if (mPreHost) delete[] mPreHost; if (mHost) delete[] mHost; + if (mPath) delete[] mPath; if (mRef) delete[] mRef; if (mQuery) delete[] mQuery; if (mSpec) delete[] mSpec; @@ -250,12 +251,6 @@ nsStandardURL::Clone(nsIURI* *result) return NS_OK; } -NS_IMETHODIMP -nsStandardURL::MakeAbsolute(const char *relativePart, char **_retval) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - //////////////////////////////////////////////////////////////////////////////// // XXX recode to use nsString api's @@ -597,7 +592,7 @@ nsStandardURL::ReconstructSpec() } //////////////////////////////////////////////////////////////////////////////// -// nsIURI methods: +// nsIURL methods: NS_IMETHODIMP nsStandardURL::GetDirectory(char * *aDirectory) diff --git a/mozilla/netwerk/base/src/nsStandardUrl.h b/mozilla/netwerk/base/src/nsStandardUrl.h index 4fc0c8dfaf9..80b674a0fc2 100644 --- a/mozilla/netwerk/base/src/nsStandardUrl.h +++ b/mozilla/netwerk/base/src/nsStandardUrl.h @@ -68,11 +68,8 @@ public: /* nsIURI Clone (); */ NS_IMETHOD Clone(nsIURI **_retval); - /* string MakeAbsolute (in string relativePart); */ - NS_IMETHOD MakeAbsolute(const char *relativePart, char **_retval); - //////////////////////////////////////////////////////////////////////////// - // nsIURI methods: + // nsIURL methods: /* attribute string Directory; */ NS_IMETHOD GetDirectory(char * *aDirectory); diff --git a/mozilla/netwerk/base/src/nsSyncStreamListener.cpp b/mozilla/netwerk/base/src/nsSyncStreamListener.cpp index 54b14936460..ecadab3d758 100644 --- a/mozilla/netwerk/base/src/nsSyncStreamListener.cpp +++ b/mozilla/netwerk/base/src/nsSyncStreamListener.cpp @@ -30,10 +30,6 @@ public: NS_DECL_ISUPPORTS // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports* context); - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg); NS_IMETHOD OnStartRequest(nsISupports* context); NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, @@ -101,21 +97,6 @@ nsSyncStreamListener::QueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_NOINTERFACE; } -NS_IMETHODIMP -nsSyncStreamListener::OnStartBinding(nsISupports* context) -{ - return NS_OK; -} - -NS_IMETHODIMP -nsSyncStreamListener::OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg) -{ - // XXX what do we do with the status and error message? - return mOutputStream->Close(); -} - NS_IMETHODIMP nsSyncStreamListener::OnStartRequest(nsISupports* context) { diff --git a/mozilla/netwerk/base/tests/urltest.cpp b/mozilla/netwerk/base/tests/urltest.cpp index cdd0b39c18b..9c483d9a32b 100644 --- a/mozilla/netwerk/base/tests/urltest.cpp +++ b/mozilla/netwerk/base/tests/urltest.cpp @@ -82,9 +82,9 @@ public: NS_IMETHOD GetBindInfo(nsIURL* aURL, nsStreamBindingInfo* info); NS_IMETHOD OnProgress(nsIURL* aURL, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsIURL* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURL* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRUint32 length); - NS_IMETHOD OnStopBinding(nsIURL* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURL* aURL, nsresult status, const PRUnichar* aMsg); protected: ~TestConsumer(); @@ -142,10 +142,10 @@ NS_IMETHODIMP TestConsumer::OnStatus(nsIURL* aURL, const PRUnichar* aMsg) return 0; } -NS_IMETHODIMP TestConsumer::OnStartBinding(nsIURL* aURL, const char *aContentType) +NS_IMETHODIMP TestConsumer::OnStartRequest(nsIURL* aURL, const char *aContentType) { if (bTraceEnabled) { - printf("\n+++ TestConsumer::OnStartBinding: URL: %p, Content type: %s\n", aURL, aContentType); + printf("\n+++ TestConsumer::OnStartRequest: URL: %p, Content type: %s\n", aURL, aContentType); } return 0; @@ -177,10 +177,10 @@ NS_IMETHODIMP TestConsumer::OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStre } -NS_IMETHODIMP TestConsumer::OnStopBinding(nsIURL* aURL, nsresult status, const PRUnichar* aMsg) +NS_IMETHODIMP TestConsumer::OnStopRequest(nsIURL* aURL, nsresult status, const PRUnichar* aMsg) { if (bTraceEnabled) { - printf("\n+++ TestConsumer::OnStopBinding... URL: %p status: %d\n", aURL, status); + printf("\n+++ TestConsumer::OnStopRequest... URL: %p status: %d\n", aURL, status); } if (NS_FAILED(status)) { diff --git a/mozilla/netwerk/dns/src/nsDnsService.cpp b/mozilla/netwerk/dns/src/nsDnsService.cpp index ad144059d36..e3d3969324b 100644 --- a/mozilla/netwerk/dns/src/nsDnsService.cpp +++ b/mozilla/netwerk/dns/src/nsDnsService.cpp @@ -46,6 +46,7 @@ class nsDNSRequest : public nsIRequest nsDNSLookup* mHostNameLookup; // nsIRequest methods: + NS_IMETHOD IsPending(PRBool *result); NS_IMETHOD Cancel(void); NS_IMETHOD Suspend(void); NS_IMETHOD Resume(void); diff --git a/mozilla/netwerk/protocol/Makefile.in b/mozilla/netwerk/protocol/Makefile.in index a02837b4fa2..f1fff8811cb 100644 --- a/mozilla/netwerk/protocol/Makefile.in +++ b/mozilla/netwerk/protocol/Makefile.in @@ -26,6 +26,7 @@ MODULE = necko include $(DEPTH)/config/autoconf.mk DIRS= \ + about \ file \ resource \ ftp \ diff --git a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp index e12c87f462b..92c36cea43e 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp +++ b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp @@ -139,6 +139,13 @@ nsFileChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) // From nsIRequest //////////////////////////////////////////////////////////////////////////////// +NS_IMETHODIMP +nsFileChannel::IsPending(PRBool *result) +{ + *result = mState != QUIESCENT; + return NS_OK; +} + NS_IMETHODIMP nsFileChannel::Cancel() { @@ -490,7 +497,7 @@ nsFileChannel::Process(void) NS_ASSERTION(mSourceOffset == 0, "implement seek"); if (mListener) { - mStatus = mListener->OnStartBinding(mContext); // always send the start notification + mStatus = mListener->OnStartRequest(mContext); // always send the start notification if (NS_FAILED(mStatus)) goto error; } @@ -532,7 +539,7 @@ nsFileChannel::Process(void) nsISupports* fs; if (mListener) { - mStatus = mListener->OnStartBinding(mContext); // always send the start notification + mStatus = mListener->OnStartRequest(mContext); // always send the start notification if (NS_FAILED(mStatus)) goto error; } @@ -566,7 +573,7 @@ nsFileChannel::Process(void) mBufferOutputStream->Flush(); if (mListener) { // XXX where do we get the error message? - (void)mListener->OnStopBinding(mContext, mStatus, nsnull); + (void)mListener->OnStopRequest(mContext, mStatus, nsnull); } NS_IF_RELEASE(mBufferOutputStream); diff --git a/mozilla/netwerk/protocol/file/src/nsFileChannel.h b/mozilla/netwerk/protocol/file/src/nsFileChannel.h index 10ae5fc7462..629386a4d58 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileChannel.h +++ b/mozilla/netwerk/protocol/file/src/nsFileChannel.h @@ -41,6 +41,9 @@ public: //////////////////////////////////////////////////////////////////////////// // from nsIRequest: + /* boolean IsPending (); */ + NS_IMETHOD IsPending(PRBool *result); + /* void Cancel (); */ NS_IMETHOD Cancel(); diff --git a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp index cf6941b2c38..9dabf6ad1aa 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp @@ -125,6 +125,12 @@ nsFTPChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) //////////////////////////////////////////////////////////////////////////////// // nsIRequest methods: +NS_IMETHODIMP +nsFTPChannel::IsPending(PRBool *result) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + NS_IMETHODIMP nsFTPChannel::Cancel(void) { @@ -267,19 +273,6 @@ nsFTPChannel::SetStreamListener(nsIStreamListener *aListener) { //////////////////////////////////////////////////////////////////////////////// // nsIStreamObserver methods: -NS_IMETHODIMP -nsFTPChannel::OnStartBinding(nsISupports* context) { - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP -nsFTPChannel::OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg) { - // Release the lock so the user get's the data stream - return NS_ERROR_NOT_IMPLEMENTED; -} - NS_IMETHODIMP nsFTPChannel::OnStartRequest(nsISupports* context) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h index be9114bd90d..4bd60ac17ff 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h +++ b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h @@ -37,6 +37,7 @@ public: NS_DECL_ISUPPORTS // nsIRequest methods: + NS_IMETHOD IsPending(PRBool *result); NS_IMETHOD Cancel(); NS_IMETHOD Suspend(); NS_IMETHOD Resume(); @@ -63,14 +64,10 @@ public: NS_IMETHOD SetStreamListener(nsIStreamListener* aListener); // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports* context); - NS_IMETHOD OnStopBinding(nsISupports* context, + NS_IMETHOD OnStartRequest(nsISupports* context); + NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt); - NS_IMETHOD OnStopRequest(nsISupports *ctxt, - nsresult status, - const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports* context, diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index aba933138a3..317a26f4438 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -145,8 +145,8 @@ nsFtpConnectionThread::Run() { // tell the user that we've begun the transaction. - nsFtpOnStartBindingEvent* event = - new nsFtpOnStartBindingEvent(mListener, nsnull); + nsFtpOnStartRequestEvent* event = + new nsFtpOnStartRequestEvent(mListener, nsnull); if (event == nsnull) return NS_ERROR_OUT_OF_MEMORY; @@ -197,8 +197,8 @@ nsFtpConnectionThread::Run() { { // We have error'd out. Stop binding and pass the error back to the user. PRUnichar* errorMsg = nsnull; - nsFtpOnStopBindingEvent* event = - new nsFtpOnStopBindingEvent(mListener, nsnull); + nsFtpOnStopRequestEvent* event = + new nsFtpOnStopRequestEvent(mListener, nsnull); if (!event) return NS_ERROR_OUT_OF_MEMORY; diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.cpp index 54e43d6447f..abb9ff62ab5 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.cpp @@ -72,25 +72,25 @@ nsFtpStreamListenerEvent::Fire(nsIEventQueue* aEventQueue) //////////////////////////////////////////////////////////////////////////////// // -// OnStartBinding... +// OnStartRequest... // //////////////////////////////////////////////////////////////////////////////// NS_IMETHODIMP -nsFtpOnStartBindingEvent::HandleEvent() +nsFtpOnStartRequestEvent::HandleEvent() { nsIStreamObserver* receiver = (nsIStreamObserver*)mListener; - return receiver->OnStartBinding(mContext); + return receiver->OnStartRequest(mContext); } /* NS_IMETHODIMP -nsMarshalingStreamObserver::OnStartBinding(nsISupports* context) +nsMarshalingStreamObserver::OnStartRequest(nsISupports* context) { nsresult rv = GetStatus(); if (NS_FAILED(rv)) return rv; - nsOnStartBindingEvent* event = - new nsOnStartBindingEvent(this, context); + nsOnStartRequestEvent* event = + new nsOnStartRequestEvent(this, context); if (event == nsnull) return NS_ERROR_OUT_OF_MEMORY; @@ -159,16 +159,16 @@ nsMarshalingStreamListener::OnDataAvailable(nsISupports* context, */ //////////////////////////////////////////////////////////////////////////////// // -// OnStopBinding +// OnStopRequest // //////////////////////////////////////////////////////////////////////////////// -nsFtpOnStopBindingEvent::~nsFtpOnStopBindingEvent() +nsFtpOnStopRequestEvent::~nsFtpOnStopRequestEvent() { } nsresult -nsFtpOnStopBindingEvent::Init(nsresult status, PRUnichar* aMsg) +nsFtpOnStopRequestEvent::Init(nsresult status, PRUnichar* aMsg) { mStatus = status; mMessage = aMsg; @@ -176,22 +176,22 @@ nsFtpOnStopBindingEvent::Init(nsresult status, PRUnichar* aMsg) } NS_IMETHODIMP -nsFtpOnStopBindingEvent::HandleEvent() +nsFtpOnStopRequestEvent::HandleEvent() { nsIStreamObserver* receiver = (nsIStreamObserver*)mListener; - return receiver->OnStopBinding(mContext, mStatus, mMessage); + return receiver->OnStopRequest(mContext, mStatus, mMessage); } /* NS_IMETHODIMP -nsMarshalingStreamObserver::OnStopBinding(nsISupports* context, +nsMarshalingStreamObserver::OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg) { nsresult rv = GetStatus(); if (NS_FAILED(rv)) return rv; - nsOnStopBindingEvent* event = - new nsOnStopBindingEvent(this, context); + nsOnStopRequestEvent* event = + new nsOnStopRequestEvent(this, context); if (event == nsnull) return NS_ERROR_OUT_OF_MEMORY; diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.h b/mozilla/netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.h index 8965b526edf..b7c4c686e50 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.h +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpStreamListenerEvent.h @@ -42,12 +42,12 @@ protected: nsISupports* mContext; }; -class nsFtpOnStartBindingEvent : public nsFtpStreamListenerEvent +class nsFtpOnStartRequestEvent : public nsFtpStreamListenerEvent { public: - nsFtpOnStartBindingEvent(nsIStreamListener* listener, nsISupports* context) + nsFtpOnStartRequestEvent(nsIStreamListener* listener, nsISupports* context) : nsFtpStreamListenerEvent(listener, context) {} - virtual ~nsFtpOnStartBindingEvent() {} + virtual ~nsFtpOnStartRequestEvent() {} NS_IMETHOD HandleEvent(); }; @@ -71,13 +71,13 @@ protected: }; -class nsFtpOnStopBindingEvent : public nsFtpStreamListenerEvent +class nsFtpOnStopRequestEvent : public nsFtpStreamListenerEvent { public: - nsFtpOnStopBindingEvent(nsIStreamListener* listener, nsISupports* context) + nsFtpOnStopRequestEvent(nsIStreamListener* listener, nsISupports* context) : nsFtpStreamListenerEvent(listener, context), mStatus(NS_OK), mMessage(nsnull) {} - virtual ~nsFtpOnStopBindingEvent(); + virtual ~nsFtpOnStopRequestEvent(); nsresult Init(nsresult status, PRUnichar* aMsg); NS_IMETHOD HandleEvent(); diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp index 0251dcc59f1..edf479fd85c 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp @@ -90,6 +90,12 @@ NS_IMPL_RELEASE(nsHTTPChannel); //////////////////////////////////////////////////////////////////////////////// // nsIRequest methods: +NS_IMETHODIMP +nsHTTPChannel::IsPending(PRBool *result) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + NS_IMETHODIMP nsHTTPChannel::Cancel(void) { diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.h b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.h index 6ddbc7ed0d1..3966a04efe7 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.h @@ -55,6 +55,7 @@ public: NS_DECL_ISUPPORTS // nsIRequest methods: + NS_IMETHOD IsPending(PRBool *result); NS_IMETHOD Cancel(); NS_IMETHOD Suspend(); NS_IMETHOD Resume(); diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp index 341b562f422..0ae9bacf239 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp @@ -922,7 +922,7 @@ nsHTTPRequest::GetInputStream(nsIInputStream* *o_Stream) } NS_IMETHODIMP -nsHTTPRequest::OnStartBinding(nsISupports* i_pContext) +nsHTTPRequest::OnStartRequest(nsISupports* i_pContext) { PR_LOG(gHTTPLog, PR_LOG_DEBUG, ("nsHTTPRequest [this=%x]. Starting to write request to server.\n", @@ -932,7 +932,7 @@ nsHTTPRequest::OnStartBinding(nsISupports* i_pContext) } NS_IMETHODIMP -nsHTTPRequest::OnStopBinding(nsISupports* i_pContext, +nsHTTPRequest::OnStopRequest(nsISupports* i_pContext, nsresult iStatus, const PRUnichar* i_pMsg) { @@ -961,7 +961,7 @@ nsHTTPRequest::OnStopBinding(nsISupports* i_pContext, // // An error occurred when trying to write the request to the server! // - // Call the consumer OnStopBinding(...) to end the request... + // Call the consumer OnStopRequest(...) to end the request... // else { nsCOMPtr consumer; @@ -975,7 +975,7 @@ nsHTTPRequest::OnStopBinding(nsISupports* i_pContext, (void) m_pConnection->GetResponseContext(getter_AddRefs(consumerContext)); rv = m_pConnection->GetResponseDataListener(getter_AddRefs(consumer)); if (consumer) { - consumer->OnStopBinding(consumerContext, iStatus, i_pMsg); + consumer->OnStopRequest(consumerContext, iStatus, i_pMsg); } rv = iStatus; @@ -984,20 +984,6 @@ nsHTTPRequest::OnStopBinding(nsISupports* i_pContext, return rv; } -NS_IMETHODIMP -nsHTTPRequest::OnStartRequest(nsISupports* i_pContext) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP -nsHTTPRequest::OnStopRequest(nsISupports* i_pContext, - nsresult iStatus, - const PRUnichar* i_pMsg) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - NS_IMETHODIMP nsHTTPRequest::SetTransport(nsIChannel* i_pTransport) { diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.h b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.h index 8f01ec78bc1..6b7daa1280d 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.h @@ -38,7 +38,7 @@ class nsHTTPChannel; saved for later reuse. This is also the observer class for writing to the transport. This - receives notifications of OnStartBinding and OnStopBinding as the + receives notifications of OnStartRequest and OnStopRequest as the request is being written out to the server. Each instance of this class is tied to the corresponding transport that it writes the request to. @@ -239,12 +239,10 @@ public: NS_IMETHOD GetUserAgent(char* *o_Value); // nsIStreamObserver functions - NS_IMETHOD OnStartBinding(nsISupports* context); - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt); - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); + NS_IMETHOD OnStartRequest(nsISupports* context); + NS_IMETHOD OnStopRequest(nsISupports* context, + nsresult aStatus, + const PRUnichar* aMsg); // Finally our own methods... /* diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.cpp index 208b5b30c29..38029da37b1 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.cpp @@ -36,19 +36,19 @@ nsHTTPRequestObserver::~nsHTTPRequestObserver() NS_IMPL_ISUPPORTS(nsHTTPRequestObserver,nsCOMTypeInfo::GetIID()); NS_IMETHODIMP -nsHTTPRequestObserver::OnStartBinding(nsISupports* /*i_pContext*/) +nsHTTPRequestObserver::OnStartRequest(nsISupports* /*i_pContext*/) { //TODO globally replace printf with trace calls. - //printf("nsHTTPRequestObserver::OnStartBinding...\n"); + //printf("nsHTTPRequestObserver::OnStartRequest...\n"); return NS_OK; } NS_IMETHODIMP -nsHTTPRequestObserver::OnStopBinding(nsISupports* i_pContext, +nsHTTPRequestObserver::OnStopRequest(nsISupports* i_pContext, nsresult iStatus, const PRUnichar* i_pMsg) { - //printf("nsHTTPRequestObserver::OnStopBinding...\n"); + //printf("nsHTTPRequestObserver::OnStopRequest...\n"); // if we could write successfully... if (NS_SUCCEEDED(iStatus)) { diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.h b/mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.h index 7af4934878d..5e0c25bdbf4 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPRequestObserver.h @@ -24,7 +24,7 @@ class nsIChannel; /* The nsHTTPRequestObserver class is the request writer observer that - receives notifications of OnStartBinding and OnStopBinding as the + receives notifications of OnStartRequest and OnStopRequest as the request is being written out to the server. Each instance of this class is tied to the corresponding transport that it writes the request to. @@ -51,9 +51,9 @@ public: NS_DECL_ISUPPORTS // nsIStreamObserver functions - NS_IMETHOD OnStartBinding(nsISupports* context); + NS_IMETHOD OnStartRequest(nsISupports* context); - NS_IMETHOD OnStopBinding(nsISupports* context, + NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg); diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h index 39e07fad9ce..aec9fb3ae31 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h @@ -30,8 +30,8 @@ class nsIHTTPChannel; /* The nsHTTPResponseListener class is the response reader listener that - receives notifications of OnStartBinding, OnDataAvailable and - OnStopBinding as the data is received from the server. Each instance + receives notifications of OnStartRequest, OnDataAvailable and + OnStopRequest as the data is received from the server. Each instance of this class is tied to the corresponding transport that it reads the response data stream from. @@ -62,13 +62,11 @@ public: PRUint32 aLength); - NS_IMETHOD OnStartBinding(nsISupports* context); + NS_IMETHOD OnStartRequest(nsISupports* context); - NS_IMETHOD OnStopBinding(nsISupports* context, + NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt); - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); protected: // nsHTTPResponseListener methods... diff --git a/mozilla/netwerk/protocol/makefile.win b/mozilla/netwerk/protocol/makefile.win index 794b5f3c437..0ed27a67823 100644 --- a/mozilla/netwerk/protocol/makefile.win +++ b/mozilla/netwerk/protocol/makefile.win @@ -20,6 +20,7 @@ DEPTH = ..\.. MODULE = necko DIRS= \ + about \ file \ resource \ ftp \ diff --git a/mozilla/netwerk/test/TestFileInput.cpp b/mozilla/netwerk/test/TestFileInput.cpp index 95e479508f0..a988bd95030 100644 --- a/mozilla/netwerk/test/TestFileInput.cpp +++ b/mozilla/netwerk/test/TestFileInput.cpp @@ -102,7 +102,7 @@ public: return NS_OK; } - NS_IMETHOD OnStartBinding(nsISupports* context) { + NS_IMETHOD OnStartRequest(nsISupports* context) { PR_EnterMonitor(mMonitor); printf("start binding\n"); mStartTime = PR_IntervalNow(); @@ -128,7 +128,7 @@ public: return NS_OK; } - NS_IMETHOD OnStopBinding(nsISupports* context, + NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg) { nsresult rv; @@ -145,16 +145,6 @@ public: return rv; } - NS_IMETHOD OnStartRequest(nsISupports* context) { - return NS_ERROR_NOT_IMPLEMENTED; - } - - NS_IMETHOD OnStopRequest(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg) { - return NS_ERROR_NOT_IMPLEMENTED; - } - protected: nsIEventQueue* mEventQueue; PRIntervalTime mStartTime; @@ -202,7 +192,7 @@ Simulated_nsFileTransport_Run(nsReader* reader, const char* path) nsFileSpec spec(path); PRUint32 sourceOffset = 0; - rv = reader->OnStartBinding(nsnull); + rv = reader->OnStartRequest(nsnull); if (NS_FAILED(rv)) goto done; // XXX should this abort the transfer? rv = NS_NewTypicalInputFileStream(&fs, spec); @@ -242,7 +232,7 @@ Simulated_nsFileTransport_Run(nsReader* reader, const char* path) NS_IF_RELEASE(bufStr); NS_IF_RELEASE(fileStr); - rv = reader->OnStopBinding(nsnull, rv, nsnull); + rv = reader->OnStopRequest(nsnull, rv, nsnull); return rv; } diff --git a/mozilla/netwerk/test/TestProtocols.cpp b/mozilla/netwerk/test/TestProtocols.cpp index 9efb8376ea8..ce02b663ccc 100644 --- a/mozilla/netwerk/test/TestProtocols.cpp +++ b/mozilla/netwerk/test/TestProtocols.cpp @@ -180,27 +180,16 @@ public: NS_DECL_ISUPPORTS // IStreamListener interface... - NS_IMETHOD OnStartBinding(nsISupports* context); + NS_IMETHOD OnStartRequest(nsISupports* context); NS_IMETHOD OnDataAvailable(nsISupports* context, nsIInputStream *aIStream, PRUint32 aSourceOffset, PRUint32 aLength); - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg); - - NS_IMETHOD OnStartRequest(nsISupports* context) { - return NS_ERROR_NOT_IMPLEMENTED; - } - NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, - const PRUnichar* aMsg) { - return NS_ERROR_NOT_IMPLEMENTED; - } - + const PRUnichar* aMsg); }; @@ -218,7 +207,7 @@ NS_IMPL_ISUPPORTS(InputTestConsumer,nsCOMTypeInfo::GetIID()); NS_IMETHODIMP -InputTestConsumer::OnStartBinding(nsISupports* context) +InputTestConsumer::OnStartRequest(nsISupports* context) { URLLoadInfo* info = (URLLoadInfo*)context; if (info) { @@ -274,7 +263,7 @@ InputTestConsumer::OnDataAvailable(nsISupports* context, NS_IMETHODIMP -InputTestConsumer::OnStopBinding(nsISupports* context, +InputTestConsumer::OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg) { diff --git a/mozilla/netwerk/test/TestSocketIO.cpp b/mozilla/netwerk/test/TestSocketIO.cpp index 758eed16c62..47f920228f1 100644 --- a/mozilla/netwerk/test/TestSocketIO.cpp +++ b/mozilla/netwerk/test/TestSocketIO.cpp @@ -52,26 +52,16 @@ public: NS_DECL_ISUPPORTS // IStreamListener interface... - NS_IMETHOD OnStartBinding(nsISupports* context); + NS_IMETHOD OnStartRequest(nsISupports* context); NS_IMETHOD OnDataAvailable(nsISupports* context, nsIInputStream *aIStream, PRUint32 aSourceOffset, PRUint32 aLength); - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg); - - NS_IMETHOD OnStartRequest(nsISupports* context) { - return NS_ERROR_NOT_IMPLEMENTED; - } - NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, - const PRUnichar* aMsg) { - return NS_ERROR_NOT_IMPLEMENTED; - } + const PRUnichar* aMsg); }; @@ -91,9 +81,9 @@ NS_IMPL_ISUPPORTS(InputTestConsumer,kIStreamListenerIID); NS_IMETHODIMP -InputTestConsumer::OnStartBinding(nsISupports* context) +InputTestConsumer::OnStartRequest(nsISupports* context) { - printf("\n+++ InputTestConsumer::OnStartBinding +++\n"); + printf("\n+++ InputTestConsumer::OnStartRequest +++\n"); return NS_OK; } @@ -117,12 +107,12 @@ InputTestConsumer::OnDataAvailable(nsISupports* context, NS_IMETHODIMP -InputTestConsumer::OnStopBinding(nsISupports* context, +InputTestConsumer::OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg) { gKeepRunning = 0; - printf("\n+++ InputTestConsumer::OnStopBinding (status = %x) +++\n", aStatus); + printf("\n+++ InputTestConsumer::OnStopRequest (status = %x) +++\n", aStatus); return NS_OK; } @@ -139,22 +129,11 @@ public: NS_DECL_ISUPPORTS // IStreamObserver interface... - NS_IMETHOD OnStartBinding(nsISupports* context); - - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg); - - NS_IMETHOD OnStartRequest(nsISupports* context) { - return NS_ERROR_NOT_IMPLEMENTED; - } + NS_IMETHOD OnStartRequest(nsISupports* context); NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, - const PRUnichar* aMsg) { - return NS_ERROR_NOT_IMPLEMENTED; - } - + const PRUnichar* aMsg); protected: nsIChannel* mTransport; @@ -178,19 +157,19 @@ NS_IMPL_ISUPPORTS(TestWriteObserver,nsCOMTypeInfo::GetIID()); NS_IMETHODIMP -TestWriteObserver::OnStartBinding(nsISupports* context) +TestWriteObserver::OnStartRequest(nsISupports* context) { - printf("\n+++ TestWriteObserver::OnStartBinding +++\n"); + printf("\n+++ TestWriteObserver::OnStartRequest +++\n"); return NS_OK; } NS_IMETHODIMP -TestWriteObserver::OnStopBinding(nsISupports* context, +TestWriteObserver::OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg) { - printf("\n+++ TestWriteObserver::OnStopBinding (status = %x) +++\n", aStatus); + printf("\n+++ TestWriteObserver::OnStopRequest (status = %x) +++\n", aStatus); if (NS_SUCCEEDED(aStatus)) { mTransport->AsyncRead(0, -1, nsnull, new InputTestConsumer); diff --git a/mozilla/netwerk/test/TestSocketInput.cpp b/mozilla/netwerk/test/TestSocketInput.cpp index b68bd249be4..732e67ca054 100644 --- a/mozilla/netwerk/test/TestSocketInput.cpp +++ b/mozilla/netwerk/test/TestSocketInput.cpp @@ -46,26 +46,16 @@ public: NS_DECL_ISUPPORTS // IStreamListener interface... - NS_IMETHOD OnStartBinding(nsISupports* context); + NS_IMETHOD OnStartRequest(nsISupports* context); NS_IMETHOD OnDataAvailable(nsISupports* context, nsIInputStream *aIStream, PRUint32 aSourceOffset, PRUint32 aLength); - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg); - - NS_IMETHOD OnStartRequest(nsISupports* context) { - return NS_ERROR_NOT_IMPLEMENTED; - } - NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, - const PRUnichar* aMsg) { - return NS_ERROR_NOT_IMPLEMENTED; - } + const PRUnichar* aMsg); }; @@ -85,9 +75,9 @@ NS_IMPL_ISUPPORTS(InputTestConsumer,kIStreamListenerIID); NS_IMETHODIMP -InputTestConsumer::OnStartBinding(nsISupports* context) +InputTestConsumer::OnStartRequest(nsISupports* context) { - printf("+++ OnStartBinding +++\n"); + printf("+++ OnStartRequest +++\n"); return NS_OK; } @@ -112,12 +102,12 @@ InputTestConsumer::OnDataAvailable(nsISupports* context, NS_IMETHODIMP -InputTestConsumer::OnStopBinding(nsISupports* context, +InputTestConsumer::OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg) { gKeepRunning = 0; - printf("+++ OnStopBinding +++\n"); + printf("+++ OnStopRequest +++\n"); return NS_OK; } diff --git a/mozilla/netwerk/test/TestSocketTransport.cpp b/mozilla/netwerk/test/TestSocketTransport.cpp index 52f72f56872..b697ce6e5cc 100644 --- a/mozilla/netwerk/test/TestSocketTransport.cpp +++ b/mozilla/netwerk/test/TestSocketTransport.cpp @@ -122,26 +122,16 @@ public: NS_DECL_ISUPPORTS // IStreamListener interface... - NS_IMETHOD OnStartBinding(nsISupports* context); + NS_IMETHOD OnStartRequest(nsISupports* context); NS_IMETHOD OnDataAvailable(nsISupports* context, nsIInputStream *aIStream, PRUint32 aSourceOffset, PRUint32 aLength); - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg); - - NS_IMETHOD OnStartRequest(nsISupports* context) { - return NS_ERROR_NOT_IMPLEMENTED; - } - NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, - const PRUnichar* aMsg) { - return NS_ERROR_NOT_IMPLEMENTED; - } + const PRUnichar* aMsg); TestConnection* mConnection; PRInt32 mBytesRead; @@ -168,9 +158,9 @@ NS_IMPL_ISUPPORTS(InputConsumer,nsCOMTypeInfo::GetIID()); NS_IMETHODIMP -InputConsumer::OnStartBinding(nsISupports* context) +InputConsumer::OnStartRequest(nsISupports* context) { - printf("\n+++ InputConsumer::OnStartBinding +++. Context = %p\n", context); + printf("\n+++ InputConsumer::OnStartRequest +++. Context = %p\n", context); return NS_OK; } @@ -204,11 +194,11 @@ InputConsumer::OnDataAvailable(nsISupports* context, NS_IMETHODIMP -InputConsumer::OnStopBinding(nsISupports* context, +InputConsumer::OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg) { - printf("\n+++ InputConsumer::OnStopBinding (status = %x) +++. Context = %p\n", aStatus, context); + printf("\n+++ InputConsumer::OnStopRequest (status = %x) +++. Context = %p\n", aStatus, context); mConnection->Lock(); mConnection->Notify(); mConnection->Unlock(); @@ -233,21 +223,11 @@ public: NS_DECL_ISUPPORTS // IStreamObserver interface... - NS_IMETHOD OnStartBinding(nsISupports* context); - - NS_IMETHOD OnStopBinding(nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg); - - NS_IMETHOD OnStartRequest(nsISupports* context) { - return NS_ERROR_NOT_IMPLEMENTED; - } + NS_IMETHOD OnStartRequest(nsISupports* context); NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, - const PRUnichar* aMsg) { - return NS_ERROR_NOT_IMPLEMENTED; - } + const PRUnichar* aMsg); protected: TestConnection* mConnection; @@ -272,21 +252,21 @@ NS_IMPL_ISUPPORTS(OutputObserver,nsCOMTypeInfo::GetIID()); NS_IMETHODIMP -OutputObserver::OnStartBinding(nsISupports* context) +OutputObserver::OnStartRequest(nsISupports* context) { - printf("\n+++ OutputObserver::OnStartBinding +++. Context = %p\n", context); + printf("\n+++ OutputObserver::OnStartRequest +++. Context = %p\n", context); return NS_OK; } NS_IMETHODIMP -OutputObserver::OnStopBinding(nsISupports* context, +OutputObserver::OnStopRequest(nsISupports* context, nsresult aStatus, const PRUnichar* aMsg) { /// mConnection->Lock(); - printf("\n+++ OutputObserver::OnStopBinding (status = %x) +++. Context = %p\n", aStatus, context); + printf("\n+++ OutputObserver::OnStopRequest (status = %x) +++. Context = %p\n", aStatus, context); /// mConnection->Notify(); /// mConnection->Unlock(); diff --git a/mozilla/netwerk/test/nettest.cpp b/mozilla/netwerk/test/nettest.cpp index c196ac2718b..7dcb2b97624 100644 --- a/mozilla/netwerk/test/nettest.cpp +++ b/mozilla/netwerk/test/nettest.cpp @@ -69,9 +69,9 @@ public: PRUint32 aLength); // stream observer methods - NS_IMETHOD OnStartBinding(nsISupports* context); + NS_IMETHOD OnStartRequest(nsISupports* context); - NS_IMETHOD OnStopBinding(nsISupports* context, + NS_IMETHOD OnStopRequest(nsISupports* context, nsresult aStatus, nsIString* aMsg); @@ -124,17 +124,17 @@ NS_IMETHODIMP TestConsumer::OnDataAvailable(nsISupports *context, return 0; } -NS_IMETHODIMP TestConsumer::OnStartBinding(nsISupports *context) { +NS_IMETHODIMP TestConsumer::OnStartRequest(nsISupports *context) { if (bTraceEnabled) { - printf("\n+++ TestConsumer::OnStartBinding: URL: %p, Content type: %s\n", mUrl, "XXX some context"); + printf("\n+++ TestConsumer::OnStartRequest: URL: %p, Content type: %s\n", mUrl, "XXX some context"); } return 0; } -NS_IMETHODIMP TestConsumer::OnStopBinding(nsISupports *context, nsresult aStatus, nsIString *aMsg) { +NS_IMETHODIMP TestConsumer::OnStopRequest(nsISupports *context, nsresult aStatus, nsIString *aMsg) { if (bTraceEnabled) { - printf("\n+++ TestConsumer::OnStopBinding... URL: %p status: %d\n", mUrl, aStatus); + printf("\n+++ TestConsumer::OnStopRequest... URL: %p status: %d\n", mUrl, aStatus); } if (NS_FAILED(aStatus)) { diff --git a/mozilla/netwerk/util/public/nsNeckoUtil.h b/mozilla/netwerk/util/public/nsNeckoUtil.h index ada332679b6..7101ac8c191 100644 --- a/mozilla/netwerk/util/public/nsNeckoUtil.h +++ b/mozilla/netwerk/util/public/nsNeckoUtil.h @@ -52,6 +52,6 @@ extern nsresult NS_MakeAbsoluteURI(const nsString& spec, nsIURI* baseURI, nsString& result); extern nsresult -NS_NewLoadGroup(nsILoadGroup* *result); +NS_NewLoadGroup(nsILoadGroup* parent, nsILoadGroup* *result); #endif // nsNeckoUtil_h__ diff --git a/mozilla/netwerk/util/src/nsNeckoUtil.cpp b/mozilla/netwerk/util/src/nsNeckoUtil.cpp index 068a32ab26e..f5c69c00542 100644 --- a/mozilla/netwerk/util/src/nsNeckoUtil.cpp +++ b/mozilla/netwerk/util/src/nsNeckoUtil.cpp @@ -20,6 +20,7 @@ #include "nsIIOService.h" #include "nsIServiceManager.h" #include "nsIChannel.h" +#include "nsIAllocator.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -40,12 +41,11 @@ NS_NewURI(nsIURI* *result, const nsString& spec, nsIURI* baseURI) // XXX if the string is unicode, GetBuffer() returns null. // XXX we need a strategy to deal w/ unicode specs (if there should // XXX even be such a thing) - const char* specStr = spec.GetBuffer(); - if (!specStr) - specStr = spec.ToNewCString(); // this forces a single byte char* + char* specStr = spec.ToNewCString(); // this forces a single byte char* + if (specStr == nsnull) + return NS_ERROR_OUT_OF_MEMORY; nsresult rv = NS_NewURI(result, specStr, baseURI); - if (specStr) - nsCRT::free((char*)specStr); + nsAllocator::Free(specStr); return rv; } diff --git a/mozilla/netwerk/util/src/nsNetStreamLoader.cpp b/mozilla/netwerk/util/src/nsNetStreamLoader.cpp index 12ac7f09198..c2a5b317882 100644 --- a/mozilla/netwerk/util/src/nsNetStreamLoader.cpp +++ b/mozilla/netwerk/util/src/nsNetStreamLoader.cpp @@ -44,8 +44,6 @@ public: NS_IMETHOD GetNumCharsRead(PRInt32* aNumBytes); // nsIStreamObserver methods - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); @@ -138,28 +136,16 @@ nsUnicharStreamLoader::GetNumCharsRead(PRInt32* aNumBytes) } NS_IMETHODIMP -nsUnicharStreamLoader::OnStartBinding(nsISupports *ctxt) -{ - return NS_OK; -} - -NS_IMETHODIMP -nsUnicharStreamLoader::OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) -{ - (*mFunc)(this, *mData, mRef, status); - - return NS_OK; -} - -NS_IMETHODIMP nsUnicharStreamLoader::OnStartRequest(nsISupports *ctxt) { return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsUnicharStreamLoader::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { + (*mFunc)(this, *mData, mRef, status); + return NS_OK; } diff --git a/mozilla/network/module/nsNetService.cpp b/mozilla/network/module/nsNetService.cpp index ab3566aa8df..21fd4d3c758 100644 --- a/mozilla/network/module/nsNetService.cpp +++ b/mozilla/network/module/nsNetService.cpp @@ -1431,7 +1431,7 @@ static void bam_exit_routine(URL_Struct *URL_s, int status, MWContext *window_id if ((nsConnectionActive == pConn->mStatus) && (nsnull != pConn->pConsumer)) { nsAutoString status; - pConn->pConsumer->OnStopBinding(pConn->pURL, NS_BINDING_FAILED, status.GetUnicode()); + pConn->pConsumer->OnStopRequest(pConn->pURL, NS_BINDING_FAILED, status.GetUnicode()); NS_RELEASE(pConn->pConsumer); } diff --git a/mozilla/network/module/nsNetStreamLoader.cpp b/mozilla/network/module/nsNetStreamLoader.cpp index 046bdcc2ec0..a2f66790c71 100644 --- a/mozilla/network/module/nsNetStreamLoader.cpp +++ b/mozilla/network/module/nsNetStreamLoader.cpp @@ -38,10 +38,10 @@ public: NS_IMETHOD GetNumCharsRead(PRInt32* aNumBytes); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength); @@ -128,7 +128,7 @@ nsUnicharStreamLoader::GetNumCharsRead(PRInt32* aNumBytes) } NS_IMETHODIMP -nsUnicharStreamLoader::OnStartBinding(nsIURI* aURL, +nsUnicharStreamLoader::OnStartRequest(nsIURI* aURL, const char *aContentType) { return NS_OK; @@ -149,7 +149,7 @@ nsUnicharStreamLoader::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) } NS_IMETHODIMP -nsUnicharStreamLoader::OnStopBinding(nsIURI* aURL, +nsUnicharStreamLoader::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { diff --git a/mozilla/network/module/nsNetThread.cpp b/mozilla/network/module/nsNetThread.cpp index a3dceeab315..01a47fcec88 100644 --- a/mozilla/network/module/nsNetThread.cpp +++ b/mozilla/network/module/nsNetThread.cpp @@ -343,10 +343,10 @@ public: NS_DECL_ISUPPORTS - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* info); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength); @@ -476,19 +476,19 @@ void PR_CALLBACK StreamListenerProxyEvent::HandlePLEvent(PLEvent* aEvent) } } -/*-------------- OnStartBinding Proxy --------------------------------------*/ +/*-------------- OnStartRequest Proxy --------------------------------------*/ -struct OnStartBindingProxyEvent : public StreamListenerProxyEvent +struct OnStartRequestProxyEvent : public StreamListenerProxyEvent { - OnStartBindingProxyEvent(nsStreamListenerProxy* aProxy, nsIURI* aURL, + OnStartRequestProxyEvent(nsStreamListenerProxy* aProxy, nsIURI* aURL, const char *aContentType); - virtual ~OnStartBindingProxyEvent(); + virtual ~OnStartRequestProxyEvent(); NS_IMETHOD HandleEvent(); char *mContentType; }; -OnStartBindingProxyEvent::OnStartBindingProxyEvent(nsStreamListenerProxy* aProxy, +OnStartRequestProxyEvent::OnStartRequestProxyEvent(nsStreamListenerProxy* aProxy, nsIURI* aURL, const char *aContentType) : StreamListenerProxyEvent(aProxy, aURL) @@ -496,15 +496,15 @@ OnStartBindingProxyEvent::OnStartBindingProxyEvent(nsStreamListenerProxy* aProxy mContentType = PL_strdup(aContentType); } -OnStartBindingProxyEvent::~OnStartBindingProxyEvent() +OnStartRequestProxyEvent::~OnStartRequestProxyEvent() { PR_Free(mContentType); } NS_IMETHODIMP -OnStartBindingProxyEvent::HandleEvent() +OnStartRequestProxyEvent::HandleEvent() { - return mProxy->mRealListener->OnStartBinding(mURL, mContentType); + return mProxy->mRealListener->OnStartRequest(mURL, mContentType); } @@ -565,11 +565,11 @@ OnStatusProxyEvent::HandleEvent() } -/*-------------- OnStopBinding Proxy ---------------------------------------*/ +/*-------------- OnStopRequest Proxy ---------------------------------------*/ -struct OnStopBindingProxyEvent : public StreamListenerProxyEvent +struct OnStopRequestProxyEvent : public StreamListenerProxyEvent { - OnStopBindingProxyEvent(nsStreamListenerProxy* aProxy, nsIURI* aURL, + OnStopRequestProxyEvent(nsStreamListenerProxy* aProxy, nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); NS_IMETHOD HandleEvent(); @@ -577,7 +577,7 @@ struct OnStopBindingProxyEvent : public StreamListenerProxyEvent PRUnichar* mMsg; }; -OnStopBindingProxyEvent::OnStopBindingProxyEvent(nsStreamListenerProxy* aProxy, +OnStopRequestProxyEvent::OnStopRequestProxyEvent(nsStreamListenerProxy* aProxy, nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) @@ -588,9 +588,9 @@ OnStopBindingProxyEvent::OnStopBindingProxyEvent(nsStreamListenerProxy* aProxy, } NS_IMETHODIMP -OnStopBindingProxyEvent::HandleEvent() +OnStopRequestProxyEvent::HandleEvent() { - nsresult rv = mProxy->mRealListener->OnStopBinding(mURL, mStatus, mMsg); + nsresult rv = mProxy->mRealListener->OnStopRequest(mURL, mStatus, mMsg); delete []mMsg; mMsg = nsnull; return rv; @@ -676,16 +676,16 @@ static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); NS_IMPL_THREADSAFE_ISUPPORTS(nsStreamListenerProxy, kIStreamListenerIID); NS_IMETHODIMP -nsStreamListenerProxy::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsStreamListenerProxy::OnStartRequest(nsIURI* aURL, const char *aContentType) { nsresult rv; if (PR_GetCurrentThread() == gNetlibThread) { - OnStartBindingProxyEvent* ev; + OnStartRequestProxyEvent* ev; rv = GetStatus(); if (NS_SUCCEEDED(rv)) { - ev = new OnStartBindingProxyEvent(this, aURL, aContentType); + ev = new OnStartRequestProxyEvent(this, aURL, aContentType); if (nsnull == ev) { rv = NS_ERROR_OUT_OF_MEMORY; } else { @@ -693,7 +693,7 @@ nsStreamListenerProxy::OnStartBinding(nsIURI* aURL, const char *aContentType) } } } else { - rv = mRealListener->OnStartBinding(aURL, aContentType); + rv = mRealListener->OnStartRequest(aURL, aContentType); } return rv; } @@ -752,24 +752,24 @@ nsStreamListenerProxy::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) } NS_IMETHODIMP -nsStreamListenerProxy::OnStopBinding(nsIURI* aURL, nsresult aStatus, +nsStreamListenerProxy::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { nsresult rv = NS_OK; if (PR_GetCurrentThread() == gNetlibThread) { - OnStopBindingProxyEvent* ev; + OnStopRequestProxyEvent* ev; /* - * Always fire the OnStopBinding notification... + * Always fire the OnStopRequest notification... */ - ev = new OnStopBindingProxyEvent(this, aURL, aStatus, aMsg); + ev = new OnStopRequestProxyEvent(this, aURL, aStatus, aMsg); if (nsnull == ev) { rv = NS_ERROR_OUT_OF_MEMORY; } else { ev->Fire(mEventQ); } } else { - rv = mRealListener->OnStopBinding(aURL, aStatus, aMsg); + rv = mRealListener->OnStopRequest(aURL, aStatus, aMsg); } return rv; } diff --git a/mozilla/network/module/nsSocketTransport.cpp b/mozilla/network/module/nsSocketTransport.cpp index 05f2605a306..8a0fe1d6ba3 100644 --- a/mozilla/network/module/nsSocketTransport.cpp +++ b/mozilla/network/module/nsSocketTransport.cpp @@ -166,7 +166,7 @@ nsSocketTransport::GetOutputStream(nsIOutputStream ** aOutputStream) NS_IMETHODIMP -nsSocketTransport::OnStartBinding(nsIURI* pURL, const char *aContentType) +nsSocketTransport::OnStartRequest(nsIURI* pURL, const char *aContentType) { return NS_OK; } @@ -186,11 +186,11 @@ nsSocketTransport::OnStatus(nsIURI* pURL, const PRUnichar* aMsg) } NS_IMETHODIMP -nsSocketTransport::OnStopBinding(nsIURI* pURL, +nsSocketTransport::OnStopRequest(nsIURI* pURL, nsresult aStatus, const PRUnichar* aMsg) { -// if the protocol instance called OnStopBinding then they are effectively asking us +// if the protocol instance called OnStopRequest then they are effectively asking us // to close the connection. But they don't want US to go away..... // so we need to close the underlying socket.... CloseCurrentConnection(); diff --git a/mozilla/network/module/nsSocketTransport.h b/mozilla/network/module/nsSocketTransport.h index 6590716fb26..c10cb93f8b3 100644 --- a/mozilla/network/module/nsSocketTransport.h +++ b/mozilla/network/module/nsSocketTransport.h @@ -60,10 +60,10 @@ public: //////////////////////////////////////////////////////////////////////////// // from nsIStreamListener: - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength); diff --git a/mozilla/network/module/nsStubContext.cpp b/mozilla/network/module/nsStubContext.cpp index 6d328758f82..7861584cf1b 100644 --- a/mozilla/network/module/nsStubContext.cpp +++ b/mozilla/network/module/nsStubContext.cpp @@ -518,7 +518,7 @@ PRIVATE void stub_GraphProgressDestroy(MWContext *context, /* * XXX: Currently this function never calls OnProgress(...) because * netlib calls FE_GraphProgressDestroy(...) after closing the - * stream... So, OnStopBinding(...) has already been called and + * stream... So, OnStopRequest(...) has already been called and * the nsConnectionInfo->pConsumer has been released and NULLed... */ nsIStreamListener *pListener; @@ -769,7 +769,7 @@ void stub_complete(NET_StreamClass *stream) /* Notify the Data Consumer that the Binding has completed... */ if (pConn->pConsumer) { nsAutoString status; - pConn->pConsumer->OnStopBinding(pConn->pURL, NS_BINDING_SUCCEEDED, status.GetUnicode()); + pConn->pConsumer->OnStopRequest(pConn->pURL, NS_BINDING_SUCCEEDED, status.GetUnicode()); pConn->mStatus = nsConnectionSucceeded; } @@ -808,12 +808,12 @@ void stub_abort(NET_StreamClass *stream, int status) if (pConn->pConsumer) { nsAutoString status; - // mscott --> this code used to pass in NS_BINDING_ABORTED into the OnStopBinding + // mscott --> this code used to pass in NS_BINDING_ABORTED into the OnStopRequest // call. But NS_BINDING_ABORTED is an error code!!! And aborting a stream - // is NOT an error condition. nsDocumentLoader::OnStopBinding was issuing + // is NOT an error condition. nsDocumentLoader::OnStopRequest was issuing // printfs complaining that the status code was a failure code. // I'm going to pass in NS_BINDING_SUCCEEDED instead. - pConn->pConsumer->OnStopBinding(pConn->pURL, NS_BINDING_SUCCEEDED, status.GetUnicode()); + pConn->pConsumer->OnStopRequest(pConn->pURL, NS_BINDING_SUCCEEDED, status.GetUnicode()); pConn->mStatus = nsConnectionAborted; } @@ -961,9 +961,9 @@ NET_NGLayoutConverter(FO_Present_Types format_out, if (nsnull != pConn->pConsumer) { nsresult rv; - rv = pConn->pConsumer->OnStartBinding(pConn->pURL, URL_s->content_type); + rv = pConn->pConsumer->OnStartRequest(pConn->pURL, URL_s->content_type); /* - * If OnStartBinding fails, then tear down the NET_StreamClass + * If OnStartRequest fails, then tear down the NET_StreamClass * and release all references... */ if (NS_OK != rv) { diff --git a/mozilla/network/module/tests/nettest.cpp b/mozilla/network/module/tests/nettest.cpp index cd6c332ad7b..a5670ea2785 100644 --- a/mozilla/network/module/tests/nettest.cpp +++ b/mozilla/network/module/tests/nettest.cpp @@ -81,9 +81,9 @@ public: NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* info); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); }; @@ -138,10 +138,10 @@ NS_IMETHODIMP TestConsumer::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) return 0; } -NS_IMETHODIMP TestConsumer::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP TestConsumer::OnStartRequest(nsIURI* aURL, const char *aContentType) { if (bTraceEnabled) { - printf("\n+++ TestConsumer::OnStartBinding: URL: %p, Content type: %s\n", aURL, aContentType); + printf("\n+++ TestConsumer::OnStartRequest: URL: %p, Content type: %s\n", aURL, aContentType); } return 0; @@ -173,10 +173,10 @@ NS_IMETHODIMP TestConsumer::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStre } -NS_IMETHODIMP TestConsumer::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +NS_IMETHODIMP TestConsumer::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) { if (bTraceEnabled) { - printf("\n+++ TestConsumer::OnStopBinding... URL: %p status: %d\n", aURL, status); + printf("\n+++ TestConsumer::OnStopRequest... URL: %p status: %d\n", aURL, status); } if (NS_FAILED(status)) { diff --git a/mozilla/network/module/tests/transportTest.cpp b/mozilla/network/module/tests/transportTest.cpp index 2f3b8c437fe..79d21ba2407 100644 --- a/mozilla/network/module/tests/transportTest.cpp +++ b/mozilla/network/module/tests/transportTest.cpp @@ -97,9 +97,9 @@ public: NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* info); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); protected: ~TestConsumer(); @@ -226,10 +226,10 @@ NS_IMETHODIMP TestConsumer::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) return 0; } -NS_IMETHODIMP TestConsumer::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP TestConsumer::OnStartRequest(nsIURI* aURL, const char *aContentType) { if (bTraceEnabled) { - printf("\n+++ TestConsumer::OnStartBinding: URL: %p, Content type: %s\n", aURL, aContentType); + printf("\n+++ TestConsumer::OnStartRequest: URL: %p, Content type: %s\n", aURL, aContentType); } return 0; @@ -266,10 +266,10 @@ NS_IMETHODIMP TestConsumer::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStre } -NS_IMETHODIMP TestConsumer::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +NS_IMETHODIMP TestConsumer::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) { if (bTraceEnabled) { - printf("\n+++ TestConsumer::OnStopBinding... URL: %p status: %d\n", aURL, status); + printf("\n+++ TestConsumer::OnStopRequest... URL: %p status: %d\n", aURL, status); } /* The document has been loaded, so drop out of the message pump... */ diff --git a/mozilla/network/public/nsIStreamObserver.h b/mozilla/network/public/nsIStreamObserver.h index 4164ed0a389..dc651128fb9 100644 --- a/mozilla/network/public/nsIStreamObserver.h +++ b/mozilla/network/public/nsIStreamObserver.h @@ -45,7 +45,7 @@ public: * @return The return value is currently ignored. In the future it may be * used to cancel the URL load.. */ - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType) = 0; + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType) = 0; /** * Notify the observer that progress as occurred for the URL load.
@@ -68,10 +68,10 @@ public: * @param msg A text string describing the error. * @return The return value is currently ignored. */ - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) = 0; + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) = 0; }; -/* Generic status codes for OnStopBinding */ +/* Generic status codes for OnStopRequest */ #define NS_BINDING_SUCCEEDED NS_OK #define NS_BINDING_FAILED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 1) #define NS_BINDING_ABORTED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 2) diff --git a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp index 18222ccbd20..7e1df4efec0 100644 --- a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp @@ -134,22 +134,20 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); #else NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax) { return NS_OK; } NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg) { return NS_OK; } - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType) { return NS_OK; } - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType) { return NS_OK; } + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif }; #ifdef NECKO -NS_IMETHODIMP CStreamListener::OnStopBinding(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) +NS_IMETHODIMP CStreamListener::OnStopRequest(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) #else -NS_IMETHODIMP CStreamListener::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +NS_IMETHODIMP CStreamListener::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif { fputs("done.\n",stdout); diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index 7cdcf86c2af..9903a77ea6d 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -51,7 +51,7 @@ static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); static const char* kNullURL = "Error: Null URL given"; -static const char* kOnStartNotCalled = "Error: OnStartBinding() must be called before OnDataAvailable()"; +static const char* kOnStartNotCalled = "Error: OnStartRequest() must be called before OnDataAvailable()"; static const char* kBadListenerInit = "Error: Parser's IStreamListener API was not setup correctly in constructor."; //------------------------------------------------------------------- @@ -1035,18 +1035,18 @@ nsParser::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) * @return error code -- 0 if ok, non-zero if error. */ #ifdef NECKO -nsresult nsParser::OnStartBinding(nsISupports* aContext) +nsresult nsParser::OnStartRequest(nsISupports* aContext) #else -nsresult nsParser::OnStartBinding(nsIURI* aURL, const char *aSourceType) +nsresult nsParser::OnStartRequest(nsIURI* aURL, const char *aSourceType) #endif { NS_PRECONDITION((eNone==mParserContext->mStreamListenerState),kBadListenerInit); if (nsnull != mObserver) { #ifdef NECKO - mObserver->OnStartBinding(aContext); + mObserver->OnStartRequest(aContext); #else - mObserver->OnStartBinding(aURL, aSourceType); + mObserver->OnStartRequest(aURL, aSourceType); #endif } mParserContext->mStreamListenerState=eOnStart; @@ -1077,20 +1077,6 @@ nsresult nsParser::OnStartBinding(nsIURI* aURL, const char *aSourceType) return NS_OK; } -#ifdef NECKO -NS_IMETHODIMP -nsParser::OnStartRequest(nsISupports *ctxt) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP -nsParser::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} -#endif // NECKO - /** * * @@ -1173,9 +1159,9 @@ nsresult nsParser::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUin * @return */ #ifdef NECKO -nsresult nsParser::OnStopBinding(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) +nsresult nsParser::OnStopRequest(nsISupports* aContext, nsresult status, const PRUnichar* aMsg) #else -nsresult nsParser::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +nsresult nsParser::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif { mParserContext->mStreamListenerState=eOnStop; @@ -1193,9 +1179,9 @@ nsresult nsParser::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* // parser isn't yet enabled? if (nsnull != mObserver) { #ifdef NECKO - mObserver->OnStopBinding(aContext, status, aMsg); + mObserver->OnStopRequest(aContext, status, aMsg); #else - mObserver->OnStopBinding(aURL, status, aMsg); + mObserver->OnStopRequest(aURL, status, aMsg); #endif } diff --git a/mozilla/parser/htmlparser/src/nsParser.h b/mozilla/parser/htmlparser/src/nsParser.h index ea5806c73e1..746ccde3e0f 100644 --- a/mozilla/parser/htmlparser/src/nsParser.h +++ b/mozilla/parser/htmlparser/src/nsParser.h @@ -244,8 +244,6 @@ friend class CTokenHandler; NS_IMETHOD OnProgress(nsISupports* context, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsISupports* context, const PRUnichar* aMmsg); // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: @@ -254,9 +252,9 @@ friend class CTokenHandler; NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMmsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif void PushContext(CParserContext& aContext); diff --git a/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp b/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp index c6deb415c4d..1aa90b42efa 100644 --- a/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp +++ b/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp @@ -53,9 +53,9 @@ public: NS_IMETHOD GetBindInfo(nsIURI* aURL); NS_IMETHOD OnProgress(nsIURI* aURL, PRInt32 Progress, PRInt32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const nsString& aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRInt32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, PRInt32 status, const nsString& aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, PRInt32 status, const nsString& aMsg); PRBool IsDone() const { return mDone; } PRBool HaveError() const { return mError; } @@ -104,7 +104,7 @@ StreamToFile::OnStatus(nsIURI* aURL, const nsString& aMsg) } NS_IMETHODIMP -StreamToFile::OnStartBinding(nsIURI* aURL, const char *aContentType) +StreamToFile::OnStartRequest(nsIURI* aURL, const char *aContentType) { return 0; } @@ -128,7 +128,7 @@ StreamToFile::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, NS_IMETHODIMP -StreamToFile::OnStopBinding(nsIURI* aURL, PRInt32 status, const nsString& aMsg) +StreamToFile::OnStopRequest(nsIURI* aURL, PRInt32 status, const nsString& aMsg) { mDone = PR_TRUE; if (0 != status) { diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp index 7dc3c8ba891..9702859efdb 100644 --- a/mozilla/profile/src/nsProfile.cpp +++ b/mozilla/profile/src/nsProfile.cpp @@ -44,7 +44,11 @@ #ifdef XP_MAC +#ifdef NECKO +#include "nsIPrompt.h" +#else #include "nsINetSupport.h" +#endif #include "nsIStreamListener.h" #endif #include "nsIServiceManager.h" diff --git a/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp b/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp index 39c0936e88c..f2773bd422c 100644 --- a/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp +++ b/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp @@ -562,7 +562,7 @@ rdf_BlockingParse(nsIURI* aURL, nsIStreamListener* aConsumer) #ifndef NECKO // XXX I'm assuming necko will do this now // XXX shouldn't netlib be doing this??? - aConsumer->OnStartBinding(aURL, "text/rdf"); + aConsumer->OnStartRequest(aURL, "text/rdf"); #endif while (PR_TRUE) { char buf[1024]; @@ -588,7 +588,7 @@ rdf_BlockingParse(nsIURI* aURL, nsIStreamListener* aConsumer) } #ifndef NECKO // XXX I'm assuming necko will do this now // XXX shouldn't netlib be doing this??? - aConsumer->OnStopBinding(aURL, 0, nsnull); + aConsumer->OnStopRequest(aURL, 0, nsnull); #endif done: diff --git a/mozilla/rdf/datasource/src/nsFTPDataSource.cpp b/mozilla/rdf/datasource/src/nsFTPDataSource.cpp index c90080cb9d2..036993125a1 100644 --- a/mozilla/rdf/datasource/src/nsFTPDataSource.cpp +++ b/mozilla/rdf/datasource/src/nsFTPDataSource.cpp @@ -85,19 +85,17 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else // stream observer - NS_IMETHOD OnStartBinding(nsIURI *aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI *aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); // stream listener NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); @@ -609,9 +607,9 @@ FTPDataSourceCallback::~FTPDataSourceCallback() NS_IMETHODIMP #ifdef NECKO -FTPDataSourceCallback::OnStartBinding(nsISupports *ctxt) +FTPDataSourceCallback::OnStartRequest(nsISupports *ctxt) #else -FTPDataSourceCallback::OnStartBinding(nsIURI *aURL, const char *aContentType) +FTPDataSourceCallback::OnStartRequest(nsIURI *aURL, const char *aContentType) #endif { nsAutoString trueStr("true"); @@ -647,9 +645,9 @@ FTPDataSourceCallback::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -FTPDataSourceCallback::OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +FTPDataSourceCallback::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -FTPDataSourceCallback::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +FTPDataSourceCallback::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { nsAutoString trueStr("true"); diff --git a/mozilla/rdf/datasource/src/nsSearchDataSource.cpp b/mozilla/rdf/datasource/src/nsSearchDataSource.cpp index 3ecf854a588..eab59cb3b00 100755 --- a/mozilla/rdf/datasource/src/nsSearchDataSource.cpp +++ b/mozilla/rdf/datasource/src/nsSearchDataSource.cpp @@ -112,19 +112,17 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else // stream observer - NS_IMETHOD OnStartBinding(nsIURI *aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI *aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); // stream listener NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); @@ -1511,9 +1509,9 @@ SearchDataSourceCallback::~SearchDataSourceCallback() NS_IMETHODIMP #ifdef NECKO -SearchDataSourceCallback::OnStartBinding(nsISupports *ctxt) +SearchDataSourceCallback::OnStartRequest(nsISupports *ctxt) #else -SearchDataSourceCallback::OnStartBinding(nsIURI *aURL, const char *aContentType) +SearchDataSourceCallback::OnStartRequest(nsIURI *aURL, const char *aContentType) #endif { nsAutoString trueStr("true"); @@ -1521,7 +1519,7 @@ SearchDataSourceCallback::OnStartBinding(nsIURI *aURL, const char *aContentType) nsresult rv; #ifdef DEBUG - printf("SearchDataSourceCallback::OnStartBinding entered.\n"); + printf("SearchDataSourceCallback::OnStartRequest entered.\n"); #endif if (NS_SUCCEEDED(rv = gRDFService->GetLiteral(trueStr.GetUnicode(), &literal))) @@ -1554,9 +1552,9 @@ SearchDataSourceCallback::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -SearchDataSourceCallback::OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +SearchDataSourceCallback::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -SearchDataSourceCallback::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +SearchDataSourceCallback::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { nsAutoString trueStr("true"); @@ -1581,7 +1579,7 @@ SearchDataSourceCallback::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PR if (!mLine) { #ifdef DEBUG - printf(" *** SearchDataSourceCallback::OnStopBinding: no data.\n\n"); + printf(" *** SearchDataSourceCallback::OnStopRequest: no data.\n\n"); #endif return(NS_OK); diff --git a/mozilla/silentdl/nsSilentDownload.cpp b/mozilla/silentdl/nsSilentDownload.cpp index c6281e47160..c86b743391a 100644 --- a/mozilla/silentdl/nsSilentDownload.cpp +++ b/mozilla/silentdl/nsSilentDownload.cpp @@ -1108,14 +1108,14 @@ nsSilentDownloadListener::OnStatus(nsIURI* aURL, } NS_IMETHODIMP -nsSilentDownloadListener::OnStartBinding(nsIURI* aURL, +nsSilentDownloadListener::OnStartRequest(nsIURI* aURL, const char *aContentType) { return NS_OK; } NS_IMETHODIMP -nsSilentDownloadListener::OnStopBinding(nsIURI* aURL, +nsSilentDownloadListener::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) { diff --git a/mozilla/silentdl/nsSilentDownloadPrivate.h b/mozilla/silentdl/nsSilentDownloadPrivate.h index cbaabae16c4..8e169a5aaf1 100644 --- a/mozilla/silentdl/nsSilentDownloadPrivate.h +++ b/mozilla/silentdl/nsSilentDownloadPrivate.h @@ -58,9 +58,9 @@ class nsSilentDownloadListener : public nsIStreamListener NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* info); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); NS_METHOD SetSilentDownloadInfo(nsIDOMSilentDownloadTask* con); diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 2e8d1df2237..dccfbec572d 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -41,7 +41,7 @@ #include "nsILoadGroup.h" #include "nsNeckoUtil.h" #include "nsIURL.h" -#include "nsIIOService.h" + #include "nsIChannel.h" #include "nsIProgressEventSink.h" #endif // NECKO @@ -89,9 +89,6 @@ static NS_DEFINE_IID(kRefreshURLIID, NS_IREFRESHURL_IID); static NS_DEFINE_IID(kILoadGroupIID, NS_ILOADGROUP_IID); static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID); static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); -#else -static NS_DEFINE_IID(kIIOServiceIID, NS_IIOSERVICE_IID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #endif // NECKO static NS_DEFINE_IID(kIContentViewerContainerIID, NS_ICONTENT_VIEWER_CONTAINER_IID); static NS_DEFINE_CID(kGenericFactoryCID, NS_GENERICFACTORY_CID); @@ -135,16 +132,13 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg) { return NS_OK; } + const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, - PRUint32 sourceOffset, PRUint32 count); + PRUint32 sourceOffset, PRUint32 count); // nsIProgressEventSink methods: NS_IMETHOD OnProgress(nsISupports *ctxt, PRUint32 aProgress, PRUint32 aProgressMax); @@ -154,9 +148,9 @@ public: NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aStream, PRUint32 aLength); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); #endif nsresult GetStatus(void) { return mStatus; } @@ -176,7 +170,6 @@ protected: nsIStreamObserver* m_Observer; nsIStreamListener* m_NextStream; nsDocLoaderImpl* m_DocLoader; - nsresult mStatus; }; @@ -212,7 +205,7 @@ public: nsISupports* aExtraInfo = nsnull, nsIStreamObserver* anObserver = nsnull, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif @@ -221,7 +214,7 @@ public: NS_IMETHOD LoadSubDocument(const nsString& aURLSpec, nsISupports* aExtraInfo = nsnull, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif @@ -251,8 +244,8 @@ public: nsIStreamListener *aConsumer); #ifdef NECKO - NS_IMETHOD GetDefaultLoadAttributes(PRUint32 *aLoadAttribs); - NS_IMETHOD SetDefaultLoadAttributes(PRUint32 aLoadAttribs); + NS_IMETHOD GetDefaultLoadAttributes(nsLoadFlags *aLoadAttribs); + NS_IMETHOD SetDefaultLoadAttributes(nsLoadFlags aLoadAttribs); #else NS_IMETHOD GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs); NS_IMETHOD SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs); @@ -358,7 +351,7 @@ protected: nsVoidArray mChildGroupList; nsVoidArray mDocObservers; #ifdef NECKO - PRUint32 m_LoadAttrib; + nsLoadFlags m_LoadAttrib; #else nsCOMPtr m_LoadAttrib; #endif @@ -424,7 +417,7 @@ nsDocLoaderImpl::Init() rv = NS_NewISupportsArray(getter_AddRefs(m_LoadingDocsList)); if (NS_FAILED(rv)) return rv; #ifdef NECKO - rv = NS_NewLoadGroup(getter_AddRefs(mLoadGroup)); + rv = NS_NewLoadGroup(nsnull, getter_AddRefs(mLoadGroup)); if (NS_FAILED(rv)) return rv; #else rv = NS_NewLoadAttribs(getter_AddRefs(m_LoadAttrib)); @@ -565,7 +558,7 @@ nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec, nsISupports* aExtraInfo, nsIStreamObserver* anObserver, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -651,7 +644,7 @@ NS_IMETHODIMP nsDocLoaderImpl::LoadSubDocument(const nsString& aURLSpec, nsISupports* aExtraInfo, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -695,9 +688,12 @@ nsDocLoaderImpl::LoadSubDocument(const nsString& aURLSpec, NS_IMETHODIMP nsDocLoaderImpl::Stop(void) { + nsresult rv = NS_OK; PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, ("DocLoader:%p: Stop() called\n", this)); - +#ifdef NECKO + rv = mLoadGroup->Cancel(); +#else m_LoadingDocsList->EnumerateForwards(nsDocLoaderImpl::StopBindInfoEnumerator, nsnull); /* @@ -714,6 +710,7 @@ nsDocLoaderImpl::Stop(void) */ mChildGroupList.EnumerateForwards(nsDocLoaderImpl::StopDocLoaderEnumerator, nsnull); +#endif /* Reset the URL counters... */ mForegroundURLs = 0; mTotalURLs = 0; @@ -724,7 +721,7 @@ nsDocLoaderImpl::Stop(void) */ mStreamObserver = do_QueryInterface(0); // to be replaced with null_nsCOMPtr() - return NS_OK; + return rv; } @@ -923,7 +920,7 @@ done: NS_IMETHODIMP #ifdef NECKO -nsDocLoaderImpl::GetDefaultLoadAttributes(PRUint32 *aLoadAttribs) +nsDocLoaderImpl::GetDefaultLoadAttributes(nsLoadFlags *aLoadAttribs) #else nsDocLoaderImpl::GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs) #endif @@ -941,7 +938,7 @@ nsDocLoaderImpl::GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs) NS_IMETHODIMP #ifdef NECKO -nsDocLoaderImpl::SetDefaultLoadAttributes(PRUint32 aLoadAttribs) +nsDocLoaderImpl::SetDefaultLoadAttributes(nsLoadFlags aLoadAttribs) #else nsDocLoaderImpl::SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs) #endif @@ -1765,9 +1762,9 @@ NS_METHOD nsDocumentBindInfo::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -nsDocumentBindInfo::OnStartBinding(nsISupports *ctxt) +nsDocumentBindInfo::OnStartRequest(nsISupports *ctxt) #else -nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsDocumentBindInfo::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { nsresult rv = NS_OK; @@ -1792,7 +1789,7 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType) (void)aURL->GetSpec(&spec); PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, - ("DocumentBindInfo:%p OnStartBinding(...) called for %s. Content-type is %s\n", + ("DocumentBindInfo:%p OnStartRequest(...) called for %s. Content-type is %s\n", this, spec, aContentType)); #ifdef NECKO nsCRT::free(spec); @@ -1852,14 +1849,14 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType) } /* - * Pass the OnStartBinding(...) notification out to the document + * Pass the OnStartRequest(...) notification out to the document * IStreamListener. */ if (nsnull != m_NextStream) { #ifdef NECKO - rv = m_NextStream->OnStartBinding(channel); + rv = m_NextStream->OnStartRequest(channel); #else - rv = m_NextStream->OnStartBinding(aURL, aContentType); + rv = m_NextStream->OnStartRequest(aURL, aContentType); #endif } @@ -1878,9 +1875,9 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType) /* Pass the notification out to the Observer... */ if (nsnull != m_Observer) { #ifdef NECKO - nsresult rv2 = m_Observer->OnStartBinding(channel); + nsresult rv2 = m_Observer->OnStartRequest(channel); #else - nsresult rv2 = m_Observer->OnStartBinding(aURL, aContentType); + nsresult rv2 = m_Observer->OnStartRequest(aURL, aContentType); #endif if (NS_SUCCEEDED(rv)) rv = rv2; @@ -1962,10 +1959,10 @@ done: #ifdef NECKO -NS_METHOD nsDocumentBindInfo::OnStopBinding(nsISupports *ctxt, nsresult aStatus, +NS_METHOD nsDocumentBindInfo::OnStopRequest(nsISupports *ctxt, nsresult aStatus, const PRUnichar *aMsg) #else -NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_METHOD nsDocumentBindInfo::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { nsresult rv = NS_OK; @@ -1986,7 +1983,7 @@ NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, cons #endif (void)aURL->GetSpec(&spec); PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, - ("DocumentBindInfo:%p: OnStopBinding(...) called for %s. Status: %d.\n", + ("DocumentBindInfo:%p: OnStopRequest(...) called for %s. Status: %d.\n", this, spec, aStatus)); #ifdef NECKO nsCRT::free(spec); @@ -2007,7 +2004,7 @@ NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, cons else url = ""; #endif - cerr << "nsDocumentBindInfo::OnStopBinding: Load of URL '" << url << "' failed. Error code: " + cerr << "nsDocumentBindInfo::OnStopRequest: Load of URL '" << url << "' failed. Error code: " << NS_ERROR_GET_CODE(aStatus) << "\n"; #ifdef NECKO nsCRT::free(url); @@ -2017,9 +2014,9 @@ NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, cons if (nsnull != m_NextStream) { #ifdef NECKO - rv = m_NextStream->OnStopBinding(ctxt, aStatus, aMsg); + rv = m_NextStream->OnStopRequest(ctxt, aStatus, aMsg); #else - rv = m_NextStream->OnStopBinding(aURL, aStatus, aMsg); + rv = m_NextStream->OnStopRequest(aURL, aStatus, aMsg); #endif } @@ -2027,9 +2024,9 @@ NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, cons if (nsnull != m_Observer) { /* XXX: Should we ignore the return value? */ #ifdef NECKO - (void) m_Observer->OnStopBinding(ctxt, aStatus, aMsg); + (void) m_Observer->OnStopRequest(ctxt, aStatus, aMsg); #else - (void) m_Observer->OnStopBinding(aURL, aStatus, aMsg); + (void) m_Observer->OnStopRequest(aURL, aStatus, aMsg); #endif } diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp index b912fb04eab..6e6ba8d6282 100644 --- a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp +++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp @@ -445,10 +445,10 @@ CWebShellContainer::CreatePopup(nsIDOMElement* aElement, nsIDOMElement* aPopupCo NS_IMETHODIMP -CWebShellContainer::OnStartBinding(nsIURI* aURL, const char *aContentType) +CWebShellContainer::OnStartRequest(nsIURI* aURL, const char *aContentType) { USES_CONVERSION; - NG_TRACE(_T("CWebShellContainer::OnStartBinding(..., \"%s\")\n"), A2CT(aContentType)); + NG_TRACE(_T("CWebShellContainer::OnStartRequest(..., \"%s\")\n"), A2CT(aContentType)); return NS_OK; } @@ -478,10 +478,10 @@ CWebShellContainer::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP -CWebShellContainer::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +CWebShellContainer::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { USES_CONVERSION; - NG_TRACE(_T("CWebShellContainer::OnStopBinding(..., %d, \"%s\")\n"), (int) aStatus, W2T((PRUnichar *) aMsg)); + NG_TRACE(_T("CWebShellContainer::OnStopRequest(..., %d, \"%s\")\n"), (int) aStatus, W2T((PRUnichar *) aMsg)); // Fire a DownloadComplete event m_pEvents1->Fire_DownloadComplete(); diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.h b/mozilla/webshell/embed/ActiveX/WebShellContainer.h index a81c57dbb51..a86c74facaf 100644 --- a/mozilla/webshell/embed/ActiveX/WebShellContainer.h +++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.h @@ -84,10 +84,10 @@ public: nsIDOMWindow* aWindow); // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); // nsIDocumentLoaderObserver #ifdef NECKO diff --git a/mozilla/webshell/embed/gtk/lib/GtkMozillaContainer.cpp b/mozilla/webshell/embed/gtk/lib/GtkMozillaContainer.cpp index 09a4af639b9..c7f80c6552e 100644 --- a/mozilla/webshell/embed/gtk/lib/GtkMozillaContainer.cpp +++ b/mozilla/webshell/embed/gtk/lib/GtkMozillaContainer.cpp @@ -451,10 +451,10 @@ GtkMozillaContainer::StartStream(const char *base_url, const char *action, } /* - * Pass the OnStartBinding(...) notification out to the document + * Pass the OnStartRequest(...) notification out to the document * IStreamListener. */ - rv = listener->OnStartBinding(url, content_type); + rv = listener->OnStartRequest(url, content_type); if (NS_FAILED(rv)) { goto done; } @@ -504,7 +504,7 @@ GtkMozillaContainer::EndStream(void) if (NS_FAILED(rv)) return; - rv = mListener->OnStopBinding(mStreamURL, NS_OK, NULL); + rv = mListener->OnStopRequest(mStreamURL, NS_OK, NULL); if (NS_FAILED(rv)) return; diff --git a/mozilla/webshell/public/nsIDocumentLoader.h b/mozilla/webshell/public/nsIDocumentLoader.h index 71c6f14f78c..cd3a943cdc2 100644 --- a/mozilla/webshell/public/nsIDocumentLoader.h +++ b/mozilla/webshell/public/nsIDocumentLoader.h @@ -102,7 +102,7 @@ public: nsISupports* aExtraInfo = nsnull, nsIStreamObserver* anObserver = nsnull, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif @@ -111,7 +111,7 @@ public: NS_IMETHOD LoadSubDocument(const nsString& aURLSpec, nsISupports* aExtraInfo = nsnull, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif diff --git a/mozilla/webshell/public/nsIWebShell.h b/mozilla/webshell/public/nsIWebShell.h index 77f9b42bb65..f8a3963cee4 100644 --- a/mozilla/webshell/public/nsIWebShell.h +++ b/mozilla/webshell/public/nsIWebShell.h @@ -338,7 +338,7 @@ public: nsIPostData* aPostData=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType=nsURLReload, #endif @@ -352,7 +352,7 @@ public: nsIPostData* aPostData=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType=nsURLReload, #endif @@ -368,7 +368,7 @@ public: * Reload the current document. */ #ifdef NECKO - NS_IMETHOD Reload(PRUint32 aType) = 0; + NS_IMETHOD Reload(nsLoadFlags aType) = 0; #else NS_IMETHOD Reload(nsURLReloadType aType) = 0; #endif diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index 2e8d1df2237..dccfbec572d 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -41,7 +41,7 @@ #include "nsILoadGroup.h" #include "nsNeckoUtil.h" #include "nsIURL.h" -#include "nsIIOService.h" + #include "nsIChannel.h" #include "nsIProgressEventSink.h" #endif // NECKO @@ -89,9 +89,6 @@ static NS_DEFINE_IID(kRefreshURLIID, NS_IREFRESHURL_IID); static NS_DEFINE_IID(kILoadGroupIID, NS_ILOADGROUP_IID); static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID); static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); -#else -static NS_DEFINE_IID(kIIOServiceIID, NS_IIOSERVICE_IID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #endif // NECKO static NS_DEFINE_IID(kIContentViewerContainerIID, NS_ICONTENT_VIEWER_CONTAINER_IID); static NS_DEFINE_CID(kGenericFactoryCID, NS_GENERICFACTORY_CID); @@ -135,16 +132,13 @@ public: #ifdef NECKO // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg) { return NS_OK; } + const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, - PRUint32 sourceOffset, PRUint32 count); + PRUint32 sourceOffset, PRUint32 count); // nsIProgressEventSink methods: NS_IMETHOD OnProgress(nsISupports *ctxt, PRUint32 aProgress, PRUint32 aProgressMax); @@ -154,9 +148,9 @@ public: NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aStream, PRUint32 aLength); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); #endif nsresult GetStatus(void) { return mStatus; } @@ -176,7 +170,6 @@ protected: nsIStreamObserver* m_Observer; nsIStreamListener* m_NextStream; nsDocLoaderImpl* m_DocLoader; - nsresult mStatus; }; @@ -212,7 +205,7 @@ public: nsISupports* aExtraInfo = nsnull, nsIStreamObserver* anObserver = nsnull, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif @@ -221,7 +214,7 @@ public: NS_IMETHOD LoadSubDocument(const nsString& aURLSpec, nsISupports* aExtraInfo = nsnull, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif @@ -251,8 +244,8 @@ public: nsIStreamListener *aConsumer); #ifdef NECKO - NS_IMETHOD GetDefaultLoadAttributes(PRUint32 *aLoadAttribs); - NS_IMETHOD SetDefaultLoadAttributes(PRUint32 aLoadAttribs); + NS_IMETHOD GetDefaultLoadAttributes(nsLoadFlags *aLoadAttribs); + NS_IMETHOD SetDefaultLoadAttributes(nsLoadFlags aLoadAttribs); #else NS_IMETHOD GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs); NS_IMETHOD SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs); @@ -358,7 +351,7 @@ protected: nsVoidArray mChildGroupList; nsVoidArray mDocObservers; #ifdef NECKO - PRUint32 m_LoadAttrib; + nsLoadFlags m_LoadAttrib; #else nsCOMPtr m_LoadAttrib; #endif @@ -424,7 +417,7 @@ nsDocLoaderImpl::Init() rv = NS_NewISupportsArray(getter_AddRefs(m_LoadingDocsList)); if (NS_FAILED(rv)) return rv; #ifdef NECKO - rv = NS_NewLoadGroup(getter_AddRefs(mLoadGroup)); + rv = NS_NewLoadGroup(nsnull, getter_AddRefs(mLoadGroup)); if (NS_FAILED(rv)) return rv; #else rv = NS_NewLoadAttribs(getter_AddRefs(m_LoadAttrib)); @@ -565,7 +558,7 @@ nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec, nsISupports* aExtraInfo, nsIStreamObserver* anObserver, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -651,7 +644,7 @@ NS_IMETHODIMP nsDocLoaderImpl::LoadSubDocument(const nsString& aURLSpec, nsISupports* aExtraInfo, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -695,9 +688,12 @@ nsDocLoaderImpl::LoadSubDocument(const nsString& aURLSpec, NS_IMETHODIMP nsDocLoaderImpl::Stop(void) { + nsresult rv = NS_OK; PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, ("DocLoader:%p: Stop() called\n", this)); - +#ifdef NECKO + rv = mLoadGroup->Cancel(); +#else m_LoadingDocsList->EnumerateForwards(nsDocLoaderImpl::StopBindInfoEnumerator, nsnull); /* @@ -714,6 +710,7 @@ nsDocLoaderImpl::Stop(void) */ mChildGroupList.EnumerateForwards(nsDocLoaderImpl::StopDocLoaderEnumerator, nsnull); +#endif /* Reset the URL counters... */ mForegroundURLs = 0; mTotalURLs = 0; @@ -724,7 +721,7 @@ nsDocLoaderImpl::Stop(void) */ mStreamObserver = do_QueryInterface(0); // to be replaced with null_nsCOMPtr() - return NS_OK; + return rv; } @@ -923,7 +920,7 @@ done: NS_IMETHODIMP #ifdef NECKO -nsDocLoaderImpl::GetDefaultLoadAttributes(PRUint32 *aLoadAttribs) +nsDocLoaderImpl::GetDefaultLoadAttributes(nsLoadFlags *aLoadAttribs) #else nsDocLoaderImpl::GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs) #endif @@ -941,7 +938,7 @@ nsDocLoaderImpl::GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs) NS_IMETHODIMP #ifdef NECKO -nsDocLoaderImpl::SetDefaultLoadAttributes(PRUint32 aLoadAttribs) +nsDocLoaderImpl::SetDefaultLoadAttributes(nsLoadFlags aLoadAttribs) #else nsDocLoaderImpl::SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs) #endif @@ -1765,9 +1762,9 @@ NS_METHOD nsDocumentBindInfo::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -nsDocumentBindInfo::OnStartBinding(nsISupports *ctxt) +nsDocumentBindInfo::OnStartRequest(nsISupports *ctxt) #else -nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsDocumentBindInfo::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { nsresult rv = NS_OK; @@ -1792,7 +1789,7 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType) (void)aURL->GetSpec(&spec); PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, - ("DocumentBindInfo:%p OnStartBinding(...) called for %s. Content-type is %s\n", + ("DocumentBindInfo:%p OnStartRequest(...) called for %s. Content-type is %s\n", this, spec, aContentType)); #ifdef NECKO nsCRT::free(spec); @@ -1852,14 +1849,14 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType) } /* - * Pass the OnStartBinding(...) notification out to the document + * Pass the OnStartRequest(...) notification out to the document * IStreamListener. */ if (nsnull != m_NextStream) { #ifdef NECKO - rv = m_NextStream->OnStartBinding(channel); + rv = m_NextStream->OnStartRequest(channel); #else - rv = m_NextStream->OnStartBinding(aURL, aContentType); + rv = m_NextStream->OnStartRequest(aURL, aContentType); #endif } @@ -1878,9 +1875,9 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType) /* Pass the notification out to the Observer... */ if (nsnull != m_Observer) { #ifdef NECKO - nsresult rv2 = m_Observer->OnStartBinding(channel); + nsresult rv2 = m_Observer->OnStartRequest(channel); #else - nsresult rv2 = m_Observer->OnStartBinding(aURL, aContentType); + nsresult rv2 = m_Observer->OnStartRequest(aURL, aContentType); #endif if (NS_SUCCEEDED(rv)) rv = rv2; @@ -1962,10 +1959,10 @@ done: #ifdef NECKO -NS_METHOD nsDocumentBindInfo::OnStopBinding(nsISupports *ctxt, nsresult aStatus, +NS_METHOD nsDocumentBindInfo::OnStopRequest(nsISupports *ctxt, nsresult aStatus, const PRUnichar *aMsg) #else -NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +NS_METHOD nsDocumentBindInfo::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { nsresult rv = NS_OK; @@ -1986,7 +1983,7 @@ NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, cons #endif (void)aURL->GetSpec(&spec); PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, - ("DocumentBindInfo:%p: OnStopBinding(...) called for %s. Status: %d.\n", + ("DocumentBindInfo:%p: OnStopRequest(...) called for %s. Status: %d.\n", this, spec, aStatus)); #ifdef NECKO nsCRT::free(spec); @@ -2007,7 +2004,7 @@ NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, cons else url = ""; #endif - cerr << "nsDocumentBindInfo::OnStopBinding: Load of URL '" << url << "' failed. Error code: " + cerr << "nsDocumentBindInfo::OnStopRequest: Load of URL '" << url << "' failed. Error code: " << NS_ERROR_GET_CODE(aStatus) << "\n"; #ifdef NECKO nsCRT::free(url); @@ -2017,9 +2014,9 @@ NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, cons if (nsnull != m_NextStream) { #ifdef NECKO - rv = m_NextStream->OnStopBinding(ctxt, aStatus, aMsg); + rv = m_NextStream->OnStopRequest(ctxt, aStatus, aMsg); #else - rv = m_NextStream->OnStopBinding(aURL, aStatus, aMsg); + rv = m_NextStream->OnStopRequest(aURL, aStatus, aMsg); #endif } @@ -2027,9 +2024,9 @@ NS_METHOD nsDocumentBindInfo::OnStopBinding(nsIURI* aURL, nsresult aStatus, cons if (nsnull != m_Observer) { /* XXX: Should we ignore the return value? */ #ifdef NECKO - (void) m_Observer->OnStopBinding(ctxt, aStatus, aMsg); + (void) m_Observer->OnStopRequest(ctxt, aStatus, aMsg); #else - (void) m_Observer->OnStopBinding(aURL, aStatus, aMsg); + (void) m_Observer->OnStopRequest(aURL, aStatus, aMsg); #endif } diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 58fde3d4957..314fc15552f 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -24,7 +24,9 @@ #include "nsIDeviceContext.h" #include "nsILinkHandler.h" #include "nsIStreamListener.h" -#ifndef NECKO +#ifdef NECKO +#include "nsIPrompt.h" +#else #include "nsINetSupport.h" #include "nsIRefreshUrl.h" #endif @@ -133,7 +135,9 @@ class nsWebShell : public nsIWebShell, public nsILinkHandler, public nsIScriptContextOwner, public nsIDocumentLoaderObserver, -#ifndef NECKO +#ifdef NECKO + public nsIPrompt, +#else public nsIRefreshUrl, public nsINetSupport, #endif @@ -216,7 +220,7 @@ public: nsIPostData* aPostData=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif @@ -226,7 +230,7 @@ public: nsIPostData* aPostData=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO - PRUint32 aType = nsIChannel::LOAD_NORMAL, + nsLoadFlags aType = nsIChannel::LOAD_NORMAL, #else nsURLReloadType aType = nsURLReload, #endif @@ -234,7 +238,7 @@ public: NS_IMETHOD Stop(void); #ifdef NECKO - NS_IMETHOD Reload(PRUint32 aType); + NS_IMETHOD Reload(nsLoadFlags aType); #else NS_IMETHOD Reload(nsURLReloadType aType); #endif @@ -352,13 +356,21 @@ public: #if 0 // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); #endif /* 0 */ - +#ifdef NECKO + // nsIPrompt + NS_IMETHOD Alert(const PRUnichar *text); + NS_IMETHOD Confirm(const PRUnichar *text, PRBool *_retval); + NS_IMETHOD ConfirmCheck(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); + NS_IMETHOD Prompt(const PRUnichar *text, const PRUnichar *defaultText, PRUnichar **result, PRBool *_retval); + NS_IMETHOD PromptUsernameAndPassword(const PRUnichar *text, PRUnichar **user, PRUnichar **pwd, PRBool *_retval); + NS_IMETHOD PromptPassword(const PRUnichar *text, PRUnichar **pwd, PRBool *_retval); +#else // nsINetSupport interface methods NS_IMETHOD_(void) Alert(const nsString &aText); NS_IMETHOD_(PRBool) Confirm(const nsString &aText); @@ -370,6 +382,7 @@ public: nsString &aPassword); NS_IMETHOD_(PRBool) PromptPassword(const nsString &aText, nsString &aPassword); +#endif // nsIClipboardCommands NS_IMETHOD CanCutSelection (PRBool* aResult); @@ -437,7 +450,9 @@ protected: nsIWidget* mWindow; nsIDocumentLoader* mDocLoader; nsIDocumentLoaderObserver* mDocLoaderObserver; -#ifndef NECKO +#ifdef NECKO + nsIPrompt* mPrompter; +#else nsINetSupport* mNetSupport; #endif @@ -475,7 +490,7 @@ protected: const char* aCommand, nsIPostData* aPostData, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -617,6 +632,11 @@ nsWebShell::nsWebShell() mHintCharsetSource = kCharsetUninitialized; mForceCharacterSet = ""; mHistoryService = nsnull; +#ifdef NECKO + mPrompter = nsnull; +#else + mNetSupport = nsnull; +#endif } nsWebShell::~nsWebShell() @@ -646,7 +666,9 @@ nsWebShell::~nsWebShell() NS_IF_RELEASE(mPrefs); NS_IF_RELEASE(mContainer); NS_IF_RELEASE(mObserver); -#ifndef NECKO +#ifdef NECKO + NS_IF_RELEASE(mPrompter); +#else NS_IF_RELEASE(mNetSupport); #endif @@ -787,6 +809,14 @@ nsWebShell::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_ADDREF_THIS(); return NS_OK; } +#endif +#ifdef NECKO + if (aIID.Equals(nsIPrompt::GetIID())) { + *aInstancePtr = (void*) ((nsIPrompt*)this); + NS_ADDREF_THIS(); + return NS_OK; + } +#else if (aIID.Equals(kINetSupportIID)) { *aInstancePtr = (void*) ((nsINetSupport*)this); NS_ADDREF_THIS(); @@ -1243,13 +1273,17 @@ NS_IMETHODIMP nsWebShell::SetObserver(nsIStreamObserver* anObserver) { NS_IF_RELEASE(mObserver); -#ifndef NECKO +#ifdef NECKO + NS_IF_RELEASE(mPrompter); +#else NS_IF_RELEASE(mNetSupport); #endif mObserver = anObserver; if (nsnull != mObserver) { -#ifndef NECKO +#ifdef NECKO + mObserver->QueryInterface(nsIPrompt::GetIID(), (void**)&mPrompter); +#else mObserver->QueryInterface(kINetSupportIID, (void **) &mNetSupport); #endif NS_ADDREF(mObserver); @@ -1700,7 +1734,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, nsIPostData* aPostData, PRBool aModifyHistory, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -1718,7 +1752,7 @@ nsWebShell::DoLoadURL(const nsString& aUrlSpec, const char* aCommand, nsIPostData* aPostData, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -1833,7 +1867,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, nsIPostData* aPostData, PRBool aModifyHistory, #ifdef NECKO - PRUint32 aType, + nsLoadFlags aType, #else nsURLReloadType aType, #endif @@ -1966,7 +2000,7 @@ NS_IMETHODIMP nsWebShell::Stop(void) } #ifdef NECKO -NS_IMETHODIMP nsWebShell::Reload(PRUint32 aType) +NS_IMETHODIMP nsWebShell::Reload(nsLoadFlags aType) #else NS_IMETHODIMP nsWebShell::Reload(nsURLReloadType aType) #endif @@ -3160,12 +3194,12 @@ nsresult nsWebShell::CheckForTrailingSlash(nsIURI* aURL) #if 0 NS_IMETHODIMP -nsWebShell::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsWebShell::OnStartRequest(nsIURI* aURL, const char *aContentType) { nsresult rv = NS_OK; if (nsnull != mObserver) { - rv = mObserver->OnStartBinding(aURL, aContentType); + rv = mObserver->OnStartRequest(aURL, aContentType); } return rv; } @@ -3216,12 +3250,12 @@ nsWebShell::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP -nsWebShell::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +nsWebShell::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) { nsresult rv = NS_OK; if (nsnull != mObserver) { - rv = mObserver->OnStopBinding(aURL, aStatus, aMsg); + rv = mObserver->OnStopRequest(aURL, aStatus, aMsg); } return rv; } @@ -3230,11 +3264,18 @@ nsWebShell::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) //---------------------------------------------------------------------- +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::Alert(const PRUnichar *text) +#else NS_IMETHODIMP_(void) nsWebShell::Alert(const nsString &aText) +#endif { #ifdef NECKO - NS_ASSERTION(0, "help"); + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->Alert(text); #else if (nsnull != mNetSupport) { mNetSupport->Alert(aText); @@ -3242,69 +3283,117 @@ nsWebShell::Alert(const nsString &aText) #endif } +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::Confirm(const PRUnichar *text, + PRBool *result) +#else NS_IMETHODIMP_(PRBool) nsWebShell::Confirm(const nsString &aText) +#endif { +#ifdef NECKO + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->Confirm(text, result); +#else PRBool bResult = PR_FALSE; -#ifdef NECKO - NS_ASSERTION(0, "help"); -#else if (nsnull != mNetSupport) { bResult = mNetSupport->Confirm(aText); } -#endif return bResult; +#endif } +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::ConfirmCheck(const PRUnichar *text, + const PRUnichar *checkMsg, + PRBool *checkValue, + PRBool *result) +{ + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->ConfirmCheck(text, checkMsg, checkValue, result); +} +#endif + +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::Prompt(const PRUnichar *text, + const PRUnichar *defaultText, + PRUnichar **result, + PRBool *_retval) +#else NS_IMETHODIMP_(PRBool) nsWebShell::Prompt(const nsString &aText, const nsString &aDefault, nsString &aResult) +#endif { - PRBool bResult = PR_FALSE; - #ifdef NECKO - NS_ASSERTION(0, "help"); + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->Prompt(text, defaultText, result, _retval); #else + PRBool bResult = PR_FALSE; if (nsnull != mNetSupport) { bResult = mNetSupport->Prompt(aText, aDefault, aResult); } -#endif return bResult; +#endif } +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::PromptUsernameAndPassword(const PRUnichar *text, + PRUnichar **user, + PRUnichar **pwd, + PRBool *_retval) +#else NS_IMETHODIMP_(PRBool) nsWebShell::PromptUserAndPassword(const nsString &aText, nsString &aUser, nsString &aPassword) +#endif { - PRBool bResult = PR_FALSE; - #ifdef NECKO - NS_ASSERTION(0, "help"); + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->PromptUsernameAndPassword(text, user, pwd, _retval); #else + PRBool bResult = PR_FALSE; if (nsnull != mNetSupport) { bResult = mNetSupport->PromptUserAndPassword(aText, aUser, aPassword); } -#endif return bResult; +#endif } +#ifdef NECKO +NS_IMETHODIMP +nsWebShell::PromptPassword(const PRUnichar *text, + PRUnichar **pwd, + PRBool *_retval) +#else NS_IMETHODIMP_(PRBool) nsWebShell::PromptPassword(const nsString &aText, nsString &aPassword) +#endif { +#ifdef NECKO + if (mPrompter == nsnull) + return NS_OK; + return mPrompter->PromptPassword(text, pwd, _retval); +#else PRBool bResult = PR_FALSE; -#ifdef NECKO - NS_ASSERTION(0, "help"); -#else if (nsnull != mNetSupport) { bResult = mNetSupport->PromptPassword(aText, aPassword); } -#endif return bResult; +#endif } //---------------------------------------------------- diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index 971e8f56b49..5a5cea92292 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1098,6 +1098,7 @@ nsBrowserWindow::QueryInterface(const nsIID& aIID, return NS_OK; } #else + // XXX I don't think so... if (aIID.Equals(kINetSupportIID)) { *aInstancePtrResult = (void*) ((nsINetSupport*)this); NS_ADDREF_THIS(); @@ -1920,9 +1921,9 @@ nsBrowserWindow::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -nsBrowserWindow::OnStartBinding(nsISupports *ctxt) +nsBrowserWindow::OnStartRequest(nsISupports *ctxt) #else -nsBrowserWindow::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsBrowserWindow::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { nsresult rv; @@ -1961,9 +1962,9 @@ nsBrowserWindow::OnStartBinding(nsIURI* aURL, const char *aContentType) NS_IMETHODIMP #ifdef NECKO -nsBrowserWindow::OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +nsBrowserWindow::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -nsBrowserWindow::OnStopBinding(nsIURI* aURL, +nsBrowserWindow::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.h b/mozilla/webshell/tests/viewer/nsBrowserWindow.h index 0e9fe2aad86..6216ee7fb32 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.h +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.h @@ -107,10 +107,8 @@ public: #ifdef NECKO // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIProgressEventSink NS_IMETHOD OnProgress(nsISupports *ctxt, PRUint32 aProgress, PRUint32 aProgressMax); @@ -118,10 +116,10 @@ public: #else // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif // nsIWebShellContainer diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp index 4976e080081..f0b61964a5b 100644 --- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp @@ -29,6 +29,7 @@ #endif #ifdef NECKO +#include "nsIPrompt.h" #else #include "nsINetSupport.h" #endif @@ -601,9 +602,9 @@ NS_IMETHODIMP nsXPBaseWindow::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) //---------------------------------------- #ifdef NECKO -NS_IMETHODIMP nsXPBaseWindow::OnStartBinding(nsISupports *ctxt) +NS_IMETHODIMP nsXPBaseWindow::OnStartRequest(nsISupports *ctxt) #else -NS_IMETHODIMP nsXPBaseWindow::OnStartBinding(nsIURI* aURL, const char *aContentType) +NS_IMETHODIMP nsXPBaseWindow::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { return NS_OK; @@ -611,15 +612,16 @@ NS_IMETHODIMP nsXPBaseWindow::OnStartBinding(nsIURI* aURL, const char *aContentT //---------------------------------------- #ifdef NECKO -NS_IMETHODIMP nsXPBaseWindow::OnStopBinding(nsISupports *ctxt, nsresult status, +NS_IMETHODIMP nsXPBaseWindow::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -NS_IMETHODIMP nsXPBaseWindow::OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) +NS_IMETHODIMP nsXPBaseWindow::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif { return NS_OK; } +#ifndef NECKO //---------------------------------------- NS_IMETHODIMP_(void) nsXPBaseWindow::Alert(const nsString &aText) { @@ -710,7 +712,7 @@ NS_IMETHODIMP_(PRBool) nsXPBaseWindow::PromptPassword(const nsString &aText, return PR_TRUE; } - +#endif // NECKO //---------------------------------------------------------------------- diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.h b/mozilla/webshell/tests/viewer/nsXPBaseWindow.h index da09fb73d83..ef5f4290985 100644 --- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.h +++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.h @@ -91,18 +91,15 @@ public: #ifdef NECKO // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg) { return NS_OK; } + const PRUnichar *errorMsg); #else // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif // nsIWebShellContainer @@ -122,6 +119,7 @@ public: NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken); +#ifndef NECKO // nsINetSupport NS_IMETHOD_(void) Alert(const nsString &aText); NS_IMETHOD_(PRBool) Confirm(const nsString &aText); @@ -133,6 +131,7 @@ public: nsString &aPassword); NS_IMETHOD_(PRBool) PromptPassword(const nsString &aText, nsString &aPassword); +#endif void Layout(PRInt32 aWidth, PRInt32 aHeight); diff --git a/mozilla/xpfe/AppCores/public/nsIDOMBrowserAppCore.h b/mozilla/xpfe/AppCores/public/nsIDOMBrowserAppCore.h index 754c87299c4..5ba4eaeefcb 100644 --- a/mozilla/xpfe/AppCores/public/nsIDOMBrowserAppCore.h +++ b/mozilla/xpfe/AppCores/public/nsIDOMBrowserAppCore.h @@ -24,6 +24,9 @@ #include "nsString.h" #include "nsIScriptContext.h" #include "nsIDOMBaseAppCore.h" +#ifdef NECKO +#include "nsIChannel.h" // for nsLoadFlags +#endif class nsIDOMWindow; @@ -39,7 +42,11 @@ public: NS_IMETHOD Forward()=0; +#ifdef NECKO + NS_IMETHOD Reload(nsLoadFlags aReloadType)=0; +#else NS_IMETHOD Reload(PRInt32 aReloadType)=0; +#endif NS_IMETHOD Stop()=0; @@ -86,11 +93,16 @@ public: NS_IMETHOD FindNext()=0; }; +#ifdef NECKO +#define RELOAD_ARG_TYPE nsLoadFlags +#else +#define RELOAD_ARG_TYPE PRInt32 +#endif #define NS_DECL_IDOMBROWSERAPPCORE \ NS_IMETHOD Back(); \ NS_IMETHOD Forward(); \ - NS_IMETHOD Reload(PRInt32 aReloadType); \ + NS_IMETHOD Reload(RELOAD_ARG_TYPE aReloadType); \ NS_IMETHOD Stop(); \ NS_IMETHOD LoadUrl(const nsString& aUrl); \ NS_IMETHOD LoadInitialPage(); \ @@ -119,7 +131,7 @@ public: #define NS_FORWARD_IDOMBROWSERAPPCORE(_to) \ NS_IMETHOD Back() { return _to Back(); } \ NS_IMETHOD Forward() { return _to Forward(); } \ - NS_IMETHOD Reload(PRInt32 aReloadType) { return _to Reload(aReloadType); } \ + NS_IMETHOD Reload(RELOAD_ARG_TYPE aReloadType) { return _to Reload(aReloadType); } \ NS_IMETHOD Stop() { return _to Stop(); } \ NS_IMETHOD LoadUrl(const nsString& aUrl) { return _to LoadUrl(aUrl); } \ NS_IMETHOD LoadInitialPage() { return _to LoadInitialPage(); } \ diff --git a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp index 0e836f905b8..57777971cdc 100644 --- a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp +++ b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp @@ -199,6 +199,11 @@ nsBrowserAppCore::QueryInterface(REFNSIID aIID,void** aInstancePtr) return NS_OK; } #ifdef NECKO + if (aIID.Equals(nsIPrompt::GetIID())) { + *aInstancePtr = (void*) ((nsIPrompt*)this); + NS_ADDREF_THIS(); + return NS_OK; + } #else if (aIID.Equals(kINetSupportIID)) { *aInstancePtr = (void*) ((nsINetSupport*)this); @@ -337,9 +342,16 @@ nsBrowserAppCore::Back() } NS_IMETHODIMP +#ifdef NECKO +nsBrowserAppCore::Reload(nsLoadFlags flags) +#else nsBrowserAppCore::Reload(PRInt32 aType) +#endif { -#ifndef NECKO +#ifdef NECKO + if (mContentAreaWebShell) + Reload(mContentAreaWebShell, flags); +#else if (mContentAreaWebShell) Reload(mContentAreaWebShell, (nsURLReloadType) aType); #endif /* NECKO */ @@ -1354,7 +1366,7 @@ NS_IMETHODIMP #ifndef NECKO nsBrowserAppCore::Reload(nsIWebShell * aPrev, nsURLReloadType aType) #else -nsBrowserAppCore::Reload(nsIWebShell * aPrev, PRUint32 aType) +nsBrowserAppCore::Reload(nsIWebShell * aPrev, nsLoadFlags aType) #endif // NECKO { @@ -1801,6 +1813,76 @@ nsBrowserAppCore::DoDialog() //---------------------------------------------------------------------- +#ifdef NECKO + +NS_IMETHODIMP +nsBrowserAppCore::Alert(const PRUnichar *text) +{ + if (APP_DEBUG) printf("Alert\n"); + return NS_OK; +} + +NS_IMETHODIMP +nsBrowserAppCore::Confirm(const PRUnichar *text, + PRBool *result) +{ + PRBool bResult = PR_FALSE; + if (APP_DEBUG) printf("Confirm\n"); + *result = bResult; + return NS_OK; +} + +NS_IMETHODIMP +nsBrowserAppCore::ConfirmCheck(const PRUnichar *text, + const PRUnichar *checkMsg, + PRBool *checkValue, + PRBool *result) +{ + PRBool bResult = PR_FALSE; + if (APP_DEBUG) printf("ConfirmCheck\n"); + *result = bResult; + return NS_OK; +} + +NS_IMETHODIMP +nsBrowserAppCore::Prompt(const PRUnichar *text, + const PRUnichar *defaultText, + PRUnichar **resultText, + PRBool *result) +{ + PRBool bResult = PR_FALSE; + if (APP_DEBUG) printf("Prompt\n"); + *resultText = nsnull; + *result = bResult; + return NS_OK; +} + +NS_IMETHODIMP +nsBrowserAppCore::PromptUsernameAndPassword(const PRUnichar *text, + PRUnichar **user, + PRUnichar **pwd, + PRBool *result) +{ + PRBool bResult = PR_FALSE; + if (APP_DEBUG) printf("PromptUserAndPassword\n"); + DoDialog(); + *result = bResult; + return NS_OK; +} + +NS_IMETHODIMP +nsBrowserAppCore::PromptPassword(const PRUnichar *text, + PRUnichar **pwd, + PRBool *result) +{ + PRBool bResult = PR_FALSE; + if (APP_DEBUG) printf("PromptPassword\n"); + *result = bResult; + return NS_OK; +} + +#else // !NECKO + NS_IMETHODIMP_(void) nsBrowserAppCore::Alert(const nsString &aText) { @@ -1845,6 +1927,8 @@ nsBrowserAppCore::PromptPassword(const nsString &aText, return bResult; } +#endif // !NECKO + static nsresult FindNamedXULElement(nsIWebShell * aShell, diff --git a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.h b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.h index 87954ece68e..1ffd28cab2f 100644 --- a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.h +++ b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.h @@ -27,6 +27,7 @@ #include "nsIDOMBrowserAppCore.h" #include "nsBaseAppCore.h" #ifdef NECKO +#include "nsIPrompt.h" #else #include "nsINetSupport.h" #endif @@ -52,6 +53,7 @@ class nsIFindComponent; class nsBrowserAppCore : public nsBaseAppCore, public nsIDOMBrowserAppCore, #ifdef NECKO + public nsIPrompt, #else public nsINetSupport, #endif @@ -73,7 +75,11 @@ class nsBrowserAppCore : public nsBaseAppCore, NS_IMETHOD Back(); NS_IMETHOD Forward(); +#ifdef NECKO + NS_IMETHOD Reload(nsLoadFlags aType); +#else NS_IMETHOD Reload(PRInt32 aType); +#endif NS_IMETHOD Stop(); NS_IMETHOD WalletPreview(nsIDOMWindow* aWin, nsIDOMWindow* aForm); @@ -126,6 +132,15 @@ class nsBrowserAppCore : public nsBaseAppCore, const char *aCommand ); #endif +#ifdef NECKO + // nsIPrompt + NS_IMETHOD Alert(const PRUnichar *text); + NS_IMETHOD Confirm(const PRUnichar *text, PRBool *_retval); + NS_IMETHOD ConfirmCheck(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); + NS_IMETHOD Prompt(const PRUnichar *text, const PRUnichar *defaultText, PRUnichar **result, PRBool *_retval); + NS_IMETHOD PromptUsernameAndPassword(const PRUnichar *text, PRUnichar **user, PRUnichar **pwd, PRBool *_retval); + NS_IMETHOD PromptPassword(const PRUnichar *text, PRUnichar **pwd, PRBool *_retval); +#else // nsINetSupport NS_IMETHOD_(void) Alert(const nsString &aText); @@ -142,6 +157,7 @@ class nsBrowserAppCore : public nsBaseAppCore, NS_IMETHOD_(PRBool) PromptPassword(const nsString &aText, nsString &aPassword); +#endif // nsIObserver NS_DECL_IOBSERVER @@ -152,7 +168,7 @@ class nsBrowserAppCore : public nsBaseAppCore, NS_IMETHOD GoBack(nsIWebShell * aPrev); #ifdef NECKO - NS_IMETHOD Reload(nsIWebShell * aPrev, PRUint32 aType); + NS_IMETHOD Reload(nsIWebShell * aPrev, nsLoadFlags aType); #else NS_IMETHOD Reload(nsIWebShell * aPrev, nsURLReloadType aType); #endif /* NECKO */ diff --git a/mozilla/xpfe/appshell/public/nsINetSupportDialogService.h b/mozilla/xpfe/appshell/public/nsINetSupportDialogService.h index 0a4a24dbdeb..1cb62262ef0 100644 --- a/mozilla/xpfe/appshell/public/nsINetSupportDialogService.h +++ b/mozilla/xpfe/appshell/public/nsINetSupportDialogService.h @@ -21,39 +21,50 @@ #ifndef _nsINetSupportDialog_h__ #define _nsINetSupportDialog_h__ -#include "nsString.h" class nsIFactory; + +#ifndef NECKO +// XXX In Necko, all this is subsumed by the nsIPrompt interface. + +#include "nsString.h" // {05650683-eb9f-11d2-8e19-9ac64aca4d3c} #define NS_INETSUPPORTDIALOGSERVICE_IID \ { 0x05650683, 0xeb9f, 0x11d2, { 0x8e, 0x19, 0x9a, 0xc6, 0x4a, 0xca, 0x4d, 0x3c } } -// {05650684-eb9f-11d2-8e19-9ac64aca4d3c} -#define NS_NETSUPPORTDIALOG_CID \ -{ 0x05650684, 0xeb9f, 0x11d2, { 0x8e, 0x19, 0x9a, 0xc6, 0x4a, 0xca, 0x4d, 0x3c } } - class nsINetSupportDialogService : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_INETSUPPORTDIALOGSERVICE_IID; return iid; } NS_IMETHOD Alert( const nsString &aText ) =0 ; - NS_IMETHOD Confirm( const nsString &aText, PRInt32* returnValue ) =0; + NS_IMETHOD Confirm( const nsString &aText, PRInt32* returnValue ) =0; NS_IMETHOD ConfirmCheck( const nsString &aText, const nsString& aCheckMsg, PRInt32* returnValue, PRBool* checkValue ) =0; - NS_IMETHOD Prompt( const nsString &aText, - const nsString &aDefault, - nsString &aResult - ,PRInt32* returnValue ) =0 ; + NS_IMETHOD Prompt( const nsString &aText, + const nsString &aDefault, + nsString &aResult + ,PRInt32* returnValue ) =0 ; - NS_IMETHOD PromptUserAndPassword( const nsString &aText, - nsString &aUser, - nsString &aPassword - ,PRInt32* returnValue ) =0 ; + NS_IMETHOD PromptUserAndPassword( const nsString &aText, + nsString &aUser, + nsString &aPassword + ,PRInt32* returnValue ) =0 ; - NS_IMETHOD PromptPassword( const nsString &aText, - nsString &aPassword, - PRInt32* returnValue ) = 0; + NS_IMETHOD PromptPassword( const nsString &aText, + nsString &aPassword, + PRInt32* returnValue ) = 0; }; +#else + +#include "nsIPrompt.h" + +#endif // NECKO + +// {05650684-eb9f-11d2-8e19-9ac64aca4d3c} +#define NS_NETSUPPORTDIALOG_CID \ +{ 0x05650684, 0xeb9f, 0x11d2, { 0x8e, 0x19, 0x9a, 0xc6, 0x4a, 0xca, 0x4d, 0x3c } } + nsresult NS_NewNetSupportDialogFactory(nsIFactory** result); + #endif diff --git a/mozilla/xpfe/appshell/public/nsISessionHistory.h b/mozilla/xpfe/appshell/public/nsISessionHistory.h index 93b57a03878..4f94054b265 100644 --- a/mozilla/xpfe/appshell/public/nsISessionHistory.h +++ b/mozilla/xpfe/appshell/public/nsISessionHistory.h @@ -22,7 +22,9 @@ #include "nsISupports.h" #include "nsIFactory.h" -#ifndef NECKO +#ifdef NECKO +#include "nsIChannel.h" +#else #include "nsILoadAttribs.h" #endif // NECKO @@ -65,7 +67,7 @@ public: * Reload the current history entry */ #ifdef NECKO - NS_IMETHOD Reload(nsIWebShell * aPrev, PRUint32 aReloadFlags) = 0; + NS_IMETHOD Reload(nsIWebShell * aPrev, nsLoadFlags aReloadFlags) = 0; #else NS_IMETHOD Reload(nsIWebShell * aPrev, nsURLReloadType aReloadType) = 0; #endif diff --git a/mozilla/xpfe/appshell/src/nsDefaultHelper.cpp b/mozilla/xpfe/appshell/src/nsDefaultHelper.cpp index c243628f411..48d6c7d9459 100644 --- a/mozilla/xpfe/appshell/src/nsDefaultHelper.cpp +++ b/mozilla/xpfe/appshell/src/nsDefaultHelper.cpp @@ -240,13 +240,29 @@ nsresult nsDefaultProtocolHelper::HandleNotification(nsIBlockingNotification *aC PRInt32 result; nsresult rv; +#ifdef NECKO + NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv); +#else NS_WITH_SERVICE(nsINetSupportDialogService, dialog, kNetSupportDialogCID, &rv); +#endif if (NS_FAILED(rv)) return NS_ERROR_FAILURE; - if ( dialog ) - dialog->PromptUserAndPassword( aText, aUser, aPass, &result ); - + if ( dialog ) { +#ifdef NECKO + PRUnichar* usr; + PRUnichar* pwd; + rv = dialog->PromptUsernameAndPassword(aText.GetUnicode(), &usr, &pwd, &result); + if (NS_SUCCEEDED(rv)) { + aUser = usr; + delete[] usr; + aPass = pwd; + delete[] pwd; + } +#else + dialog->PromptUserAndPassword( aText, aUser, aPass, &result ); +#endif + } if ( result == 1 ) bResult = NS_NOTIFY_SUCCEEDED; else diff --git a/mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp b/mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp index 75179e0b99b..c0b399dd05b 100644 --- a/mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp +++ b/mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp @@ -31,9 +31,7 @@ #include "nsAppShellCIDs.h" #include "nsIURL.h" #ifdef NECKO -#include "nsIIOService.h" -#include "nsIURL.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); +#include "nsNeckoUtil.h" #endif // NECKO #include "nsIDOMHTMLInputElement.h" #include "nsIWebShellWindow.h" @@ -52,7 +50,9 @@ static NS_DEFINE_IID(kIAppShellServiceIID, NS_IAPPSHELL_SERVICE_IID); static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); static NS_DEFINE_IID(kIDOMEventReceiverIID, NS_IDOMEVENTRECEIVER_IID); +#ifndef NECKO static NS_DEFINE_IID(kINetSupportDialogIID, NS_INETSUPPORTDIALOGSERVICE_IID); +#endif static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); // Copy and paste #define APP_DEBUG 1 @@ -313,7 +313,6 @@ nsNetSupportDialog::~nsNetSupportDialog() void nsNetSupportDialog::Init() { - mDefault = NULL; mUser = NULL; mPassword = NULL; @@ -322,23 +321,37 @@ void nsNetSupportDialog::Init() mOKButton = NULL; mCancelButton = NULL; mCheckValue = NULL; - mCheckMsg = NULL; + mCheckMsg = NULL; mWebShell = NULL; mWebShellWindow = NULL; } +#ifdef NECKO +NS_IMETHODIMP nsNetSupportDialog::Alert(const PRUnichar *text) +#else NS_IMETHODIMP nsNetSupportDialog::Alert( const nsString &aText ) +#endif { Init(); +#ifdef NECKO + nsAutoString aText(text); +#endif mMsg = &aText; nsString url( "resource:/res/samples/NetSupportAlert.xul") ; DoDialog( url ); return NS_OK; } +#ifdef NECKO +NS_IMETHODIMP nsNetSupportDialog::Confirm(const PRUnichar *text, PRBool *returnValue) +#else NS_IMETHODIMP nsNetSupportDialog::Confirm( const nsString &aText, PRInt32* returnValue ) +#endif { Init(); +#ifdef NECKO + nsAutoString aText(text); +#endif mMsg = &aText; mReturnValue = returnValue; nsString url( "resource:/res/samples/NetSupportConfirm.xul") ; @@ -346,9 +359,20 @@ NS_IMETHODIMP nsNetSupportDialog::Confirm( const nsString &aText, PRInt32* retur return NS_OK; } +#ifdef NECKO +NS_IMETHODIMP nsNetSupportDialog::ConfirmCheck(const PRUnichar *text, + const PRUnichar *checkMsg, + PRBool *checkValue, + PRBool *returnValue) +#else NS_IMETHODIMP nsNetSupportDialog::ConfirmCheck( const nsString &aText, const nsString& aCheckMsg, PRInt32* returnValue, PRBool* checkValue ) +#endif { Init(); +#ifdef NECKO + nsAutoString aText(text); + nsAutoString aCheckMsg(checkMsg); +#endif mMsg = &aText; mReturnValue = returnValue; mCheckValue = checkValue; @@ -358,44 +382,87 @@ NS_IMETHODIMP nsNetSupportDialog::ConfirmCheck( const nsString &aText, const nsS return NS_OK; } +#ifdef NECKO +NS_IMETHODIMP nsNetSupportDialog::Prompt(const PRUnichar *text, + const PRUnichar *defaultText, + PRUnichar **resultText, + PRBool *returnValue) +#else NS_IMETHODIMP nsNetSupportDialog::Prompt( const nsString &aText, const nsString &aDefault,nsString &aResult, PRInt32* returnValue ) +#endif { - Init(); + Init(); +#ifdef NECKO + nsAutoString aText(text); + nsAutoString aDefault(defaultText); + nsAutoString aResult; +#endif mMsg = &aText; mDefault = &aDefault; mUser = &aResult; mReturnValue = returnValue; nsString url( "resource:/res/samples/NetSupportPrompt.xul") ; DoDialog( url ); +#ifdef NECKO + *resultText = aResult.ToNewUnicode(); +#endif return NS_OK; } +#ifdef NECKO +NS_IMETHODIMP nsNetSupportDialog::PromptUsernameAndPassword(const PRUnichar *text, + PRUnichar **user, + PRUnichar **pwd, + PRBool *returnValue) +#else NS_IMETHODIMP nsNetSupportDialog::PromptUserAndPassword( const nsString &aText, nsString &aUser, nsString &aPassword,PRInt32* returnValue ) - +#endif { Init(); +#ifdef NECKO + nsAutoString aText(text); + nsAutoString aUser; + nsAutoString aPassword; +#endif mMsg = &aText; mUser = &aUser; mPassword = &aPassword; mReturnValue = returnValue; nsString url( "resource:/res/samples/NetSupportUserPassword.xul") ; DoDialog( url ); +#ifdef NECKO + *user = aUser.ToNewUnicode(); + *pwd = aPassword.ToNewUnicode(); +#endif return NS_OK; } +#ifdef NECKO +NS_IMETHODIMP nsNetSupportDialog::PromptPassword(const PRUnichar *text, + PRUnichar **pwd, + PRBool *returnValue) +#else NS_IMETHODIMP nsNetSupportDialog::PromptPassword( const nsString &aText, nsString &aPassword, PRInt32* returnValue ) +#endif { Init(); +#ifdef NECKO + nsAutoString aText(text); + nsAutoString aPassword; +#endif mMsg = &aText; mPassword = &aPassword; mReturnValue = returnValue; nsString url( "resource:/res/samples/NetSupportPassword.xul") ; DoDialog( url ); +#ifdef NECKO + *pwd = aPassword.ToNewUnicode(); +#endif return NS_OK; - } +} @@ -407,11 +474,11 @@ nsresult nsNetSupportDialog::ConstructBeforeJavaScript(nsIWebShell *aWebShell) mWebShell = aWebShell; mWebShell->AddRef(); - if ( mMsg ) - setAttribute( aWebShell, "NetDialog:Message", "text", *mMsg ); + if ( mMsg ) + setAttribute( aWebShell, "NetDialog:Message", "text", *mMsg ); + if( mCheckMsg ) + setAttribute( aWebShell, "NetDialog:CheckMessage", "text", *mCheckMsg ); - if( mCheckMsg ) - setAttribute( aWebShell, "NetDialog:CheckMessage", "text", *mCheckMsg ); // Hook up the event listeners findDOMNode( mWebShell,"OKButton", &mOKButton ); findDOMNode( mWebShell,"CancelButton", &mCancelButton ); @@ -444,16 +511,7 @@ nsresult nsNetSupportDialog::DoDialog( nsString& inXULURL ) #ifndef NECKO result = NS_NewURL(&dialogURL, inXULURL ); #else - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &result); - if (NS_FAILED(result)) return result; - - nsIURI *uri = nsnull; - const char *uriStr = inXULURL.GetBuffer(); - result = service->NewURI(uriStr, nsnull, &uri); - if (NS_FAILED(result)) return result; - - result = uri->QueryInterface(nsIURI::GetIID(), (void**)&dialogURL); - NS_RELEASE(uri); + result = NS_NewURI(&dialogURL, inXULURL ); #endif // NECKO if (!NS_SUCCEEDED (result) ) { @@ -568,12 +626,21 @@ NS_IMETHODIMP nsNetSupportDialog::QueryInterface(REFNSIID aIID,void** aInstanceP // Always NULL result, in case of failure *aInstancePtr = NULL; +#ifdef NECKO + if ( aIID.Equals( nsIPrompt::GetIID() ) ) + { + *aInstancePtr = (void*) ((nsIPrompt*)this); + NS_ADDREF_THIS(); + return NS_OK; + } +#else if ( aIID.Equals( kINetSupportDialogIID ) ) { *aInstancePtr = (void*) ((nsINetSupportDialogService*)this); - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } +#endif else if (aIID.Equals(kIDOMMouseListenerIID)) { NS_ADDREF_THIS(); // Increase reference count for caller diff --git a/mozilla/xpfe/appshell/src/nsNetSupportDialog.h b/mozilla/xpfe/appshell/src/nsNetSupportDialog.h index af7823a452b..764eb29ddee 100644 --- a/mozilla/xpfe/appshell/src/nsNetSupportDialog.h +++ b/mozilla/xpfe/appshell/src/nsNetSupportDialog.h @@ -26,35 +26,51 @@ class nsIWebShell; class nsIWebShellWindow; class nsIDOMElement; +#ifdef NECKO +class nsNetSupportDialog : public nsIPrompt, public nsIXULWindowCallbacks , public nsIDOMMouseListener +#else class nsNetSupportDialog : public nsINetSupportDialogService, public nsIXULWindowCallbacks , public nsIDOMMouseListener +#endif { public: - nsNetSupportDialog(); - virtual ~nsNetSupportDialog(); + nsNetSupportDialog(); + virtual ~nsNetSupportDialog(); + +#ifdef NECKO + // nsIPrompt + NS_IMETHOD Alert(const PRUnichar *text); + NS_IMETHOD Confirm(const PRUnichar *text, PRBool *_retval); + NS_IMETHOD ConfirmCheck(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); + NS_IMETHOD Prompt(const PRUnichar *text, const PRUnichar *defaultText, PRUnichar **result, PRBool *_retval); + NS_IMETHOD PromptUsernameAndPassword(const PRUnichar *text, PRUnichar **user, PRUnichar **pwd, PRBool *_retval); + NS_IMETHOD PromptPassword(const PRUnichar *text, PRUnichar **pwd, PRBool *_retval); +#else NS_IMETHOD Alert( const nsString &aText ); - NS_IMETHOD Confirm( const nsString &aText,PRInt32* returnValue ); + NS_IMETHOD Confirm( const nsString &aText,PRInt32* returnValue ); NS_IMETHOD ConfirmCheck( const nsString &aText, const nsString& aCheckMsg, PRInt32* returnValue, PRBool* checkValue ); - NS_IMETHOD Prompt( const nsString &aText, - const nsString &aDefault, - nsString &aResult,PRInt32* returnValue ); + NS_IMETHOD Prompt( const nsString &aText, + const nsString &aDefault, + nsString &aResult,PRInt32* returnValue ); - NS_IMETHOD PromptUserAndPassword( const nsString &aText, - nsString &aUser, - nsString &aPassword, PRInt32* returnValue ); + NS_IMETHOD PromptUserAndPassword( const nsString &aText, + nsString &aUser, + nsString &aPassword, PRInt32* returnValue ); - NS_IMETHOD PromptPassword( const nsString &aText, nsString &aPassword,PRInt32* returnValue ); - // COM + NS_IMETHOD PromptPassword( const nsString &aText, nsString &aPassword,PRInt32* returnValue ); +#endif + + // COM NS_DECL_ISUPPORTS protected: // nsIDOMMouseListener // Currently only care about mouse click; virtual nsresult HandleEvent(nsIDOMEvent* aEvent){ return NS_OK; } virtual nsresult MouseDown(nsIDOMEvent* aMouseEvent) { return NS_OK; } - virtual nsresult MouseUp(nsIDOMEvent* aMouseEvent) { return NS_OK; } - virtual nsresult MouseClick(nsIDOMEvent* aMouseEvent); - virtual nsresult MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; } - virtual nsresult MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; } - virtual nsresult MouseOut(nsIDOMEvent* aMouseEvent) { return NS_OK; } + virtual nsresult MouseUp(nsIDOMEvent* aMouseEvent) { return NS_OK; } + virtual nsresult MouseClick(nsIDOMEvent* aMouseEvent); + virtual nsresult MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; } + virtual nsresult MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; } + virtual nsresult MouseOut(nsIDOMEvent* aMouseEvent) { return NS_OK; } private: void Init(); @@ -75,6 +91,6 @@ private: PRInt32* mReturnValue; PRBool* mCheckValue; nsIDOMElement* mOKButton; - nsIDOMElement* mCancelButton; + nsIDOMElement* mCancelButton; }; #endif diff --git a/mozilla/xpfe/appshell/src/nsSessionHistory.cpp b/mozilla/xpfe/appshell/src/nsSessionHistory.cpp index b33ecebd02b..9aea0711d0b 100644 --- a/mozilla/xpfe/appshell/src/nsSessionHistory.cpp +++ b/mozilla/xpfe/appshell/src/nsSessionHistory.cpp @@ -569,7 +569,7 @@ public: * Reload the current history entry */ #ifdef NECKO - NS_IMETHOD Reload(nsIWebShell * aPrev, PRUint32 aReloadFlags); + NS_IMETHOD Reload(nsIWebShell * aPrev, nsLoadFlags aReloadFlags); #else NS_IMETHOD Reload(nsIWebShell * aPrev, nsURLReloadType aReloadType); #endif @@ -966,7 +966,7 @@ nsSessionHistory::Goto(PRInt32 aGotoIndex, nsIWebShell * prev, PRBool aIsReload) NS_IMETHODIMP #ifdef NECKO -nsSessionHistory::Reload(nsIWebShell * aPrev, PRUint32 aReloadFlags) +nsSessionHistory::Reload(nsIWebShell * aPrev, nsLoadFlags aReloadFlags) #else nsSessionHistory::Reload(nsIWebShell * aPrev, nsURLReloadType aReloadType) #endif diff --git a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp index 81d640c6c7d..e1c49eead8a 100644 --- a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -100,12 +100,9 @@ public: #ifdef NECKO // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg) { return NS_OK; } + const PRUnichar *errorMsg); // nsIStreamListener NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); @@ -113,10 +110,10 @@ public: #else // stream observer - NS_IMETHOD OnStartBinding(nsIURI *aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI *aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); // stream listener NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo); @@ -245,9 +242,9 @@ NS_IMPL_ISUPPORTS(RelatedLinksStreamListener, nsIStreamListener::GetIID()); NS_IMETHODIMP #ifdef NECKO -RelatedLinksStreamListener::OnStartBinding(nsISupports *ctxt) +RelatedLinksStreamListener::OnStartRequest(nsISupports *ctxt) #else -RelatedLinksStreamListener::OnStartBinding(nsIURI *aURL, const char *aContentType) +RelatedLinksStreamListener::OnStartRequest(nsIURI *aURL, const char *aContentType) #endif { nsAutoString trueStr("true"); @@ -281,10 +278,10 @@ RelatedLinksStreamListener::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -RelatedLinksStreamListener::OnStopBinding(nsISupports *ctxt, nsresult status, +RelatedLinksStreamListener::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -RelatedLinksStreamListener::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +RelatedLinksStreamListener::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { nsAutoString trueStr("true"); diff --git a/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.cpp b/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.cpp index eb9831c32c8..359bdf57444 100644 --- a/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.cpp +++ b/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.cpp @@ -270,9 +270,9 @@ nsDownloadProgressDialog::OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream NS_IMETHODIMP #ifdef NECKO -nsDownloadProgressDialog::OnStartBinding(nsISupports* aContext) +nsDownloadProgressDialog::OnStartRequest(nsISupports* aContext) #else -nsDownloadProgressDialog::OnStartBinding(nsIURI* aURL, const char *aContentType) +nsDownloadProgressDialog::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { //nsresult rv = NS_OK; @@ -310,9 +310,9 @@ nsDownloadProgressDialog::OnStatus(nsIURI* aURL, const PRUnichar* aMsg) NS_IMETHODIMP #ifdef NECKO -nsDownloadProgressDialog::OnStopBinding(nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg) +nsDownloadProgressDialog::OnStopRequest(nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg) #else -nsDownloadProgressDialog::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) +nsDownloadProgressDialog::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg) #endif { nsresult rv = NS_OK; diff --git a/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.h b/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.h index 7c4cdeeaea9..5b9178f37a5 100644 --- a/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.h +++ b/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.h @@ -50,19 +50,17 @@ public: NS_IMETHOD OnProgress(nsISupports* context, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsISupports* context, const PRUnichar* aMmsg); // nsIStreamObserver methods: - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); + NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); // nsIStreamListener methods: NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); #else NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo) { return NS_ERROR_NOT_IMPLEMENTED; } NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); #endif // Declare implementations of nsIDocumentObserver functions. diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp index 58c66d6a656..efcbf81d01a 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.cpp +++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp @@ -290,9 +290,9 @@ nsXPInstallManager::OnStatus(nsIURI* aURL, NS_IMETHODIMP #ifdef NECKO -nsXPInstallManager::OnStartBinding(nsISupports *ctxt) +nsXPInstallManager::OnStartRequest(nsISupports *ctxt) #else -nsXPInstallManager::OnStartBinding(nsIURI* aURL, +nsXPInstallManager::OnStartRequest(nsIURI* aURL, const char *aContentType) #endif { @@ -302,10 +302,10 @@ nsXPInstallManager::OnStartBinding(nsIURI* aURL, NS_IMETHODIMP #ifdef NECKO -nsXPInstallManager::OnStopBinding(nsISupports *ctxt, nsresult status, +nsXPInstallManager::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) #else -nsXPInstallManager::OnStopBinding(nsIURI* aURL, +nsXPInstallManager::OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg) #endif diff --git a/mozilla/xpinstall/src/nsXPInstallManager.h b/mozilla/xpinstall/src/nsXPInstallManager.h index 7642c90deff..168d95bd2d1 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.h +++ b/mozilla/xpinstall/src/nsXPInstallManager.h @@ -64,12 +64,9 @@ class nsXPInstallManager : public nsIXPINotifier, public nsIStreamListener #ifdef NECKO // nsIStreamObserver - NS_IMETHOD OnStartBinding(nsISupports *ctxt); - NS_IMETHOD OnStopBinding(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg); - NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } + NS_IMETHOD OnStartRequest(nsISupports *ctxt); NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, - const PRUnichar *errorMsg) { return NS_OK; } + const PRUnichar *errorMsg); // nsIStreamListener NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, @@ -80,9 +77,9 @@ class nsXPInstallManager : public nsIXPINotifier, public nsIStreamListener NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* info); NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); - NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType); + NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType); NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length); - NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult status, const PRUnichar* aMsg); #endif // IXPINotifier methods