diff --git a/mozilla/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/chrome/src/nsChromeProtocolHandler.cpp index 36ee9e0f481..9276a257706 100644 --- a/mozilla/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/chrome/src/nsChromeProtocolHandler.cpp @@ -47,6 +47,7 @@ #include "nsIXULPrototypeDocument.h" #include "nsContentCID.h" #include "nsXPIDLString.h" +#include "nsNetCID.h" #include "prlog.h" //---------------------------------------------------------------------- @@ -90,7 +91,7 @@ protected: nsCOMPtr mLoadGroup; nsCOMPtr mListener; nsCOMPtr mContext; - nsLoadFlags mLoadAttributes; + nsLoadFlags mLoadFlags; nsCOMPtr mOwner; nsresult mStatus; @@ -123,6 +124,10 @@ public: NS_IMETHOD Cancel(nsresult status) { mStatus = status; return NS_OK; } NS_IMETHOD Suspend(void) { return NS_OK; } NS_IMETHOD Resume(void) { return NS_OK; } + NS_IMETHOD GetLoadGroup(nsILoadGroup **); + NS_IMETHOD SetLoadGroup(nsILoadGroup *); + NS_IMETHOD GetLoadFlags(nsLoadFlags *); + NS_IMETHOD SetLoadFlags(nsLoadFlags); // nsIChannel NS_DECL_NSICHANNEL @@ -155,7 +160,7 @@ nsCachedChromeChannel::Create(nsIURI* aURI, nsIChannel** aResult) nsCachedChromeChannel::nsCachedChromeChannel(nsIURI* aURI) - : mURI(aURI), mLoadGroup(nsnull), mLoadAttributes (nsIChannel::LOAD_NORMAL), mStatus(NS_OK) + : mURI(aURI), mLoadGroup(nsnull), mLoadFlags (nsIRequest::LOAD_NORMAL), mStatus(NS_OK) { NS_INIT_REFCNT(); @@ -202,13 +207,6 @@ nsCachedChromeChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsCachedChromeChannel::SetURI(nsIURI* aURI) -{ - mURI = aURI; - return NS_OK; -} - NS_IMETHODIMP nsCachedChromeChannel::Open(nsIInputStream **_retval) { @@ -248,7 +246,7 @@ nsCachedChromeChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) ("nsCachedChromeChannel[%p]: removing self from load group %p", this, mLoadGroup.get())); - (void) mLoadGroup->RemoveRequest(this, nsnull, nsnull, nsnull); + (void) mLoadGroup->RemoveRequest(this, nsnull, NS_OK); } return rv; @@ -268,16 +266,16 @@ nsCachedChromeChannel::GetSecurityInfo(nsISupports * *aSecurityInfo) } NS_IMETHODIMP -nsCachedChromeChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +nsCachedChromeChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsCachedChromeChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) +nsCachedChromeChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -436,14 +434,14 @@ nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent) channel, channel->mListener.get())); (void) channel->mListener->OnStopRequest(request, channel->mContext, - channel->mStatus, nsnull); + channel->mStatus); if (channel->mLoadGroup) { PR_LOG(gLog, PR_LOG_DEBUG, ("nsCachedChromeChannel[%p]: removing self from load group %p", channel, channel->mLoadGroup.get())); - (void) channel->mLoadGroup->RemoveRequest(request, nsnull, nsnull, nsnull); + (void) channel->mLoadGroup->RemoveRequest(request, nsnull, NS_OK); } channel->mListener = nsnull; diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 043a79c3a41..7cd2d0eb1be 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -532,13 +532,13 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand, } PRUint32 loadAttr = 0; - rv = httpChannel->GetLoadAttributes(&loadAttr); + rv = httpChannel->GetLoadFlags(&loadAttr); NS_ASSERTION(NS_SUCCEEDED(rv),"cannot get load attribute"); if(NS_SUCCEEDED(rv)) { // copy from nsHTTPChannel.cpp if(loadAttr & nsIChannel::CACHE_AS_FILE) cacheFlags = nsINetDataCacheManager::CACHE_AS_FILE; - else if(loadAttr & nsIChannel::INHIBIT_PERSISTENT_CACHING) + else if(loadAttr & nsIRequest::INHIBIT_PERSISTENT_CACHING) cacheFlags = nsINetDataCacheManager::BYPASS_PERSISTENT_CACHE; bTryCache = PR_TRUE; } diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 5f4604ef1df..37eb8d5f975 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -88,8 +88,7 @@ public: nsresult StartImageLoad(nsIURI* aURL, nsIStreamListener*& aListener); #endif nsresult EndLayout(nsISupports *ctxt, - nsresult status, - const PRUnichar *errorMsg); + nsresult status); nsresult UpdateTitle( void ); void StartLayout(); @@ -110,8 +109,8 @@ public: virtual ~ImageListener(); NS_DECL_ISUPPORTS - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener methods: NS_DECL_NSISTREAMLISTENER @@ -178,16 +177,16 @@ ImageListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt) NS_IMETHODIMP ImageListener::OnStopRequest(nsIRequest* request, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg) + nsresult status) { if(mDocument){ - mDocument->EndLayout(ctxt, status, errorMsg); + mDocument->EndLayout(ctxt, status); } if (nsnull == mNextStream) { return NS_ERROR_FAILURE; } - return mNextStream->OnStopRequest(request, ctxt, status, errorMsg); + return mNextStream->OnStopRequest(request, ctxt, status); } NS_IMETHODIMP @@ -428,8 +427,7 @@ nsImageDocument::StartLayout() nsresult nsImageDocument::EndLayout(nsISupports *ctxt, - nsresult status, - const PRUnichar *errorMsg) + nsresult status) { // Layout has completed: now update the title UpdateTitle(); diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp index 7a2173c176d..b8f644df710 100644 --- a/mozilla/content/xbl/src/nsXBLService.cpp +++ b/mozilla/content/xbl/src/nsXBLService.cpp @@ -199,7 +199,7 @@ class nsXBLStreamListener : public nsIStreamListener, public nsIDOMLoadListener public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER nsresult Load(nsIDOMEvent* aEvent); nsresult Unload(nsIDOMEvent* aEvent) { return NS_OK; }; @@ -230,7 +230,7 @@ nsIXULPrototypeCache* nsXBLStreamListener::gXULCache = nsnull; PRInt32 nsXBLStreamListener::gRefCnt = 0; /* Implementation file */ -NS_IMPL_ISUPPORTS4(nsXBLStreamListener, nsIStreamListener, nsIStreamObserver, nsIDOMLoadListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS4(nsXBLStreamListener, nsIStreamListener, nsIRequestObserver, nsIDOMLoadListener, nsIDOMEventListener) nsXBLStreamListener::nsXBLStreamListener(nsXBLService* aXBLService, nsIStreamListener* aInner, nsIDocument* aDocument, @@ -283,11 +283,11 @@ nsXBLStreamListener::OnStartRequest(nsIRequest* request, nsISupports* aCtxt) } NS_IMETHODIMP -nsXBLStreamListener::OnStopRequest(nsIRequest* request, nsISupports* aCtxt, nsresult aStatus, const PRUnichar* aStatusArg) +nsXBLStreamListener::OnStopRequest(nsIRequest* request, nsISupports* aCtxt, nsresult aStatus) { nsresult rv = NS_OK; if (mInner) { - rv = mInner->OnStopRequest(request, aCtxt, aStatus, aStatusArg); + rv = mInner->OnStopRequest(request, aCtxt, aStatus); } if (NS_FAILED(rv) || NS_FAILED(aStatus)) @@ -1303,7 +1303,7 @@ nsXBLService::FetchBindingDocument(nsIContent* aBoundElement, nsIDocument* aBoun if (NS_FAILED(rv)) break; } - listener->OnStopRequest(request, nsnull, NS_OK, nsnull); + listener->OnStopRequest(request, nsnull, NS_OK); // don't leak proxy! proxy->Close(); diff --git a/mozilla/content/xml/content/src/nsXMLElement.cpp b/mozilla/content/xml/content/src/nsXMLElement.cpp index d7e666e2a30..f84856581a4 100644 --- a/mozilla/content/xml/content/src/nsXMLElement.cpp +++ b/mozilla/content/xml/content/src/nsXMLElement.cpp @@ -34,6 +34,7 @@ #include "nsINodeInfo.h" #include "nsIURL.h" #include "nsIIOService.h" +#include "nsNetCID.h" #include "nsIServiceManager.h" #include "nsXPIDLString.h" #include "nsIDocShell.h" diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index b10d8915590..4a47685e991 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -333,8 +333,8 @@ public: NS_IMETHOD SetURI(nsIURI* aURI) { gURI = aURI; NS_ADDREF(gURI); return NS_OK; } NS_IMETHOD Open(nsIInputStream **_retval) { *_retval = nsnull; return NS_OK; } NS_IMETHOD AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD GetLoadAttributes(nsLoadFlags *aLoadAttributes) { *aLoadAttributes = nsIChannel::LOAD_NORMAL; return NS_OK; } - NS_IMETHOD SetLoadAttributes(nsLoadFlags aLoadAttributes) { return NS_OK; } + NS_IMETHOD GetLoadFlags(nsLoadFlags *aLoadFlags) { *aLoadFlags = nsIRequest::LOAD_NORMAL; return NS_OK; } + NS_IMETHOD SetLoadFlags(nsLoadFlags aLoadFlags) { return NS_OK; } NS_IMETHOD GetOwner(nsISupports * *aOwner) { *aOwner = nsnull; return NS_OK; } NS_IMETHOD SetOwner(nsISupports * aOwner) { return NS_OK; } NS_IMETHOD GetLoadGroup(nsILoadGroup * *aLoadGroup) { *aLoadGroup = mLoadGroup; NS_IF_ADDREF(*aLoadGroup); return NS_OK; } @@ -5035,7 +5035,7 @@ nsXULDocument::ResumeWalk() // docshell, and run the onload handlers, etc. nsCOMPtr group = do_QueryReferent(mDocumentLoadGroup); if (group) { - rv = group->RemoveRequest(mPlaceHolderRequest, nsnull, NS_OK, nsnull); + rv = group->RemoveRequest(mPlaceHolderRequest, nsnull, NS_OK); if (NS_FAILED(rv)) return rv; mPlaceHolderRequest = nsnull; @@ -6134,7 +6134,7 @@ nsXULDocument::CachedChromeStreamListener::~CachedChromeStreamListener() } -NS_IMPL_ISUPPORTS2(nsXULDocument::CachedChromeStreamListener, nsIStreamObserver, nsIStreamListener); +NS_IMPL_ISUPPORTS2(nsXULDocument::CachedChromeStreamListener, nsIRequestObserver, nsIStreamListener); NS_IMETHODIMP nsXULDocument::CachedChromeStreamListener::OnStartRequest(nsIRequest *request, nsISupports* acontext) @@ -6146,8 +6146,7 @@ nsXULDocument::CachedChromeStreamListener::OnStartRequest(nsIRequest *request, n NS_IMETHODIMP nsXULDocument::CachedChromeStreamListener::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, - const PRUnichar* aErrorMsg) + nsresult aStatus) { nsresult rv; rv = mDocument->PrepareToWalk(); @@ -6186,7 +6185,7 @@ nsXULDocument::ParserObserver::~ParserObserver() NS_IF_RELEASE(mDocument); } -NS_IMPL_ISUPPORTS1(nsXULDocument::ParserObserver, nsIStreamObserver); +NS_IMPL_ISUPPORTS1(nsXULDocument::ParserObserver, nsIRequestObserver); NS_IMETHODIMP nsXULDocument::ParserObserver::OnStartRequest(nsIRequest *request, @@ -6198,8 +6197,7 @@ nsXULDocument::ParserObserver::OnStartRequest(nsIRequest *request, NS_IMETHODIMP nsXULDocument::ParserObserver::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, - const PRUnichar* aErrorMsg) + nsresult aStatus) { nsresult rv = NS_OK; diff --git a/mozilla/content/xul/document/src/nsXULDocument.h b/mozilla/content/xul/document/src/nsXULDocument.h index 0788c5570d1..7d54d023689 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.h +++ b/mozilla/content/xul/document/src/nsXULDocument.h @@ -748,14 +748,14 @@ protected: CachedChromeStreamListener(nsXULDocument* aDocument); NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER }; friend class CachedChromeStreamListener; - class ParserObserver : public nsIStreamObserver { + class ParserObserver : public nsIRequestObserver { protected: nsXULDocument* mDocument; virtual ~ParserObserver(); @@ -764,7 +764,7 @@ protected: ParserObserver(nsXULDocument* aDocument); NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER }; friend class ParserObserver; diff --git a/mozilla/docshell/base/nsDSURIContentListener.cpp b/mozilla/docshell/base/nsDSURIContentListener.cpp index d3c14d18ff1..e2c981fbea1 100644 --- a/mozilla/docshell/base/nsDSURIContentListener.cpp +++ b/mozilla/docshell/base/nsDSURIContentListener.cpp @@ -88,15 +88,15 @@ NS_IMETHODIMP nsDSURIContentListener::DoContent(const char* aContentType, *aAbortProcess = PR_FALSE; // determine if the channel has just been retargeted to us... - nsLoadFlags loadAttribs = 0; + nsLoadFlags loadFlags = 0; nsCOMPtr aOpenedChannel = do_QueryInterface(request); - aOpenedChannel->GetLoadAttributes(&loadAttribs); + aOpenedChannel->GetLoadFlags(&loadFlags); PRUint32 loadType = mDocShell->ConvertDocShellLoadInfoToLoadType((nsDocShellInfoLoadType) aCommand); mDocShell->SetLoadType(loadType); - if(loadAttribs & nsIChannel::LOAD_RETARGETED_DOCUMENT_URI) + if(loadFlags & nsIRequest::LOAD_RETARGETED_DOCUMENT_URI) { mDocShell->StopLoad(); } @@ -105,7 +105,7 @@ NS_IMETHODIMP nsDSURIContentListener::DoContent(const char* aContentType, request, aContentHandler); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; // it's okay if we don't know how to handle the content - if(loadAttribs & nsIChannel::LOAD_RETARGETED_DOCUMENT_URI) + if(loadFlags & nsIRequest::LOAD_RETARGETED_DOCUMENT_URI) mDocShell->SetFocus(); return NS_OK; diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 299d2908914..c7df55d3785 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -2812,7 +2812,7 @@ NS_IMETHODIMP nsDocShell::CreateContentViewer(const char* aContentType, if(currentLoadGroup.get() != loadGroup.get()) { - nsLoadFlags loadAttribs = 0; + nsLoadFlags loadFlags = 0; //Cancel any URIs that are currently loading... /// XXX: Need to do this eventually Stop(); @@ -2828,14 +2828,14 @@ NS_IMETHODIMP nsDocShell::CreateContentViewer(const char* aContentType, aOpenedChannel->SetLoadGroup(loadGroup); // Mark the channel as being a document URI... - aOpenedChannel->GetLoadAttributes(&loadAttribs); - loadAttribs |= nsIChannel::LOAD_DOCUMENT_URI; + aOpenedChannel->GetLoadFlags(&loadFlags); + loadFlags |= nsIRequest::LOAD_DOCUMENT_URI; - aOpenedChannel->SetLoadAttributes(loadAttribs); + aOpenedChannel->SetLoadFlags(loadFlags); loadGroup->AddRequest(request, nsnull); if(currentLoadGroup) - currentLoadGroup->RemoveRequest(request, nsnull, nsnull, nsnull); + currentLoadGroup->RemoveRequest(request, nsnull, NS_OK); } @@ -3527,30 +3527,30 @@ NS_IMETHODIMP nsDocShell::DoChannelLoad(nsIChannel *aChannel, nsURILoadCommand a const char* aWindowTarget, nsIURILoader *aURILoader) { // Mark the channel as being a document URI... - nsLoadFlags loadAttribs = 0; - (void)aChannel->GetLoadAttributes(&loadAttribs); - loadAttribs |= nsIChannel::LOAD_DOCUMENT_URI; + nsLoadFlags loadFlags = 0; + (void)aChannel->GetLoadFlags(&loadFlags); + loadFlags |= nsIRequest::LOAD_DOCUMENT_URI; // "View source" always wants VALIDATE_NEVER. if ( mViewMode == viewSource ) { - loadAttribs |= nsIChannel::VALIDATE_NEVER; + loadFlags |= nsIRequest::VALIDATE_NEVER; } else { // Load attributes depend on load type... switch ( mLoadType ) { case LOAD_HISTORY: - loadAttribs |= nsIChannel::VALIDATE_NEVER; + loadFlags |= nsIRequest::VALIDATE_NEVER; break; case LOAD_RELOAD_NORMAL: - loadAttribs |= nsIChannel::FORCE_VALIDATION; + loadFlags |= nsIRequest::FORCE_VALIDATION; break; case LOAD_RELOAD_BYPASS_PROXY_AND_CACHE: - loadAttribs |= nsIChannel::FORCE_RELOAD; + loadFlags |= nsIRequest::FORCE_RELOAD; break; case LOAD_REFRESH: - loadAttribs |= nsIChannel::FORCE_RELOAD; + loadFlags |= nsIRequest::FORCE_RELOAD; break; case LOAD_NORMAL: case LOAD_LINK: @@ -3563,13 +3563,13 @@ NS_IMETHODIMP nsDocShell::DoChannelLoad(nsIChannel *aChannel, nsURILoadCommand a switch ( prefSetting ) { case 0: - loadAttribs |= nsIChannel::VALIDATE_ONCE_PER_SESSION; + loadFlags |= nsIRequest::VALIDATE_ONCE_PER_SESSION; break; case 1: - loadAttribs |= nsIChannel::VALIDATE_ALWAYS; + loadFlags |= nsIRequest::VALIDATE_ALWAYS; break; case 2: - loadAttribs |= nsIChannel::VALIDATE_NEVER; + loadFlags |= nsIRequest::VALIDATE_NEVER; break; } } @@ -3578,7 +3578,7 @@ NS_IMETHODIMP nsDocShell::DoChannelLoad(nsIChannel *aChannel, nsURILoadCommand a } } - (void) aChannel->SetLoadAttributes(loadAttribs); + (void) aChannel->SetLoadFlags(loadFlags); NS_ENSURE_SUCCESS(aURILoader->OpenURI(aChannel, aLoadCmd, aWindowTarget, NS_STATIC_CAST(nsIDocShell*, this)), NS_ERROR_FAILURE); @@ -3910,8 +3910,8 @@ NS_IMETHODIMP nsDocShell::OnLoadingSite(nsIChannel* aChannel) // But this notification happen after the necko notification and hence // overrides it. Until OnRedirect() gets settles out, let us do this. nsLoadFlags loadFlags = 0; - aChannel->GetLoadAttributes(&loadFlags); - if (loadFlags & nsIChannel::LOAD_REPLACE) + aChannel->GetLoadFlags(&loadFlags); + if (loadFlags & nsIRequest::LOAD_REPLACE) aChannel->GetURI(getter_AddRefs(uri)); else aChannel->GetOriginalURI(getter_AddRefs(uri)); diff --git a/mozilla/editor/base/nsEditorShell.h b/mozilla/editor/base/nsEditorShell.h index 20d0e165c64..c336a0a1391 100644 --- a/mozilla/editor/base/nsEditorShell.h +++ b/mozilla/editor/base/nsEditorShell.h @@ -36,7 +36,6 @@ #include "nsISelectionListener.h" #include "nsIDOMEventReceiver.h" #include "nsIPrompt.h" -#include "nsIStreamObserver.h" #include "nsIDOMDocument.h" #include "nsIDOMEventListener.h" #include "nsIURIContentListener.h" diff --git a/mozilla/editor/composer/src/nsEditorShell.h b/mozilla/editor/composer/src/nsEditorShell.h index 20d0e165c64..c336a0a1391 100644 --- a/mozilla/editor/composer/src/nsEditorShell.h +++ b/mozilla/editor/composer/src/nsEditorShell.h @@ -36,7 +36,6 @@ #include "nsISelectionListener.h" #include "nsIDOMEventReceiver.h" #include "nsIPrompt.h" -#include "nsIStreamObserver.h" #include "nsIDOMDocument.h" #include "nsIDOMEventListener.h" #include "nsIURIContentListener.h" diff --git a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp index 6d6821c62a2..840dd4c8ab8 100644 --- a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp +++ b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp @@ -58,7 +58,7 @@ NS_INTERFACE_MAP_BEGIN(CWebBrowserContainer) NS_INTERFACE_MAP_ENTRY(nsIURIContentListener) NS_INTERFACE_MAP_ENTRY(nsIDocShellTreeOwner) NS_INTERFACE_MAP_ENTRY(nsIEmbeddingSiteWindow) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIDocumentLoaderObserver) NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener) NS_INTERFACE_MAP_ENTRY(nsIPrompt) @@ -673,7 +673,7 @@ CWebBrowserContainer::ExitModalEventLoop(nsresult aStatus) } /////////////////////////////////////////////////////////////////////////////// -// nsIStreamObserver implementation +// nsIRequestObserver implementation NS_IMETHODIMP diff --git a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h index fa530d28bab..99cef171461 100644 --- a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h +++ b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h @@ -38,7 +38,7 @@ class CWebBrowserContainer : public nsIEmbeddingSiteWindow, public nsIWebBrowserChrome, public nsIWebProgressListener, - public nsIStreamObserver, + public nsIRequestObserver, public nsIURIContentListener, public nsIDocumentLoaderObserver, public nsIDocShellTreeOwner, @@ -71,7 +71,7 @@ public: NS_DECL_NSIWEBBROWSERCHROME NS_DECL_NSIDOCSHELLTREEOWNER NS_DECL_NSIURICONTENTLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIDOCUMENTLOADEROBSERVER NS_DECL_NSIINTERFACEREQUESTOR NS_DECL_NSIWEBPROGRESSLISTENER diff --git a/mozilla/embedding/browser/gtk/src/EmbedStream.cpp b/mozilla/embedding/browser/gtk/src/EmbedStream.cpp index e56a470a9b9..73c7af9f324 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedStream.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedStream.cpp @@ -215,8 +215,7 @@ EmbedStream::CloseStream(void) if (NS_FAILED(rv)) goto loser; - rv = mStreamListener->OnStopRequest(request, NULL, - NS_OK, NULL); + rv = mStreamListener->OnStopRequest(request, NULL, NS_OK); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/embedding/browser/photon/src/PhMozEmbedChrome.cpp b/mozilla/embedding/browser/photon/src/PhMozEmbedChrome.cpp index 9b51bd17003..959303ddac8 100644 --- a/mozilla/embedding/browser/photon/src/PhMozEmbedChrome.cpp +++ b/mozilla/embedding/browser/photon/src/PhMozEmbedChrome.cpp @@ -295,8 +295,7 @@ NS_IMETHODIMP PhMozEmbedChrome::CloseStream (void) mDoingStream = PR_FALSE; rv = mStreamListener->OnStopRequest(mChannel, NULL, - NS_OK, - NULL); + NS_OK); if (NS_FAILED(rv)) return rv; mStream = nsnull; diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp index 646a56e259b..77671b7bc14 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp @@ -96,7 +96,7 @@ NS_INTERFACE_MAP_BEGIN(nsWebBrowserPersist) NS_INTERFACE_MAP_ENTRY(nsIWebBrowserPersist) NS_INTERFACE_MAP_ENTRY(nsIWebBrowserPersistProgress) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_END //***************************************************************************** @@ -413,7 +413,7 @@ NS_IMETHODIMP nsWebBrowserPersist::OnProgress(PRUint32 aStatus, nsIURI *aURI, PR //***************************************************************************** -// nsWebBrowserPersist::nsIStreamObserver +// nsWebBrowserPersist::nsIRequestObserver //***************************************************************************** @@ -423,7 +423,7 @@ NS_IMETHODIMP nsWebBrowserPersist::OnStartRequest(nsIRequest* request, nsISuppor return rv; } -NS_IMETHODIMP nsWebBrowserPersist::OnStopRequest(nsIRequest* request, nsISupports *ctxt, nsresult status, const PRUnichar *statusArg) +NS_IMETHODIMP nsWebBrowserPersist::OnStopRequest(nsIRequest* request, nsISupports *ctxt, nsresult status) { OnEndDownload(); CleanUp(); diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.h b/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.h index 270c05e5754..95127df0bf2 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.h +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.h @@ -54,7 +54,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIWEBBROWSERPERSIST NS_DECL_NSIWEBBROWSERPERSISTPROGRESS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER // Protected members diff --git a/mozilla/extensions/datetime/nsDateTimeChannel.cpp b/mozilla/extensions/datetime/nsDateTimeChannel.cpp index 2a2e3b721ea..8cc49b0b1ab 100644 --- a/mozilla/extensions/datetime/nsDateTimeChannel.cpp +++ b/mozilla/extensions/datetime/nsDateTimeChannel.cpp @@ -47,7 +47,7 @@ NS_IMPL_ISUPPORTS4(nsDateTimeChannel, nsIChannel, nsIRequest, nsIStreamListener, - nsIStreamObserver) + nsIRequestObserver) nsresult nsDateTimeChannel::Init(nsIURI* uri) @@ -153,13 +153,6 @@ nsDateTimeChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsDateTimeChannel::SetURI(nsIURI* aURI) -{ - mUrl = aURI; - return NS_OK; -} - NS_IMETHODIMP nsDateTimeChannel::Open(nsIInputStream **_retval) { @@ -173,7 +166,7 @@ nsDateTimeChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; transport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); return transport->OpenInputStream(0, -1, 0, _retval); } @@ -191,7 +184,7 @@ nsDateTimeChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; transport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); mListener = aListener; @@ -200,16 +193,16 @@ nsDateTimeChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) } NS_IMETHODIMP -nsDateTimeChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsDateTimeChannel::GetLoadFlags(PRUint32 *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsDateTimeChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsDateTimeChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -258,7 +251,7 @@ NS_IMETHODIMP nsDateTimeChannel::SetLoadGroup(nsILoadGroup* aLoadGroup) { if (mLoadGroup) // if we already had a load group remove ourselves... - (void)mLoadGroup->RemoveRequest(this, nsnull, NS_OK, nsnull); + (void)mLoadGroup->RemoveRequest(this, nsnull, NS_OK); mLoadGroup = aLoadGroup; if (mLoadGroup) { @@ -305,7 +298,7 @@ nsDateTimeChannel::GetSecurityInfo(nsISupports **sec) return NS_OK; } -// nsIStreamObserver methods +// nsIRequestObserver methods NS_IMETHODIMP nsDateTimeChannel::OnStartRequest(nsIRequest *request, nsISupports *aContext) { return mListener->OnStartRequest(this, aContext); @@ -314,12 +307,12 @@ nsDateTimeChannel::OnStartRequest(nsIRequest *request, nsISupports *aContext) { NS_IMETHODIMP nsDateTimeChannel::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { if (mLoadGroup) { - nsresult rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus, aStatusArg); + nsresult rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus); if (NS_FAILED(rv)) return rv; } - return mListener->OnStopRequest(this, aContext, aStatus, aStatusArg); + return mListener->OnStopRequest(this, aContext, aStatus); } diff --git a/mozilla/extensions/datetime/nsDateTimeChannel.h b/mozilla/extensions/datetime/nsDateTimeChannel.h index 278f9c7a198..1caf8c24de9 100644 --- a/mozilla/extensions/datetime/nsDateTimeChannel.h +++ b/mozilla/extensions/datetime/nsDateTimeChannel.h @@ -48,7 +48,7 @@ public: NS_DECL_NSIREQUEST NS_DECL_NSICHANNEL NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER // nsDateTimeChannel methods: nsDateTimeChannel(); @@ -65,7 +65,7 @@ protected: nsCOMPtr mOriginalURI; nsCOMPtr mUrl; nsCOMPtr mListener; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsCOMPtr mLoadGroup; nsCString mContentType; PRInt32 mContentLength; diff --git a/mozilla/extensions/datetime/nsDateTimeHandler.cpp b/mozilla/extensions/datetime/nsDateTimeHandler.cpp index dad291537f5..5d2a5083b33 100644 --- a/mozilla/extensions/datetime/nsDateTimeHandler.cpp +++ b/mozilla/extensions/datetime/nsDateTimeHandler.cpp @@ -29,6 +29,7 @@ #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" #include "nsIProgressEventSink.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); diff --git a/mozilla/extensions/finger/nsFingerChannel.cpp b/mozilla/extensions/finger/nsFingerChannel.cpp index 6ef9f010e5c..a6a75842d60 100644 --- a/mozilla/extensions/finger/nsFingerChannel.cpp +++ b/mozilla/extensions/finger/nsFingerChannel.cpp @@ -58,7 +58,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsFingerChannel, nsIChannel, nsIRequest, nsIStreamListener, - nsIStreamObserver) + nsIRequestObserver) nsresult nsFingerChannel::Init(nsIURI* uri) @@ -183,13 +183,6 @@ nsFingerChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsFingerChannel::SetURI(nsIURI* aURI) -{ - mUrl = aURI; - return NS_OK; -} - NS_IMETHODIMP nsFingerChannel::Open(nsIInputStream **_retval) { @@ -203,9 +196,9 @@ nsFingerChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; mTransport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); - return mTransport->OpenInputStream(0, -1, 0, _retval); + return mTransport->OpenInputStream(0, PRUint32(-1), 0, _retval); } NS_IMETHODIMP @@ -221,7 +214,7 @@ nsFingerChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; mTransport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); mListener = aListener; mResponseContext = ctxt; @@ -230,16 +223,16 @@ nsFingerChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) } NS_IMETHODIMP -nsFingerChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsFingerChannel::GetLoadFlags(PRUint32 *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsFingerChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsFingerChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -328,7 +321,7 @@ nsFingerChannel::GetSecurityInfo(nsISupports * *aSecurityInfo) return NS_OK; } -// nsIStreamObserver methods +// nsIRequestObserver methods NS_IMETHODIMP nsFingerChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) { if (!mActAsObserver) { @@ -344,16 +337,16 @@ nsFingerChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) { NS_IMETHODIMP nsFingerChannel::OnStopRequest(nsIRequest *aRequest, nsISupports* aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsresult rv = NS_OK; if (NS_FAILED(aStatus) || !mActAsObserver) { if (mLoadGroup) { - rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus, aStatusArg); + rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus); if (NS_FAILED(rv)) return rv; } - rv = mListener->OnStopRequest(this, mResponseContext, aStatus, aStatusArg); + rv = mListener->OnStopRequest(this, mResponseContext, aStatus); mTransport = 0; return rv; } else { @@ -385,7 +378,7 @@ nsFingerChannel::OnStopRequest(nsIRequest *aRequest, nsISupports* aContext, converter->PreFormatHTML(PR_TRUE); } - return mTransport->AsyncRead(converterListener, mResponseContext, 0,-1, 0, + return mTransport->AsyncRead(converterListener, mResponseContext, 0, PRUint32(-1), 0, getter_AddRefs(mTransportRequest)); } diff --git a/mozilla/extensions/finger/nsFingerChannel.h b/mozilla/extensions/finger/nsFingerChannel.h index b15716d09ee..ff8b7bccebd 100644 --- a/mozilla/extensions/finger/nsFingerChannel.h +++ b/mozilla/extensions/finger/nsFingerChannel.h @@ -44,7 +44,7 @@ public: NS_DECL_NSIREQUEST NS_DECL_NSICHANNEL NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER // nsFingerChannel methods: nsFingerChannel(); @@ -61,7 +61,7 @@ protected: nsCOMPtr mOriginalURI; nsCOMPtr mUrl; nsCOMPtr mListener; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsCOMPtr mLoadGroup; nsCString mContentType; PRInt32 mContentLength; diff --git a/mozilla/extensions/finger/nsFingerHandler.cpp b/mozilla/extensions/finger/nsFingerHandler.cpp index 60d8f97389d..448bfe6544a 100644 --- a/mozilla/extensions/finger/nsFingerHandler.cpp +++ b/mozilla/extensions/finger/nsFingerHandler.cpp @@ -29,6 +29,7 @@ #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" #include "nsIProgressEventSink.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); diff --git a/mozilla/extensions/psm-glue/src/nsPSMComponent.cpp b/mozilla/extensions/psm-glue/src/nsPSMComponent.cpp index 279b83775ee..2309bf18c30 100644 --- a/mozilla/extensions/psm-glue/src/nsPSMComponent.cpp +++ b/mozilla/extensions/psm-glue/src/nsPSMComponent.cpp @@ -690,7 +690,7 @@ class CertDownloader : public nsIStreamListener virtual ~CertDownloader(); NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER protected: char* mByteData; @@ -780,8 +780,7 @@ CertDownloader::OnDataAvailable(nsIRequest *request, NS_IMETHODIMP CertDownloader::OnStopRequest(nsIRequest *request, nsISupports* context, - nsresult aStatus, - const PRUnichar* aMsg) + nsresult aStatus) { nsCOMPtr psm = do_QueryInterface(context); diff --git a/mozilla/extensions/xml-rpc/src/nsXmlRpcClient.js b/mozilla/extensions/xml-rpc/src/nsXmlRpcClient.js index bfb7da7bca4..5aad4811f65 100644 --- a/mozilla/extensions/xml-rpc/src/nsXmlRpcClient.js +++ b/mozilla/extensions/xml-rpc/src/nsXmlRpcClient.js @@ -18,9 +18,9 @@ /* * nsXmlRpcClient XPCOM component - * Version: $Revision: 1.15 $ + * Version: $Revision: 1.16 $ * - * $Id: nsXmlRpcClient.js,v 1.15 2001-02-21 20:36:32 dougt%netscape.com Exp $ + * $Id: nsXmlRpcClient.js,v 1.16 2001-04-10 05:59:28 darin%netscape.com Exp $ */ /* @@ -467,7 +467,7 @@ nsXmlRpcClient.prototype = { if (!iid.equals(Components.interfaces.nsISupports) && !iid.equals(XMLRPCCLIENT_IID) && !iid.equals(Components.interfaces.nsIXmlRpcClientListener) && - !iid.equals(Components.interfaces.nsIStreamObserver) && + !iid.equals(Components.interfaces.nsIRequestObserver) && !iid.equals(Components.interfaces.nsIStreamListener)) throw Components.results.NS_ERROR_NO_INTERFACE; return this; diff --git a/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp b/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp index c532a274cae..9781b4a6ff7 100644 --- a/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp @@ -155,11 +155,6 @@ NS_IMETHODIMP nsDOMParserChannel::GetURI(nsIURI * *aURI) NS_ADDREF(*aURI); return NS_OK; } -NS_IMETHODIMP nsDOMParserChannel::SetURI(nsIURI * aURI) -{ - mURI = aURI; - return NS_OK; -} /* attribute string contentType; */ NS_IMETHODIMP nsDOMParserChannel::GetContentType(char * *aContentType) @@ -202,12 +197,12 @@ NS_IMETHODIMP nsDOMParserChannel::SetOwner(nsISupports * aOwner) return NS_OK; } -/* attribute nsLoadFlags loadAttributes; */ -NS_IMETHODIMP nsDOMParserChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +/* attribute nsLoadFlags loadFlags; */ +NS_IMETHODIMP nsDOMParserChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP nsDOMParserChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) +NS_IMETHODIMP nsDOMParserChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -464,7 +459,7 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream, request->GetStatus(&status); } - rv = listener->OnStopRequest(request, nsnull, status, nsnull); + rv = listener->OnStopRequest(request, nsnull, status); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; *_retval = domDocument; diff --git a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp index 913c16c647b..690b123e310 100644 --- a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp @@ -21,7 +21,6 @@ */ #include "nsXMLHttpRequest.h" -#include "nsIStreamObserver.h" #include "nsISimpleEnumerator.h" #include "nsIHTTPHeader.h" #include "nsIXPConnect.h" @@ -291,7 +290,7 @@ NS_INTERFACE_MAP_BEGIN(nsXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIDOMLoadListener) NS_INTERFACE_MAP_ENTRY(nsISecurityCheckedComponent) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_END @@ -1099,9 +1098,9 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt) /* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult status, in wstring statusArg); */ NS_IMETHODIMP -nsXMLHttpRequest::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status, const PRUnichar *statusArg) +nsXMLHttpRequest::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status) { - nsresult rv = mXMLParserStreamListener->OnStopRequest(request,ctxt,status,statusArg); + nsresult rv = mXMLParserStreamListener->OnStopRequest(request,ctxt,status); mXMLParserStreamListener = nsnull; mReadRequest = nsnull; mContext = nsnull; diff --git a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.h b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.h index 09d70308061..56432809236 100644 --- a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.h +++ b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.h @@ -78,10 +78,12 @@ public: // nsISecurityCheckedComponent NS_DECL_NSISECURITYCHECKEDCOMPONENT - // nsIStreamListener & Observer - NS_DECL_NSISTREAMOBSERVER + // nsIStreamListener NS_DECL_NSISTREAMLISTENER + // nsIRequestObserver + NS_DECL_NSIREQUESTOBSERVER + protected: nsresult MakeScriptEventListener(nsISupports* aObject, nsIDOMEventListener** aListener); diff --git a/mozilla/gfx/src/nsImageNetContextAsync.cpp b/mozilla/gfx/src/nsImageNetContextAsync.cpp index b3f45ec229a..5ac8f2f159c 100644 --- a/mozilla/gfx/src/nsImageNetContextAsync.cpp +++ b/mozilla/gfx/src/nsImageNetContextAsync.cpp @@ -115,8 +115,8 @@ public: ImageConsumer(ilIURL *aURL, ImageNetContextImpl *aContext); - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSIURICONTENTLISTENER NS_DECL_NSIINTERFACEREQUESTOR @@ -173,7 +173,7 @@ NS_IMPL_THREADSAFE_RELEASE(ImageConsumer) NS_INTERFACE_MAP_BEGIN(ImageConsumer) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURIContentListener) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY(nsIURIContentListener) NS_INTERFACE_MAP_END @@ -484,14 +484,13 @@ void ImageConsumer::KeepPumpingStream(nsITimer *aTimer, void *aClosure) { ImageConsumer *consumer = (ImageConsumer *)aClosure; - nsAutoString status; consumer->OnStopRequest(consumer->mRequest, consumer->mUserContext, - NS_BINDING_SUCCEEDED, status.GetUnicode()); + NS_BINDING_SUCCEEDED); } NS_IMETHODIMP -ImageConsumer::OnStopRequest(nsIRequest* request, nsISupports* aContext, nsresult status, const PRUnichar* aMsg) +ImageConsumer::OnStopRequest(nsIRequest* request, nsISupports* aContext, nsresult status) { if (mTimer) { mTimer->Cancel(); @@ -554,7 +553,7 @@ ImageConsumer::OnStopRequest(nsIRequest* request, nsISupports* aContext, nsresul reader->NetRequestDone(mURL, mStatus); NS_RELEASE(reader); - return mContext->RequestDone(this, request, aContext, status, aMsg); + return mContext->RequestDone(this, request, aContext, status, nsnull); } void @@ -764,7 +763,7 @@ ImageNetContextImpl::GetURL (ilIURL * aURL, nsLoadFlags flags=0; if(IsAnimationLoop) - flags |= nsIChannel::VALIDATE_NEVER; + flags |= nsIRequest::VALIDATE_NEVER; rv = NS_OpenURI(getter_AddRefs(channel), nsurl, nsnull, group, sink, flags); if (NS_FAILED(rv)) goto error; @@ -791,13 +790,13 @@ ImageNetContextImpl::GetURL (ilIURL * aURL, } - rv = channel->GetLoadAttributes(&flags); + rv = channel->GetLoadFlags(&flags); if (NS_FAILED(rv)) goto error; if (aURL->GetBackgroundLoad()) - flags |= nsIChannel::LOAD_BACKGROUND; + flags |= nsIRequest::LOAD_BACKGROUND; - (void)channel->SetLoadAttributes(flags); + (void)channel->SetLoadFlags(flags); nsCOMPtr window (do_QueryInterface(NS_STATIC_CAST(nsIStreamListener *, ic))); @@ -859,7 +858,7 @@ NS_NewImageNetContext(ilINetContext **aInstancePtrResult, PRUint32 necko_attribs; ImgCachePolicy imglib_attribs = USE_IMG_CACHE; - nsLoadFlags defchan_attribs = nsIChannel::LOAD_NORMAL; + nsLoadFlags defchan_attribs = nsIRequest::LOAD_NORMAL; NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr"); if (nsnull == aInstancePtrResult) { @@ -868,7 +867,7 @@ NS_NewImageNetContext(ilINetContext **aInstancePtrResult, if(aLoadContext){ nsCOMPtr group (do_GetInterface(aLoadContext)); - /*nsresult rv = */group->GetDefaultLoadAttributes(&necko_attribs); + /*nsresult rv = */group->GetLoadFlags(&necko_attribs); /* Need code to check freshness of necko cache. */ @@ -878,7 +877,7 @@ Need code to check freshness of necko cache. getter_AddRefs(defLoadRequest))) && defLoadRequest) { channel = do_QueryInterface(defLoadRequest); - if (channel) channel->GetLoadAttributes(&defchan_attribs); + if (channel) channel->GetLoadFlags(&defchan_attribs); } #if defined( DEBUG ) @@ -886,9 +885,9 @@ Need code to check freshness of necko cache. image_net_context_async_log_module = PR_NewLogModule("IMAGENETCTXASYNC"); } #endif - if((nsIChannel::FORCE_VALIDATION & defchan_attribs)|| - (nsIChannel::INHIBIT_PERSISTENT_CACHING & defchan_attribs)|| - (nsIChannel::FORCE_RELOAD & defchan_attribs)) { + if((nsIRequest::FORCE_VALIDATION & defchan_attribs)|| + (nsIRequest::INHIBIT_PERSISTENT_CACHING & defchan_attribs)|| + (nsIRequest::FORCE_RELOAD & defchan_attribs)) { imglib_attribs = DONT_USE_IMG_CACHE; #if defined( DEBUG ) PR_LOG(image_net_context_async_log_module, 1, ("ImageNetContextAsync: NS_NewImageNetContext: DONT_USE_IMAGE_CACHE\n")); diff --git a/mozilla/gfx/src/nsImageNetContextSync.cpp b/mozilla/gfx/src/nsImageNetContextSync.cpp index 95b588980d3..eb759f2e53f 100644 --- a/mozilla/gfx/src/nsImageNetContextSync.cpp +++ b/mozilla/gfx/src/nsImageNetContextSync.cpp @@ -37,6 +37,7 @@ #include "nsIChannel.h" #include "nsCRT.h" #include "nsIServiceManager.h" +#include "nsNetCID.h" static NS_DEFINE_IID(kIURLIID, NS_IURL_IID); diff --git a/mozilla/htmlparser/robot/nsDebugRobot.cpp b/mozilla/htmlparser/robot/nsDebugRobot.cpp index 6c010d06ba8..648b849f29d 100644 --- a/mozilla/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/htmlparser/robot/nsDebugRobot.cpp @@ -34,10 +34,11 @@ #include "nsIServiceManager.h" #include "nsIURL.h" #include "nsIIOService.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); +#include "nsNetCID.h" #include "nsIComponentManager.h" #include "nsParserCIID.h" +static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_IID(kIRobotSinkObserverIID, NS_IROBOTSINKOBSERVER_IID); class RobotSinkObserver : public nsIRobotSinkObserver { diff --git a/mozilla/htmlparser/robot/nsRobotSink.cpp b/mozilla/htmlparser/robot/nsRobotSink.cpp index 1b0d6ebd512..8e7587ae4e3 100644 --- a/mozilla/htmlparser/robot/nsRobotSink.cpp +++ b/mozilla/htmlparser/robot/nsRobotSink.cpp @@ -29,7 +29,7 @@ #include "nsIURL.h" #include "nsIServiceManager.h" #include "nsIIOService.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); +#include "nsNetCID.h" #include "nsCRT.h" #include "nsVoidArray.h" class nsIDocument; @@ -42,6 +42,7 @@ class nsIDocument; // - IMG SRC // - LAYER SRC +static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); static NS_DEFINE_IID(kIRobotSinkIID, NS_IROBOTSINK_IID); diff --git a/mozilla/htmlparser/src/CParserContext.cpp b/mozilla/htmlparser/src/CParserContext.cpp index 4bafaaf0a63..a64d0b0b275 100644 --- a/mozilla/htmlparser/src/CParserContext.cpp +++ b/mozilla/htmlparser/src/CParserContext.cpp @@ -38,7 +38,7 @@ MOZ_DECL_CTOR_COUNTER(CParserContext) CParserContext::CParserContext(nsScanner* aScanner, void *aKey, eParserCommands aCommand, - nsIStreamObserver* aListener, + nsIRequestObserver* aListener, nsIDTD *aDTD, eAutoDetectResult aStatus, PRBool aCopyUnused) diff --git a/mozilla/htmlparser/src/CParserContext.h b/mozilla/htmlparser/src/CParserContext.h index e9ac2471984..a4ccff1a85d 100644 --- a/mozilla/htmlparser/src/CParserContext.h +++ b/mozilla/htmlparser/src/CParserContext.h @@ -52,7 +52,7 @@ public: CParserContext( nsScanner* aScanner, void* aKey=0, eParserCommands aCommand=eViewNormal, - nsIStreamObserver* aListener=0, + nsIRequestObserver* aListener=0, nsIDTD *aDTD=0, eAutoDetectResult aStatus=eUnknownDetect, PRBool aCopyUnused=PR_FALSE); @@ -79,7 +79,7 @@ public: nsIDTD* mValidator; char* mTransferBuffer; - nsIStreamObserver* mListener; + nsIRequestObserver* mListener; void* mKey; PRUint32 mTransferBufferSize; diff --git a/mozilla/htmlparser/src/nsIParser.h b/mozilla/htmlparser/src/nsIParser.h index 410987698e1..e212aa6be2f 100644 --- a/mozilla/htmlparser/src/nsIParser.h +++ b/mozilla/htmlparser/src/nsIParser.h @@ -54,7 +54,7 @@ { 0x41421c60, 0x310a, 0x11d4, { 0x81, 0x6f, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }; class nsIContentSink; -class nsIStreamObserver; +class nsIRequestObserver; class nsIParserFilter; class nsString; class nsIURI; @@ -234,7 +234,7 @@ class nsIParser : public nsISupports { virtual PRBool IsParserEnabled() =0; - virtual nsresult Parse(nsIURI* aURL,nsIStreamObserver* aListener = nsnull,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0; + virtual nsresult Parse(nsIURI* aURL,nsIRequestObserver* aListener = nsnull,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0; virtual nsresult Parse(nsIInputStream& aStream, const nsString& aMimeType,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0; virtual nsresult Parse(const nsAReadableString& aSourceBuffer,void* aKey,const nsString& aContentType,PRBool aEnableVerify,PRBool aLastCall,nsDTDMode aMode=eDTDMode_autodetect) = 0; diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp index 94aef72a4ac..850ed1574b5 100644 --- a/mozilla/htmlparser/src/nsParser.cpp +++ b/mozilla/htmlparser/src/nsParser.cpp @@ -311,8 +311,8 @@ nsresult nsParser::QueryInterface(const nsIID& aIID, void** aInstancePtr) else if(aIID.Equals(NS_GET_IID(nsIProgressEventSink))) { *aInstancePtr = (nsIStreamListener*)(this); } - else if(aIID.Equals(NS_GET_IID(nsIStreamObserver))) { - *aInstancePtr = (nsIStreamObserver*)(this); + else if(aIID.Equals(NS_GET_IID(nsIRequestObserver))) { + *aInstancePtr = (nsIRequestObserver*)(this); } else if(aIID.Equals(NS_GET_IID(nsIStreamListener))) { *aInstancePtr = (nsIStreamListener*)(this); @@ -1575,7 +1575,7 @@ PRBool nsParser::IsParserEnabled() { * @param aFilename -- const char* containing file to be parsed. * @return error code -- 0 if ok, non-zero if error. */ -nsresult nsParser::Parse(nsIURI* aURL,nsIStreamObserver* aListener,PRBool aVerifyEnabled, void* aKey,nsDTDMode aMode) { +nsresult nsParser::Parse(nsIURI* aURL,nsIRequestObserver* aListener,PRBool aVerifyEnabled, void* aKey,nsDTDMode aMode) { NS_PRECONDITION(0!=aURL,kNullURL); @@ -2369,7 +2369,7 @@ NS_PRECONDITION(((eOnStart==mParserContext->mStreamListenerState)||(eOnDataAvail * @return */ nsresult nsParser::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult status, const PRUnichar* aMsg) + nsresult status) { nsresult result=NS_OK; @@ -2400,7 +2400,7 @@ nsresult nsParser::OnStopRequest(nsIRequest *request, nsISupports* aContext, // XXX Should we wait to notify our observers as well if the // parser isn't yet enabled? if (nsnull != mObserver) { - mObserver->OnStopRequest(request, aContext, status, aMsg); + mObserver->OnStopRequest(request, aContext, status); } #ifdef rickgdebug diff --git a/mozilla/htmlparser/src/nsParser.h b/mozilla/htmlparser/src/nsParser.h index af7e665e7d3..3129cfc7e36 100644 --- a/mozilla/htmlparser/src/nsParser.h +++ b/mozilla/htmlparser/src/nsParser.h @@ -182,7 +182,7 @@ class nsParser : public nsIParser, * @param aListener is a listener to forward notifications to * @return TRUE if all went well -- FALSE otherwise */ - virtual nsresult Parse(nsIURI* aURL,nsIStreamObserver* aListener,PRBool aEnableVerify=PR_FALSE,void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect); + virtual nsresult Parse(nsIURI* aURL,nsIRequestObserver* aListener,PRBool aEnableVerify=PR_FALSE,void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect); /** * Cause parser to parse input from given stream @@ -253,8 +253,8 @@ class nsParser : public nsIParser, //********************************************* NS_DECL_NSIPROGRESSEVENTSINK - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener methods: NS_DECL_NSISTREAMLISTENER @@ -394,7 +394,7 @@ protected: PRInt32 mMajorIteration; PRInt32 mMinorIteration; - nsIStreamObserver* mObserver; + nsIRequestObserver* mObserver; nsIProgressEventSink* mProgressEventSink; nsIContentSink* mSink; nsIParserFilter* mParserFilter; diff --git a/mozilla/intl/strres/tests/StringBundleTest.cpp b/mozilla/intl/strres/tests/StringBundleTest.cpp index 90060f2e70f..e5063754989 100644 --- a/mozilla/intl/strres/tests/StringBundleTest.cpp +++ b/mozilla/intl/strres/tests/StringBundleTest.cpp @@ -33,6 +33,7 @@ #include "nsIIOService.h" #include "nsIURL.h" #include "nsIServiceManager.h" +#include "nsNetCID.h" #include "nsIServiceManager.h" #include "nsIComponentManager.h" diff --git a/mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp b/mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp index 00dfc426636..52951c3afe0 100644 --- a/mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp +++ b/mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp @@ -44,6 +44,7 @@ #include "nsIIOService.h" #include "nsIChannel.h" #include "nsIInputStream.h" +#include "nsNetCID.h" #include "jsapi.h" diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 1044e903986..c39652b1ffc 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -708,8 +708,8 @@ public: NS_IMETHOD SetURI(nsIURI* aURI) { gURI = aURI; NS_ADDREF(gURI); return NS_OK; } NS_IMETHOD Open(nsIInputStream **_retval) { *_retval = nsnull; return NS_OK; } NS_IMETHOD AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD GetLoadAttributes(nsLoadFlags *aLoadAttributes) { *aLoadAttributes = nsIChannel::LOAD_NORMAL; return NS_OK; } - NS_IMETHOD SetLoadAttributes(nsLoadFlags aLoadAttributes) { return NS_OK; } + NS_IMETHOD GetLoadFlags(nsLoadFlags *aLoadFlags) { *aLoadFlags = nsIRequest::LOAD_NORMAL; return NS_OK; } + NS_IMETHOD SetLoadFlags(nsLoadFlags aLoadFlags) { return NS_OK; } NS_IMETHOD GetOwner(nsISupports * *aOwner) { *aOwner = nsnull; return NS_OK; } NS_IMETHOD SetOwner(nsISupports * aOwner) { return NS_OK; } NS_IMETHOD GetLoadGroup(nsILoadGroup * *aLoadGroup) { *aLoadGroup = mLoadGroup; NS_IF_ADDREF(*aLoadGroup); return NS_OK; } @@ -5711,7 +5711,7 @@ PresShell::RemoveDummyLayoutRequest(void) } if (loadGroup && mDummyLayoutRequest) { - rv = loadGroup->RemoveRequest(mDummyLayoutRequest, nsnull, NS_OK, nsnull); + rv = loadGroup->RemoveRequest(mDummyLayoutRequest, nsnull, NS_OK); if (NS_FAILED(rv)) return rv; mDummyLayoutRequest = nsnull; diff --git a/mozilla/layout/forms/nsFormControlHelper.cpp b/mozilla/layout/forms/nsFormControlHelper.cpp index 316c3c4840b..cc6a00b45af 100644 --- a/mozilla/layout/forms/nsFormControlHelper.cpp +++ b/mozilla/layout/forms/nsFormControlHelper.cpp @@ -53,6 +53,7 @@ #include "nsStyleUtil.h" #include "nsINameSpaceManager.h" #include "nsIDOMHTMLInputElement.h" +#include "nsNetCID.h" // Needed for Localization #include "nsIServiceManager.h" diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 1044e903986..c39652b1ffc 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -708,8 +708,8 @@ public: NS_IMETHOD SetURI(nsIURI* aURI) { gURI = aURI; NS_ADDREF(gURI); return NS_OK; } NS_IMETHOD Open(nsIInputStream **_retval) { *_retval = nsnull; return NS_OK; } NS_IMETHOD AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) { return NS_OK; } - NS_IMETHOD GetLoadAttributes(nsLoadFlags *aLoadAttributes) { *aLoadAttributes = nsIChannel::LOAD_NORMAL; return NS_OK; } - NS_IMETHOD SetLoadAttributes(nsLoadFlags aLoadAttributes) { return NS_OK; } + NS_IMETHOD GetLoadFlags(nsLoadFlags *aLoadFlags) { *aLoadFlags = nsIRequest::LOAD_NORMAL; return NS_OK; } + NS_IMETHOD SetLoadFlags(nsLoadFlags aLoadFlags) { return NS_OK; } NS_IMETHOD GetOwner(nsISupports * *aOwner) { *aOwner = nsnull; return NS_OK; } NS_IMETHOD SetOwner(nsISupports * aOwner) { return NS_OK; } NS_IMETHOD GetLoadGroup(nsILoadGroup * *aLoadGroup) { *aLoadGroup = mLoadGroup; NS_IF_ADDREF(*aLoadGroup); return NS_OK; } @@ -5711,7 +5711,7 @@ PresShell::RemoveDummyLayoutRequest(void) } if (loadGroup && mDummyLayoutRequest) { - rv = loadGroup->RemoveRequest(mDummyLayoutRequest, nsnull, NS_OK, nsnull); + rv = loadGroup->RemoveRequest(mDummyLayoutRequest, nsnull, NS_OK); if (NS_FAILED(rv)) return rv; mDummyLayoutRequest = nsnull; diff --git a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp index 316c3c4840b..cc6a00b45af 100644 --- a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp @@ -53,6 +53,7 @@ #include "nsStyleUtil.h" #include "nsINameSpaceManager.h" #include "nsIDOMHTMLInputElement.h" +#include "nsNetCID.h" // Needed for Localization #include "nsIServiceManager.h" diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp index 748bbcf7e78..a8e66d936e7 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp @@ -3776,7 +3776,7 @@ nsEnderDocumentObserver::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } if (aIID.Equals(NS_GET_IID(nsIDocumentObserver))) { - *aInstancePtr = (void*) ((nsIStreamObserver*)this); + *aInstancePtr = (void*) ((nsIRequestObserver*)this); AddRef(); return NS_OK; } diff --git a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp index c0d5e58bb20..e0713f0a24f 100644 --- a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp +++ b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp @@ -75,7 +75,7 @@ NS_IMPL_RELEASE(nsAbSyncPostEngine) NS_INTERFACE_MAP_BEGIN(nsAbSyncPostEngine) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURIContentListener) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY(nsIURIContentListener) NS_INTERFACE_MAP_ENTRY(nsIAbSyncPostEngine) @@ -415,7 +415,7 @@ nsAbSyncPostEngine::OnDataAvailable(nsIRequest *request, nsISupports * ctxt, nsI } -// Methods for nsIStreamObserver +// Methods for nsIRequestObserver nsresult nsAbSyncPostEngine::OnStartRequest(nsIRequest *request, nsISupports *ctxt) { @@ -427,7 +427,7 @@ nsAbSyncPostEngine::OnStartRequest(nsIRequest *request, nsISupports *ctxt) } nsresult -nsAbSyncPostEngine::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, nsresult aStatus, const PRUnichar* aMsg) +nsAbSyncPostEngine::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, nsresult aStatus) { #ifdef NS_DEBUG_rhp printf("nsAbSyncPostEngine::OnStopRequest()\n"); @@ -487,8 +487,8 @@ nsAbSyncPostEngine::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, if (Base64Encode((unsigned char *)mUser, nsCRT::strlen(mUser), tUser, sizeof(tUser)) < 0) { rv = NS_ERROR_FAILURE; - NotifyListenersOnStopAuthOperation(rv, aMsg, tProtResponse); - NotifyListenersOnStopSending(mTransactionID, rv, nsnull, nsnull); + NotifyListenersOnStopAuthOperation(rv, tProtResponse); + NotifyListenersOnStopSending(mTransactionID, rv, nsnull); } else { @@ -496,14 +496,14 @@ nsAbSyncPostEngine::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, if (!tUser2) { rv = NS_ERROR_FAILURE; - NotifyListenersOnStopAuthOperation(rv, aMsg, tProtResponse); - NotifyListenersOnStopSending(mTransactionID, rv, nsnull, nsnull); + NotifyListenersOnStopAuthOperation(rv, tProtResponse); + NotifyListenersOnStopSending(mTransactionID, rv, nsnull); } else { mSyncProtocolRequestPrefix = PR_smprintf("cn=%s&cc=%s&", tUser2, mCookie); PR_FREEIF(tUser2); - NotifyListenersOnStopAuthOperation(aStatus, aMsg, tProtResponse); + NotifyListenersOnStopAuthOperation(aStatus, tProtResponse); KickTheSyncOperation(); } } @@ -521,8 +521,8 @@ nsAbSyncPostEngine::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, } else { - NotifyListenersOnStopAuthOperation(rv, aMsg, tProtResponse); - NotifyListenersOnStopSending(mTransactionID, rv, nsnull, nsnull); + NotifyListenersOnStopAuthOperation(rv, tProtResponse); + NotifyListenersOnStopSending(mTransactionID, rv, nsnull); } mSyncMojo = nsnull; @@ -530,7 +530,7 @@ nsAbSyncPostEngine::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, else { tProtResponse = mProtocolResponse.ToNewCString(); - NotifyListenersOnStopSending(mTransactionID, aStatus, aMsg, tProtResponse); + NotifyListenersOnStopSending(mTransactionID, aStatus, tProtResponse); } PR_FREEIF(tProtResponse); @@ -614,12 +614,12 @@ nsAbSyncPostEngine::NotifyListenersOnStartAuthOperation(void) } nsresult -nsAbSyncPostEngine::NotifyListenersOnStopAuthOperation(nsresult aStatus, const PRUnichar *aMsg, const char *aCookie) +nsAbSyncPostEngine::NotifyListenersOnStopAuthOperation(nsresult aStatus, const char *aCookie) { PRInt32 i; for (i=0; iOnStopAuthOperation(aStatus, aMsg, aCookie); + mListenerArray[i]->OnStopAuthOperation(aStatus, nsnull, aCookie); return NS_OK; } @@ -658,12 +658,12 @@ nsAbSyncPostEngine::NotifyListenersOnStatus(PRInt32 aTransactionID, PRUnichar *a nsresult nsAbSyncPostEngine::NotifyListenersOnStopSending(PRInt32 aTransactionID, nsresult aStatus, - const PRUnichar *aMsg, char *aProtocolResponse) + char *aProtocolResponse) { PRInt32 i; for (i=0; iOnStopOperation(aTransactionID, aStatus, aMsg, aProtocolResponse); + mListenerArray[i]->OnStopOperation(aTransactionID, aStatus, nsnull, aProtocolResponse); return NS_OK; } diff --git a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.h b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.h index 4395ea10530..0aa9689db82 100644 --- a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.h +++ b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.h @@ -69,7 +69,7 @@ public: // Methods for nsIStreamListener NS_DECL_NSISTREAMLISTENER // Methods for nsIStreamObserver - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIURICONTENTLISTENER NS_DECL_NSIINTERFACEREQUESTOR @@ -80,12 +80,12 @@ private: // Handy methods for listeners... nsresult DeleteListeners(); nsresult NotifyListenersOnStartAuthOperation(void); - nsresult NotifyListenersOnStopAuthOperation(nsresult aStatus, const PRUnichar *aMsg, const char *aCookie); + nsresult NotifyListenersOnStopAuthOperation(nsresult aStatus, const char *aCookie); nsresult NotifyListenersOnStartSending(PRInt32 aTransactionID, PRUint32 aMsgSize); nsresult NotifyListenersOnProgress(PRInt32 aTransactionID, PRUint32 aProgress, PRUint32 aProgressMax); nsresult NotifyListenersOnStatus(PRInt32 aTransactionID, PRUnichar *aMsg); nsresult NotifyListenersOnStopSending(PRInt32 aTransactionID, nsresult aStatus, - const PRUnichar *aMsg, char *aProtocolResponse); + char *aProtocolResponse); PRBool mStillRunning; // Are we still running? diff --git a/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp b/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp index bb5da4916b3..b8f532b4c78 100644 --- a/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp +++ b/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp @@ -25,7 +25,6 @@ #include "nsIPref.h" #include "nsIIOService.h" -#include "nsIStreamObserver.h" #include "nsIStreamListener.h" #include "nsAddbookProtocolHandler.h" diff --git a/mozilla/mailnews/addrbook/src/nsAddbookUrl.cpp b/mozilla/mailnews/addrbook/src/nsAddbookUrl.cpp index 244f4c5f398..87949cf42fc 100644 --- a/mozilla/mailnews/addrbook/src/nsAddbookUrl.cpp +++ b/mozilla/mailnews/addrbook/src/nsAddbookUrl.cpp @@ -21,6 +21,7 @@ */ #include "nsIURI.h" +#include "nsNetCID.h" #include "nsAddbookUrl.h" #include "nsString.h" #include "nsXPIDLString.h" diff --git a/mozilla/mailnews/base/src/nsCopyMessageStreamListener.cpp b/mozilla/mailnews/base/src/nsCopyMessageStreamListener.cpp index 6025e503747..4dde90173fe 100644 --- a/mozilla/mailnews/base/src/nsCopyMessageStreamListener.cpp +++ b/mozilla/mailnews/base/src/nsCopyMessageStreamListener.cpp @@ -42,7 +42,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsCopyMessageStreamListener) NS_INTERFACE_MAP_BEGIN(nsCopyMessageStreamListener) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsICopyMessageStreamListener) NS_INTERFACE_MAP_END_THREADSAFE @@ -150,7 +150,7 @@ NS_IMETHODIMP nsCopyMessageStreamListener::OnStartRequest(nsIRequest * request, return rv; } -NS_IMETHODIMP nsCopyMessageStreamListener::OnStopRequest(nsIRequest* request, nsISupports *ctxt, nsresult aStatus, const PRUnichar *aMsg) +NS_IMETHODIMP nsCopyMessageStreamListener::OnStopRequest(nsIRequest* request, nsISupports *ctxt, nsresult aStatus) { nsresult rv = NS_OK; nsCOMPtr uri = do_QueryInterface(ctxt, &rv); diff --git a/mozilla/mailnews/base/src/nsCopyMessageStreamListener.h b/mozilla/mailnews/base/src/nsCopyMessageStreamListener.h index 87c4e59ccde..653078c1fcc 100644 --- a/mozilla/mailnews/base/src/nsCopyMessageStreamListener.h +++ b/mozilla/mailnews/base/src/nsCopyMessageStreamListener.h @@ -38,7 +38,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSICOPYMESSAGESTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER protected: diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp index a693431e2f2..702a6665b09 100644 --- a/mozilla/mailnews/base/src/nsMessenger.cpp +++ b/mozilla/mailnews/base/src/nsMessenger.cpp @@ -195,7 +195,7 @@ public: NS_DECL_NSIURLLISTENER NS_DECL_NSIMSGCOPYSERVICELISTENER NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER nsCOMPtr m_fileSpec; nsCOMPtr m_outputStream; @@ -1573,7 +1573,7 @@ nsSaveMsgListener::OnStartRequest(nsIRequest* request, nsISupports* aSupport) NS_IMETHODIMP nsSaveMsgListener::OnStopRequest(nsIRequest* request, nsISupports* aSupport, - nsresult status, const PRUnichar* aMsg) + nsresult status) { nsresult rv = NS_OK; diff --git a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp index cd3027c819a..57e23c190db 100644 --- a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp +++ b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp @@ -40,6 +40,7 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsIFileSpec.h" #include "nsIURL.h" +#include "nsNetCID.h" #include "nsIStringBundle.h" #include "nsMessengerMigrator.h" diff --git a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp b/mozilla/mailnews/base/src/nsMsgAccountManager.cpp index 6dbe28bf062..12089a8fac0 100644 --- a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgAccountManager.cpp @@ -46,6 +46,7 @@ #include "nsMsgUtils.h" #include "nsIFileSpec.h" #include "nsIURL.h" +#include "nsNetCID.h" #include "nsISmtpService.h" #include "nsString.h" #include "nsIMsgBiffManager.h" diff --git a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp index 68079782af7..711112a4584 100644 --- a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp +++ b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp @@ -45,7 +45,7 @@ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); // nsFolderCompactState ////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS3(nsFolderCompactState, nsIMsgFolderCompactor, nsIStreamObserver, nsIStreamListener) +NS_IMPL_ISUPPORTS3(nsFolderCompactState, nsIMsgFolderCompactor, nsIRequestObserver, nsIStreamListener) nsFolderCompactState::nsFolderCompactState() { @@ -412,8 +412,7 @@ nsFolderCompactState::OnStartRequest(nsIRequest *request, nsISupports *ctxt) NS_IMETHODIMP nsFolderCompactState::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult status, - const PRUnichar *errorMsg) + nsresult status) { nsresult rv = status; nsCOMPtr uri; @@ -513,8 +512,7 @@ nsOfflineStoreCompactState::InitDB(nsIMsgDatabase *db) NS_IMETHODIMP nsOfflineStoreCompactState::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult status, - const PRUnichar *errorMsg) + nsresult status) { nsresult rv = status; nsCOMPtr uri; diff --git a/mozilla/mailnews/base/src/nsMsgFolderCompactor.h b/mozilla/mailnews/base/src/nsMsgFolderCompactor.h index e2227b1ecb3..81083ee8c32 100644 --- a/mozilla/mailnews/base/src/nsMsgFolderCompactor.h +++ b/mozilla/mailnews/base/src/nsMsgFolderCompactor.h @@ -35,7 +35,7 @@ class nsFolderCompactState : public nsIMsgFolderCompactor, public nsIStreamListe { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSIMSGFOLDERCOMPACTOR @@ -82,7 +82,7 @@ public: virtual nsresult InitDB(nsIMsgDatabase *db); NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg); + nsresult status); NS_IMETHODIMP FinishCompact(); }; diff --git a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp index 165c80475b4..d7ccf79c049 100644 --- a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp @@ -34,6 +34,7 @@ #include "nsIMsgAccountManager.h" #include "nsMsgCompCID.h" #include "nsIIOService.h" +#include "nsNetCID.h" #include "nsMsgNewsCID.h" #include "nsINntpService.h" #include "nsXPIDLString.h" diff --git a/mozilla/mailnews/base/src/nsMsgWindow.cpp b/mozilla/mailnews/base/src/nsMsgWindow.cpp index 150ce215764..dcefaae2663 100644 --- a/mozilla/mailnews/base/src/nsMsgWindow.cpp +++ b/mozilla/mailnews/base/src/nsMsgWindow.cpp @@ -42,7 +42,7 @@ #include "nsICharsetConverterManager.h" #include "nsICharsetConverterManager2.h" #include "nsIChannel.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "plbase64.h" #include "nsMsgI18N.h" diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp index e0b1b5d880a..927c365fdff 100644 --- a/mozilla/mailnews/base/util/nsMsgFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp @@ -51,6 +51,7 @@ #include "nsIIOService.h" #include "nsIURL.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); diff --git a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp index 1a648ac18c2..a8fc3fd2914 100644 --- a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -35,6 +35,7 @@ #include "nsIInterfaceRequestor.h" #include "nsIIOService.h" #include "nsINetDataCacheManager.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kUrlListenerManagerCID, NS_URLLISTENERMANAGER_CID); static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID); diff --git a/mozilla/mailnews/base/util/nsMsgProtocol.cpp b/mozilla/mailnews/base/util/nsMsgProtocol.cpp index 39a693efb52..99eb1f23676 100644 --- a/mozilla/mailnews/base/util/nsMsgProtocol.cpp +++ b/mozilla/mailnews/base/util/nsMsgProtocol.cpp @@ -48,7 +48,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsMsgProtocol) NS_INTERFACE_MAP_BEGIN(nsMsgProtocol) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIChannel) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIChannel) NS_INTERFACE_MAP_ENTRY(nsIRequest) NS_INTERFACE_MAP_END_THREADSAFE @@ -59,7 +59,7 @@ nsMsgProtocol::nsMsgProtocol(nsIURI * aURL) m_flags = 0; m_startPosition = 0; m_readCount = 0; - mLoadAttributes = 0; + mLoadFlags = 0; m_socketIsOpen = PR_FALSE; m_tempMsgFileSpec = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_TemporaryDirectory); @@ -176,7 +176,7 @@ nsresult nsMsgProtocol::SetupTransportState() if (!m_socketIsOpen && m_transport) { - rv = m_transport->OpenOutputStream(0, -1, 0, getter_AddRefs(m_outputStream)); + rv = m_transport->OpenOutputStream(0, PRUint32(-1), 0, getter_AddRefs(m_outputStream)); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create an output stream"); // we want to open the stream @@ -260,7 +260,7 @@ NS_IMETHODIMP nsMsgProtocol::OnStartRequest(nsIRequest *request, nsISupports *ct } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsMsgProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsMsgProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus) { nsresult rv = NS_OK; @@ -268,14 +268,14 @@ NS_IMETHODIMP nsMsgProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctx // so pass in ourself as the channel and not the underlying socket or file channel the protocol // happens to be using if (!mSuppressListenerNotifications && m_channelListener) - rv = m_channelListener->OnStopRequest(this, m_channelContext, aStatus, aMsg); + rv = m_channelListener->OnStopRequest(this, m_channelContext, aStatus); nsCOMPtr msgUrl = do_QueryInterface(ctxt, &rv); if (NS_SUCCEEDED(rv) && msgUrl) { rv = msgUrl->SetUrlState(PR_FALSE, aStatus); if (m_loadGroup) - m_loadGroup->RemoveRequest(NS_STATIC_CAST(nsIRequest *, this), nsnull, aStatus, nsnull); + m_loadGroup->RemoveRequest(NS_STATIC_CAST(nsIRequest *, this), nsnull, aStatus); // !NS_BINDING_ABORTED because we don't want to see an alert if the user // cancelled the operation. also, we'll get here because we call Cancel() @@ -404,12 +404,6 @@ NS_IMETHODIMP nsMsgProtocol::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP nsMsgProtocol::SetURI(nsIURI* aURI) -{ - m_url = aURI; - return NS_OK; -} - NS_IMETHODIMP nsMsgProtocol::Open(nsIInputStream **_retval) { NS_NOTREACHED("Open"); @@ -421,37 +415,18 @@ NS_IMETHODIMP nsMsgProtocol::AsyncOpen(nsIStreamListener *listener, nsISupports // set the stream listener and then load the url m_channelContext = ctxt; m_channelListener = listener; - - // the following load group code is completely bogus.... - nsresult rv = NS_OK; - if (m_loadGroup) - { - nsCOMPtr factory; - // - // Create a load group "proxy" listener... - // - rv = m_loadGroup->GetGroupListenerFactory(getter_AddRefs(factory)); - if (factory) - { - nsCOMPtr newListener; - rv = factory->CreateLoadGroupListener(m_channelListener, getter_AddRefs(newListener)); - if (NS_SUCCEEDED(rv)) - m_channelListener = newListener; - } - } // if aLoadGroup - return LoadUrl(m_url, nsnull); } -NS_IMETHODIMP nsMsgProtocol::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +NS_IMETHODIMP nsMsgProtocol::GetLoadFlags(nsLoadFlags *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } -NS_IMETHODIMP nsMsgProtocol::SetLoadAttributes(nsLoadFlags aLoadAttributes) +NS_IMETHODIMP nsMsgProtocol::SetLoadFlags(nsLoadFlags aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; // don't fail when trying to set this } @@ -710,10 +685,10 @@ public: void Init(nsMsgAsyncWriteProtocol *aProtInstance, nsIInputStream *aInputStream) { mMsgProtocol = aProtInstance; mInStream = aInputStream;} // - // nsIStreamObserver implementation ... + // nsIRequestObserver implementation ... // NS_IMETHODIMP OnStartRequest(nsIRequest *chan, nsISupports *ctxt) { return NS_OK; } - NS_IMETHODIMP OnStopRequest(nsIRequest *chan, nsISupports *ctxt, nsresult status, const PRUnichar *statusText) { return NS_OK; } + NS_IMETHODIMP OnStopRequest(nsIRequest *chan, nsISupports *ctxt, nsresult status) { return NS_OK; } // // nsIStreamProvider implementation ... @@ -757,13 +732,13 @@ protected: NS_IMPL_THREADSAFE_ISUPPORTS2(nsMsgProtocolStreamProvider, nsIStreamProvider, - nsIStreamObserver) + nsIRequestObserver) class nsMsgFilePostHelper : public nsIStreamListener { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsMsgFilePostHelper() { NS_INIT_REFCNT(); mSuspendedPostFileRead = PR_FALSE;} @@ -781,7 +756,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsMsgFilePostHelper) NS_INTERFACE_MAP_BEGIN(nsMsgFilePostHelper) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_END_THREADSAFE nsresult nsMsgFilePostHelper::Init(nsIOutputStream * aOutStream, nsMsgAsyncWriteProtocol * aProtInstance, nsIFile *aFileToPost) @@ -808,7 +783,7 @@ NS_IMETHODIMP nsMsgFilePostHelper::OnStartRequest(nsIRequest * aChannel, nsISupp return NS_OK; } -NS_IMETHODIMP nsMsgFilePostHelper::OnStopRequest(nsIRequest * aChannel, nsISupports *ctxt, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsMsgFilePostHelper::OnStopRequest(nsIRequest * aChannel, nsISupports *ctxt, nsresult aStatus) { if (!mSuspendedPostFileRead) mProtInstance->PostDataFinished(); diff --git a/mozilla/mailnews/base/util/nsMsgProtocol.h b/mozilla/mailnews/base/util/nsMsgProtocol.h index c9278469743..fa59afe9d13 100644 --- a/mozilla/mailnews/base/util/nsMsgProtocol.h +++ b/mozilla/mailnews/base/util/nsMsgProtocol.h @@ -57,8 +57,8 @@ public: NS_DECL_NSICHANNEL NS_DECL_NSIREQUEST - NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSISTREAMLISTENER + NS_DECL_NSIREQUESTOBSERVER // LoadUrl -- A protocol typically overrides this function, sets up any local state for the url and // then calls the base class which opens the socket if it needs opened. If the socket is @@ -135,7 +135,7 @@ protected: nsCOMPtr m_channelListener; nsCOMPtr m_channelContext; nsCOMPtr m_loadGroup; - nsLoadFlags mLoadAttributes; + nsLoadFlags mLoadFlags; nsCOMPtr mProgressEventSink; nsCOMPtr mCallbacks; nsCOMPtr mOwner; diff --git a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp index 9ac429ec4ea..0fefeccf2b9 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp @@ -38,6 +38,7 @@ #include "nsSpecialSystemDirectory.h" #include "nsIDocumentEncoder.h" // for editor output flags #include "nsIURI.h" +#include "nsNetCID.h" #include "nsMsgPrompts.h" /* for StrAllocCat */ diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index 75225149964..d7f9835f477 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -69,6 +69,7 @@ #include "nsIDocShellTreeOwner.h" #include "nsISupportsArray.h" #include "nsIIOService.h" +#include "nsNetCID.h" #include "nsIMsgMailSession.h" #include "nsMsgBaseCID.h" #include "nsIPrompt.h" @@ -1147,7 +1148,7 @@ NS_IMETHODIMP QuotingOutputStreamListener::OnStartRequest(nsIRequest *request, n return NS_OK; } -NS_IMETHODIMP QuotingOutputStreamListener::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, nsresult status, const PRUnichar * /* errorMsg */) +NS_IMETHODIMP QuotingOutputStreamListener::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, nsresult status) { nsresult rv = NS_OK; nsAutoString aCharset; diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.h b/mozilla/mailnews/compose/src/nsMsgCompose.h index 09a40d376ff..7f3bcd85d5f 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.h +++ b/mozilla/mailnews/compose/src/nsMsgCompose.h @@ -154,7 +154,7 @@ public: virtual ~QuotingOutputStreamListener(void); NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_IMETHOD SetComposeObj(nsMsgCompose *obj); diff --git a/mozilla/mailnews/compose/src/nsMsgCopy.cpp b/mozilla/mailnews/compose/src/nsMsgCopy.cpp index cb7ad07d559..32f589ff564 100644 --- a/mozilla/mailnews/compose/src/nsMsgCopy.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCopy.cpp @@ -37,6 +37,7 @@ #include "nsIRDFResource.h" #include "nsRDFCID.h" #include "nsIURL.h" +#include "nsNetCID.h" #include "nsMsgComposeStringBundle.h" #include "nsMsgCompUtils.h" #include "prcmon.h" diff --git a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp index 4d560ffd1b6..22ea76b70ab 100644 --- a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp +++ b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp @@ -139,7 +139,7 @@ nsMsgSendLater::~nsMsgSendLater() // Stream is done...drive on! NS_IMETHODIMP -nsMsgSendLater::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +nsMsgSendLater::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status) { nsresult rv; diff --git a/mozilla/mailnews/compose/src/nsMsgSendLater.h b/mozilla/mailnews/compose/src/nsMsgSendLater.h index 7a1a6081e87..4daa966b772 100644 --- a/mozilla/mailnews/compose/src/nsMsgSendLater.h +++ b/mozilla/mailnews/compose/src/nsMsgSendLater.h @@ -84,8 +84,8 @@ public: // For nsIStreamListener interface... NS_DECL_NSISTREAMLISTENER - // For nsIStreamObserver interface... - NS_DECL_NSISTREAMOBSERVER + // For nsIRequestObserver interface... + NS_DECL_NSIREQUESTOBSERVER // Methods needed for implementing interface... nsresult StartNextMailFileSend(); diff --git a/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp b/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp index b4d4813ff25..e1c3bc8a1ef 100644 --- a/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp @@ -27,6 +27,7 @@ #include "nsXPIDLString.h" #include "nsIURL.h" +#include "nsNetCID.h" #include "nsIRDFResource.h" diff --git a/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp b/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp index 4bd35743fb0..f00a1a8e736 100644 --- a/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp @@ -400,9 +400,9 @@ const char * nsSmtpProtocol::GetUserDomainName() //////////////////////////////////////////////////////////////////////////////////////////// // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsSmtpProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus, const PRUnichar *aMsg) +NS_IMETHODIMP nsSmtpProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus) { - nsMsgAsyncWriteProtocol::OnStopRequest(nsnull, ctxt, aStatus, aMsg); + nsMsgAsyncWriteProtocol::OnStopRequest(nsnull, ctxt, aStatus); // 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 678564f117f..d5e58a5d036 100644 --- a/mozilla/mailnews/compose/src/nsSmtpProtocol.h +++ b/mozilla/mailnews/compose/src/nsSmtpProtocol.h @@ -116,7 +116,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// // stop binding is a "notification" informing us that the stream associated with aURL is going away. - NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg); + NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status); private: // logon redirection related variables and methods diff --git a/mozilla/mailnews/compose/src/nsSmtpService.cpp b/mozilla/mailnews/compose/src/nsSmtpService.cpp index 3ada017c50c..1acb75689a1 100644 --- a/mozilla/mailnews/compose/src/nsSmtpService.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpService.cpp @@ -25,6 +25,7 @@ #include "nsXPIDLString.h" #include "nsIPref.h" #include "nsIIOService.h" +#include "nsNetCID.h" #include "nsSmtpService.h" #include "nsIMsgMailSession.h" @@ -323,12 +324,6 @@ NS_IMETHODIMP nsMailtoChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP nsMailtoChannel::SetURI(nsIURI* aURI) -{ - m_url = aURI; - return NS_OK; -} - NS_IMETHODIMP nsMailtoChannel::Open(nsIInputStream **_retval) { NS_NOTREACHED("Open"); @@ -340,13 +335,13 @@ NS_IMETHODIMP nsMailtoChannel::AsyncOpen(nsIStreamListener *listener, nsISupport return listener->OnStartRequest(this, ctxt); } -NS_IMETHODIMP nsMailtoChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +NS_IMETHODIMP nsMailtoChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { - *aLoadAttributes = 0; + *aLoadFlags = 0; return NS_OK; } -NS_IMETHODIMP nsMailtoChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) +NS_IMETHODIMP nsMailtoChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { return NS_OK; } diff --git a/mozilla/mailnews/compose/src/nsSmtpUrl.cpp b/mozilla/mailnews/compose/src/nsSmtpUrl.cpp index 03cd3e38318..c1c9c446eac 100644 --- a/mozilla/mailnews/compose/src/nsSmtpUrl.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpUrl.cpp @@ -23,6 +23,7 @@ #include "msgCore.h" #include "nsIURI.h" +#include "nsNetCID.h" #include "nsSmtpUrl.h" #include "nsString.h" #include "nsXPIDLString.h" diff --git a/mozilla/mailnews/compose/src/nsURLFetcher.cpp b/mozilla/mailnews/compose/src/nsURLFetcher.cpp index 984bf09e322..e0e03b6b024 100644 --- a/mozilla/mailnews/compose/src/nsURLFetcher.cpp +++ b/mozilla/mailnews/compose/src/nsURLFetcher.cpp @@ -69,7 +69,7 @@ NS_IMPL_RELEASE(nsURLFetcher) NS_INTERFACE_MAP_BEGIN(nsURLFetcher) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURIContentListener) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY(nsIURIContentListener) NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener) @@ -269,7 +269,7 @@ nsURLFetcher::OnStartRequest(nsIRequest *request, nsISupports *ctxt) } nsresult -nsURLFetcher::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, nsresult aStatus, const PRUnichar* aMsg) +nsURLFetcher::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, nsresult aStatus) { #ifdef NS_DEBUG_rhp printf("nsURLFetcher::OnStopRequest()\n"); @@ -321,7 +321,7 @@ nsURLFetcher::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, nsres // Now if there is a callback, we need to call it... if (mCallback) - mCallback (mURL, aStatus, mContentType, mCharset, mTotalWritten, aMsg, mTagData); + mCallback (mURL, aStatus, mContentType, mCharset, mTotalWritten, nsnull, mTagData); // Time to return... return NS_OK; @@ -403,7 +403,7 @@ nsURLFetcher::OnStateChange(nsIWebProgress *aProgress, nsIRequest *aRequest, // the url.... if (NS_FAILED(aStatus)) - OnStopRequest(aRequest, nsnull, aStatus, nsnull); + OnStopRequest(aRequest, nsnull, aStatus); return NS_OK; } diff --git a/mozilla/mailnews/compose/src/nsURLFetcher.h b/mozilla/mailnews/compose/src/nsURLFetcher.h index d3856d924e0..a6bd70ac533 100644 --- a/mozilla/mailnews/compose/src/nsURLFetcher.h +++ b/mozilla/mailnews/compose/src/nsURLFetcher.h @@ -71,8 +71,8 @@ public: // Methods for nsIStreamListener NS_DECL_NSISTREAMLISTENER - // Methods for nsIStreamObserver - NS_DECL_NSISTREAMOBSERVER + // Methods for nsIRequestObserver + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIURICONTENTLISTENER NS_DECL_NSIINTERFACEREQUESTOR diff --git a/mozilla/mailnews/imap/public/nsIImapMockChannel.idl b/mozilla/mailnews/imap/public/nsIImapMockChannel.idl index 43ecafda09e..42108557664 100644 --- a/mozilla/mailnews/imap/public/nsIImapMockChannel.idl +++ b/mozilla/mailnews/imap/public/nsIImapMockChannel.idl @@ -61,4 +61,6 @@ interface nsIImapMockChannel : nsIChannel void Close(); [noscript] void setSecurityInfo(in nsISupports securityInfo); + + void setURI(in nsIURI uri); }; diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp index 3e42368a7ce..e8d5ca2a79a 100644 --- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp @@ -3665,7 +3665,7 @@ NS_IMETHODIMP nsImapMailFolder::OnStartRequest(nsIRequest *request, nsISupports return NS_OK; } -NS_IMETHODIMP nsImapMailFolder::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus, const PRUnichar *aMsg) +NS_IMETHODIMP nsImapMailFolder::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus) { return NS_OK; } diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.h b/mozilla/mailnews/imap/src/nsImapMailFolder.h index 77e3e09820a..735cc1dce68 100644 --- a/mozilla/mailnews/imap/src/nsImapMailFolder.h +++ b/mozilla/mailnews/imap/src/nsImapMailFolder.h @@ -200,7 +200,7 @@ public: //nsICopyMessageListener NS_DECL_NSICOPYMESSAGELISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER // nsIUrlListener methods diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.cpp b/mozilla/mailnews/imap/src/nsImapProtocol.cpp index 0de827531e5..247a9317e06 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.cpp +++ b/mozilla/mailnews/imap/src/nsImapProtocol.cpp @@ -159,7 +159,7 @@ NS_INTERFACE_MAP_BEGIN(nsImapProtocol) NS_INTERFACE_MAP_ENTRY(nsIRunnable) NS_INTERFACE_MAP_ENTRY(nsIImapProtocol) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_END_THREADSAFE static PRInt32 gTooFastTime = 2; @@ -620,7 +620,7 @@ nsresult nsImapProtocol::SetupWithUrl(nsIURI * aURL, nsISupports* aConsumer) m_channel->SetNotificationCallbacks(callbacks, PR_FALSE); if (NS_SUCCEEDED(rv)) - rv = m_channel->OpenOutputStream(0, -1, 0, getter_AddRefs(m_outputStream)); + rv = m_channel->OpenOutputStream(0, PRUint32(-1), 0, getter_AddRefs(m_outputStream)); } } } // if m_runningUrl @@ -1019,7 +1019,8 @@ PRBool nsImapProtocol::ProcessCurrentURL() if (!TestFlag(IMAP_CONNECTION_IS_OPEN) && m_channel) { nsCOMPtr request; - m_channel->AsyncRead(this /* stream observer */, nsnull, 0,-1,0, getter_AddRefs(request)); + m_channel->AsyncRead(this /* stream listener */, nsnull, 0, PRUint32(-1), 0, + getter_AddRefs(request)); SetFlag(IMAP_CONNECTION_IS_OPEN); } #ifdef DEBUG_bienvenu @@ -1144,7 +1145,7 @@ PRBool nsImapProtocol::ProcessCurrentURL() nsCOMPtr request = do_QueryInterface(m_mockChannel); if (!request) return NS_ERROR_FAILURE; - rv = m_channelListener->OnStopRequest(request, m_channelContext, NS_OK, nsnull); + rv = m_channelListener->OnStopRequest(request, m_channelContext, NS_OK); } m_lastActiveTime = PR_Now(); // ** jt -- is this the best place for time stamp SetFlag(IMAP_CLEAN_UP_URL_STATE); @@ -1250,7 +1251,7 @@ NS_IMETHODIMP nsImapProtocol::OnStartRequest(nsIRequest *request, nsISupports *c } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsImapProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsImapProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus) { PRBool killThread = PR_FALSE; @@ -6709,7 +6710,7 @@ class nsImapCacheStreamListener : public nsIStreamListener { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsImapCacheStreamListener (); @@ -6726,7 +6727,7 @@ NS_IMPL_RELEASE(nsImapCacheStreamListener); NS_INTERFACE_MAP_BEGIN(nsImapCacheStreamListener) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_END @@ -6761,14 +6762,14 @@ nsImapCacheStreamListener::OnStartRequest(nsIRequest *request, nsISupports * aCt } NS_IMETHODIMP -nsImapCacheStreamListener::OnStopRequest(nsIRequest *request, nsISupports * aCtxt, nsresult aStatus, const PRUnichar* aMsg) +nsImapCacheStreamListener::OnStopRequest(nsIRequest *request, nsISupports * aCtxt, nsresult aStatus) { nsCOMPtr ourRequest = do_QueryInterface(mChannelToUse); - nsresult rv = mListener->OnStopRequest(ourRequest, aCtxt, aStatus, aMsg); + nsresult rv = mListener->OnStopRequest(ourRequest, aCtxt, aStatus); nsCOMPtr loadGroup; mChannelToUse->GetLoadGroup(getter_AddRefs(loadGroup)); if (loadGroup) - loadGroup->RemoveRequest(ourRequest, nsnull, aStatus, nsnull); + loadGroup->RemoveRequest(ourRequest, nsnull, aStatus); mListener = nsnull; mChannelToUse = nsnull; @@ -6798,7 +6799,7 @@ nsImapMockChannel::nsImapMockChannel() NS_INIT_REFCNT(); m_channelContext = nsnull; m_cancelStatus = NS_OK; - mLoadAttributes = 0; + mLoadFlags = 0; } nsImapMockChannel::~nsImapMockChannel() @@ -6944,24 +6945,6 @@ NS_IMETHODIMP nsImapMockChannel::AsyncOpen(nsIStreamListener *listener, nsISuppo } } - // regardless as to whether we are inserting into the cache or not, proceed with - // setting up the load group! - if (m_loadGroup) - { - nsCOMPtr factory; - // - // Create a load group "proxy" listener... - // - rv = m_loadGroup->GetGroupListenerFactory(getter_AddRefs(factory)); - if (factory) - { - nsCOMPtr newListener; - rv = factory->CreateLoadGroupListener(m_channelListener, getter_AddRefs(newListener)); - if (NS_SUCCEEDED(rv)) - m_channelListener = newListener; - } - } // if aLoadGroup - // now, determine if we should be loading from the cache or if we have // to really load the msg with a protocol connection... if (cacheEntry && contentLength > 0 && !partialFlag) @@ -7098,16 +7081,16 @@ nsresult nsImapMockChannel::SetupPartExtractor(nsIImapUrl * aUrl, nsIStreamListe return NS_OK; } -NS_IMETHODIMP nsImapMockChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +NS_IMETHODIMP nsImapMockChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { - //*aLoadAttributes = nsIChannel::LOAD_NORMAL; - *aLoadAttributes = mLoadAttributes; + //*aLoadFlags = nsIRequest::LOAD_NORMAL; + *aLoadFlags = mLoadFlags; return NS_OK; } -NS_IMETHODIMP nsImapMockChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) +NS_IMETHODIMP nsImapMockChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; // don't fail when trying to set this } diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.h b/mozilla/mailnews/imap/src/nsImapProtocol.h index 6d9b1f76683..14814acc969 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.h +++ b/mozilla/mailnews/imap/src/nsImapProtocol.h @@ -113,7 +113,7 @@ public: // Whenever data arrives from the connection, core netlib notifies the protocol by calling // OnDataAvailable. We then read and process the incoming data from the input stream. // stop binding is a "notification" informing us that the stream associated with aURL is going away. - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER @@ -605,7 +605,7 @@ protected: // because the context is already the uri... nsISupports * m_channelContext; nsresult m_cancelStatus; - nsLoadFlags mLoadAttributes; + nsLoadFlags mLoadFlags; nsCOMPtr mProgressEventSink; nsCOMPtr mCallbacks; nsCOMPtr mOwner; diff --git a/mozilla/mailnews/imap/src/nsImapUrl.cpp b/mozilla/mailnews/imap/src/nsImapUrl.cpp index 6069313ceab..ebede0a2573 100644 --- a/mozilla/mailnews/imap/src/nsImapUrl.cpp +++ b/mozilla/mailnews/imap/src/nsImapUrl.cpp @@ -1155,7 +1155,7 @@ NS_IMETHODIMP nsImapUrl::RemoveChannel(nsresult status) if (loadGroup) { nsCOMPtr request = do_QueryInterface(m_mockChannel); - loadGroup->RemoveRequest(request, nsnull, status, nsnull); + loadGroup->RemoveRequest(request, nsnull, status); } // break deadly embrace between mock channel and url SetMockChannel(nsnull); diff --git a/mozilla/mailnews/imap/src/nsImapUtils.cpp b/mozilla/mailnews/imap/src/nsImapUtils.cpp index 7e00d1d6f2c..d5148584f14 100644 --- a/mozilla/mailnews/imap/src/nsImapUtils.cpp +++ b/mozilla/mailnews/imap/src/nsImapUtils.cpp @@ -37,6 +37,7 @@ #include "nsIImapFlagAndUidState.h" #include "nsICharsetConverterManager.h" #include "nsIIOService.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp index c017c0f2be8..7f2bee9383d 100644 --- a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp +++ b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp @@ -35,6 +35,7 @@ #include "nsCRT.h" #include "nsString.h" #include "nsIURL.h" +#include "nsNetCID.h" #include "nsIFileSpec.h" diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index a70315bb4ce..1371804d6e0 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp @@ -82,6 +82,7 @@ #include "nsIPop3URL.h" #include "nsIMsgMailSession.h" #include "nsIMsgFolderCompactor.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); diff --git a/mozilla/mailnews/local/src/nsMailboxProtocol.cpp b/mozilla/mailnews/local/src/nsMailboxProtocol.cpp index aab6c286abe..ecdb548ba26 100644 --- a/mozilla/mailnews/local/src/nsMailboxProtocol.cpp +++ b/mozilla/mailnews/local/src/nsMailboxProtocol.cpp @@ -163,12 +163,12 @@ NS_IMETHODIMP nsMailboxProtocol::OnStartRequest(nsIRequest *request, nsISupports } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsMailboxProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus, const PRUnichar *aMsg) +NS_IMETHODIMP nsMailboxProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus) { if (m_nextState == MAILBOX_READ_FOLDER && m_mailboxParser) { // we need to inform our mailbox parser that there is no more incoming data... - m_mailboxParser->OnStopRequest(request, ctxt, aStatus, nsnull); + m_mailboxParser->OnStopRequest(request, ctxt, aStatus); } else if (m_nextState == MAILBOX_READ_MESSAGE) { @@ -200,7 +200,7 @@ NS_IMETHODIMP nsMailboxProtocol::OnStopRequest(nsIRequest *request, nsISupports */ if (aStatus == NS_BINDING_ABORTED) aStatus = NS_OK; - nsMsgProtocol::OnStopRequest(request, ctxt, aStatus, aMsg); + nsMsgProtocol::OnStopRequest(request, ctxt, aStatus); return CloseSocket(); } diff --git a/mozilla/mailnews/local/src/nsMailboxProtocol.h b/mozilla/mailnews/local/src/nsMailboxProtocol.h index 18e1bc35cf2..3071575d632 100644 --- a/mozilla/mailnews/local/src/nsMailboxProtocol.h +++ b/mozilla/mailnews/local/src/nsMailboxProtocol.h @@ -77,7 +77,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// NS_IMETHOD OnStartRequest(nsIRequest *request, nsISupports *ctxt); - NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus, const PRUnichar *aMsg); + NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus); NS_IMETHOD GetContentLength(PRInt32 * aContentLength); private: diff --git a/mozilla/mailnews/local/src/nsMovemailService.cpp b/mozilla/mailnews/local/src/nsMovemailService.cpp index 9ea8859d59e..d156af8dd41 100644 --- a/mozilla/mailnews/local/src/nsMovemailService.cpp +++ b/mozilla/mailnews/local/src/nsMovemailService.cpp @@ -479,7 +479,7 @@ nsMovemailService::GetNewMail(nsIMsgWindow *aMsgWindow, // END m_outFileStream->flush(); // try this. - m_newMailParser->OnStopRequest(nsnull, nsnull, NS_OK, nsnull); + m_newMailParser->OnStopRequest(nsnull, nsnull, NS_OK); if (m_outFileStream->is_open()) m_outFileStream->close(); delete m_outFileStream; diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp index ac219f32ea1..d0beb5d33ac 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.cpp +++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp @@ -45,6 +45,7 @@ #include "nsIMsgFilterList.h" #include "nsIMsgFilter.h" #include "nsIIOService.h" +#include "nsNetCID.h" #include "nsRDFCID.h" #include "nsIPref.h" #include "nsIRDFService.h" @@ -144,7 +145,7 @@ NS_IMETHODIMP nsMsgMailboxParser::OnStartRequest(nsIRequest *request, nsISupport } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsMsgMailboxParser::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus, const PRUnichar *aMsg) +NS_IMETHODIMP nsMsgMailboxParser::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus) { DoneParsingFolder(aStatus); // what can we do? we can close the stream? diff --git a/mozilla/mailnews/local/src/nsParseMailbox.h b/mozilla/mailnews/local/src/nsParseMailbox.h index 0ee73c8aca4..4c624051f54 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.h +++ b/mozilla/mailnews/local/src/nsParseMailbox.h @@ -154,7 +154,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// // we suppport the nsIStreamListener interface //////////////////////////////////////////////////////////////////////////////////////// - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER void SetDB (nsIMsgDatabase *mailDB) {m_mailDB = dont_QueryInterface(mailDB); } diff --git a/mozilla/mailnews/local/src/nsPop3Protocol.cpp b/mozilla/mailnews/local/src/nsPop3Protocol.cpp index 4da2ec293e1..e4235d6446d 100644 --- a/mozilla/mailnews/local/src/nsPop3Protocol.cpp +++ b/mozilla/mailnews/local/src/nsPop3Protocol.cpp @@ -590,9 +590,9 @@ nsresult nsPop3Protocol::GetPassword(char ** aPassword, PRBool *okayValue) } // stop binding is a "notification" informing us that the stream associated with aURL is going away. -NS_IMETHODIMP nsPop3Protocol::OnStopRequest(nsIRequest *request, nsISupports * aContext, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsPop3Protocol::OnStopRequest(nsIRequest *request, nsISupports * aContext, nsresult aStatus) { - nsresult rv = nsMsgProtocol::OnStopRequest(request, aContext, aStatus, aMsg); + nsresult rv = nsMsgProtocol::OnStopRequest(request, aContext, aStatus); // turn off the server busy flag on stop request - we know we're done, right? if (m_pop3Server) { diff --git a/mozilla/mailnews/local/src/nsPop3Protocol.h b/mozilla/mailnews/local/src/nsPop3Protocol.h index daefaea3a45..32edfaa8a02 100644 --- a/mozilla/mailnews/local/src/nsPop3Protocol.h +++ b/mozilla/mailnews/local/src/nsPop3Protocol.h @@ -256,7 +256,7 @@ public: nsresult GetPassword(char ** aPassword, PRBool *okayValue); - NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports * aContext, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports * aContext, nsresult aStatus); NS_IMETHOD Cancel(nsresult status); // for nsMsgLineBuffer virtual PRInt32 HandleLine(char *line, PRUint32 line_length); diff --git a/mozilla/mailnews/local/src/nsPop3Sink.cpp b/mozilla/mailnews/local/src/nsPop3Sink.cpp index 9e23dce73d0..401fbbd6dee 100644 --- a/mozilla/mailnews/local/src/nsPop3Sink.cpp +++ b/mozilla/mailnews/local/src/nsPop3Sink.cpp @@ -205,7 +205,7 @@ nsPop3Sink::EndMailDelivery() { if (m_outFileStream) m_outFileStream->flush(); // try this. - m_newMailParser->OnStopRequest(nsnull, nsnull, NS_OK, nsnull); + m_newMailParser->OnStopRequest(nsnull, nsnull, NS_OK); delete m_newMailParser; m_newMailParser = NULL; } diff --git a/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp b/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp index 8063486cce4..f440de18476 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp +++ b/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp @@ -22,6 +22,7 @@ #define NS_IMPL_IDS #include "nsCOMPtr.h" #include "nsIIOService.h" +#include "nsNetCID.h" #include "nsIServiceManager.h" #include "nsICharsetConverterManager.h" diff --git a/mozilla/mailnews/mime/src/mimemoz2.cpp b/mozilla/mailnews/mime/src/mimemoz2.cpp index d2f6649a559..d86b8299246 100644 --- a/mozilla/mailnews/mime/src/mimemoz2.cpp +++ b/mozilla/mailnews/mime/src/mimemoz2.cpp @@ -61,6 +61,7 @@ #include "nsMimeTypes.h" #include "nsIIOService.h" #include "nsIURI.h" +#include "nsNetCID.h" #include "nsIMsgWindow.h" #include "mimeebod.h" diff --git a/mozilla/mailnews/mime/src/nsStreamConverter.cpp b/mozilla/mailnews/mime/src/nsStreamConverter.cpp index dcb7c34199e..4d6569cd4b7 100644 --- a/mozilla/mailnews/mime/src/nsStreamConverter.cpp +++ b/mozilla/mailnews/mime/src/nsStreamConverter.cpp @@ -527,7 +527,7 @@ nsStreamConverter::~nsStreamConverter() } -NS_IMPL_ISUPPORTS4(nsStreamConverter, nsIStreamListener, nsIStreamObserver, nsIStreamConverter, nsIMimeStreamConverter) +NS_IMPL_ISUPPORTS4(nsStreamConverter, nsIStreamListener, nsIRequestObserver, nsIStreamConverter, nsIMimeStreamConverter) /////////////////////////////////////////////////////////////// // nsStreamConverter definitions.... @@ -885,7 +885,7 @@ char *output = "\ } ///////////////////////////////////////////////////////////////////////////// -// Methods for nsIStreamObserver +// Methods for nsIRequestObserver ///////////////////////////////////////////////////////////////////////////// // // Notify the observer that the URL has started to load. This method is @@ -928,7 +928,7 @@ nsStreamConverter::OnStartRequest(nsIRequest *request, nsISupports *ctxt) // called once when the networking library has finished processing the // nsresult -nsStreamConverter::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) +nsStreamConverter::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status) { #ifdef DEBUG_rhp printf("nsStreamConverter::OnStopRequest()\n"); @@ -1007,7 +1007,7 @@ nsStreamConverter::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresul // forward on top request to any listeners if (mOutListener) - mOutListener->OnStopRequest(request, ctxt, status, errorMsg); + mOutListener->OnStopRequest(request, ctxt, status); mAlreadyKnowOutputType = PR_FALSE; diff --git a/mozilla/mailnews/mime/src/nsStreamConverter.h b/mozilla/mailnews/mime/src/nsStreamConverter.h index d35423492ab..fa65acc1ee8 100644 --- a/mozilla/mailnews/mime/src/nsStreamConverter.h +++ b/mozilla/mailnews/mime/src/nsStreamConverter.h @@ -50,8 +50,8 @@ public: // nsIStreamListener methods NS_DECL_NSISTREAMLISTENER - // nsIStreamObserver methods - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods + NS_DECL_NSIREQUESTOBSERVER //////////////////////////////////////////////////////////////////////////// // nsStreamConverter specific methods: diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp index 9a86ceeaa37..3ce6768816e 100644 --- a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp +++ b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp @@ -667,7 +667,7 @@ class nsNntpCacheStreamListener : public nsIStreamListener { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsNntpCacheStreamListener (); @@ -685,7 +685,7 @@ NS_IMPL_RELEASE(nsNntpCacheStreamListener); NS_INTERFACE_MAP_BEGIN(nsNntpCacheStreamListener) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_END @@ -723,14 +723,14 @@ nsNntpCacheStreamListener::OnStartRequest(nsIRequest *request, nsISupports * aCt } NS_IMETHODIMP -nsNntpCacheStreamListener::OnStopRequest(nsIRequest *request, nsISupports * aCtxt, nsresult aStatus, const PRUnichar* aMsg) +nsNntpCacheStreamListener::OnStopRequest(nsIRequest *request, nsISupports * aCtxt, nsresult aStatus) { nsCOMPtr ourRequest = do_QueryInterface(mChannelToUse); - nsresult rv = mListener->OnStopRequest(ourRequest, aCtxt, aStatus, aMsg); + nsresult rv = mListener->OnStopRequest(ourRequest, aCtxt, aStatus); nsCOMPtr loadGroup; mChannelToUse->GetLoadGroup(getter_AddRefs(loadGroup)); if (loadGroup) - loadGroup->RemoveRequest(ourRequest, nsnull, aStatus, nsnull); + loadGroup->RemoveRequest(ourRequest, nsnull, aStatus); // clear out mem cache entry so we're not holding onto it. if (mRunningUrl) @@ -1119,9 +1119,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::OnStopRequest(nsIRequest *request, nsISupports * aContext, nsresult aStatus, const PRUnichar* aMsg) +NS_IMETHODIMP nsNNTPProtocol::OnStopRequest(nsIRequest *request, nsISupports * aContext, nsresult aStatus) { - nsMsgProtocol::OnStopRequest(request, aContext, aStatus, aMsg); + nsMsgProtocol::OnStopRequest(request, aContext, aStatus); // nsMsgProtocol::OnStopRequest() has called m_channelListener. There is // no need to be called again in CloseSocket(). Let's clear it here. @@ -5267,10 +5267,10 @@ nsresult nsNNTPProtocol::CleanupAfterRunningUrl() // because it can synchronously causes a new url to get run in the // protocol - truly evil, but we're stuck at the moment. if (m_channelListener) - rv = m_channelListener->OnStopRequest(this, m_channelContext, NS_OK, nsnull); + rv = m_channelListener->OnStopRequest(this, m_channelContext, NS_OK); if (m_loadGroup) - m_loadGroup->RemoveRequest(NS_STATIC_CAST(nsIRequest *, this), nsnull, NS_OK, nsnull); + m_loadGroup->RemoveRequest(NS_STATIC_CAST(nsIRequest *, this), nsnull, NS_OK); CleanupNewsgroupList(); // clear out mem cache entry so we're not holding onto it. diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.h b/mozilla/mailnews/news/src/nsNNTPProtocol.h index 0a8ceff3694..a3efb0dbea0 100644 --- a/mozilla/mailnews/news/src/nsNNTPProtocol.h +++ b/mozilla/mailnews/news/src/nsNNTPProtocol.h @@ -160,7 +160,7 @@ public: virtual ~nsNNTPProtocol(); // stop binding is a "notification" informing us that the stream associated with aURL is going away. - NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports * aCtxt, nsresult aStatus, const PRUnichar* aMsg); + NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports * aCtxt, nsresult aStatus); char * m_ProxyServer; /* proxy server hostname */ diff --git a/mozilla/mailnews/news/src/nsNewsFolder.cpp b/mozilla/mailnews/news/src/nsNewsFolder.cpp index cf6cccfb3a1..ea8cadb1af3 100644 --- a/mozilla/mailnews/news/src/nsNewsFolder.cpp +++ b/mozilla/mailnews/news/src/nsNewsFolder.cpp @@ -66,6 +66,7 @@ #include "nsIWalletService.h" #include "nsIURL.h" +#include "nsNetCID.h" #include "nsINntpUrl.h" #include "nsNewsSummarySpec.h" diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp index 1b2abd4eedd..0be2fd6263c 100644 --- a/mozilla/mailnews/news/src/nsNntpService.cpp +++ b/mozilla/mailnews/news/src/nsNntpService.cpp @@ -55,6 +55,7 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsIWebNavigation.h" #include "nsIIOService.h" +#include "nsNetCID.h" #include "nsIPrompt.h" #include "nsIRDFService.h" #include "nsNewsDownloader.h" diff --git a/mozilla/modules/libjar/nsJARChannel.cpp b/mozilla/modules/libjar/nsJARChannel.cpp index 6c79adc00b1..5cbcc160ee0 100644 --- a/mozilla/modules/libjar/nsJARChannel.cpp +++ b/mozilla/modules/libjar/nsJARChannel.cpp @@ -61,7 +61,7 @@ PRLogModuleInfo* gJarProtocolLog = nsnull; #define NS_DEFAULT_JAR_BUFFER_MAX_SIZE (256*1024) nsJARChannel::nsJARChannel() - : mLoadAttributes(LOAD_NORMAL), + : mLoadFlags(LOAD_NORMAL), mContentType(nsnull), mContentLength(-1), mJAREntry(nsnull), @@ -95,7 +95,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS7(nsJARChannel, nsIJARChannel, nsIChannel, nsIRequest, - nsIStreamObserver, + nsIRequestObserver, nsIStreamListener, nsIStreamIO, nsIDownloadObserver) @@ -235,14 +235,6 @@ nsJARChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsJARChannel::SetURI(nsIURI* aURI) -{ - nsresult rv; - mURI = do_QueryInterface(aURI, &rv); - return rv; -} - nsresult nsJARChannel::OpenJARElement() { @@ -284,21 +276,6 @@ nsJARChannel::AsyncOpen(nsIStreamListener* listener, nsISupports* ctxt) mUserListener = listener; if (mLoadGroup) { - if (mUserListener) { - nsCOMPtr factory; - // - // Create a load group "proxy" listener... - // - rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory)); - if (factory) { - nsIStreamListener *newListener; - rv = factory->CreateLoadGroupListener(mUserListener, &newListener); - if (NS_SUCCEEDED(rv)) { - mUserListener = newListener; - NS_RELEASE(newListener); - } - } - } rv = mLoadGroup->AddRequest(this, nsnull); if (NS_FAILED(rv)) return rv; } @@ -331,7 +308,7 @@ nsJARChannel::EnsureJARFileAvailable() rv = NS_NewDownloader(getter_AddRefs(mDownloader), mJARBaseURI, this, nsnull, mSynchronousRead, mLoadGroup, mCallbacks, - mLoadAttributes); + mLoadFlags); // if DownloadComplete() was called early, need to release the reference. if (mSynchronousRead && mSynchronousInputStream) @@ -339,7 +316,7 @@ nsJARChannel::EnsureJARFileAvailable() error: if (NS_FAILED(rv) && mLoadGroup) { - nsresult rv2 = mLoadGroup->RemoveRequest(this, nsnull, NS_OK, nsnull); + nsresult rv2 = mLoadGroup->RemoveRequest(this, nsnull, NS_OK); NS_ASSERTION(NS_SUCCEEDED(rv2), "RemoveChannel failed"); } return rv; @@ -374,23 +351,24 @@ nsJARChannel::AsyncReadJARElement() ("nsJarProtocol: AsyncRead jar entry %s", (const char*)jarURLStr)); #endif - rv = jarTransport->AsyncRead(this, nsnull, 0, -1, 0, getter_AddRefs(mJarExtractionTransport)); + rv = jarTransport->AsyncRead(this, nsnull, 0, PRUint32(-1), 0, + getter_AddRefs(mJarExtractionTransport)); mJarExtractionTransport = 0; jarTransport = 0; return rv; } NS_IMETHODIMP -nsJARChannel::GetLoadAttributes(PRUint32* aLoadFlags) +nsJARChannel::GetLoadFlags(PRUint32* aLoadFlags) { - *aLoadFlags = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsJARChannel::SetLoadAttributes(PRUint32 aLoadFlags) +nsJARChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadFlags; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -578,7 +556,7 @@ nsJARChannel::OnDownloadComplete(nsIDownloader* aDownloader, nsISupports* aClosu } //////////////////////////////////////////////////////////////////////////////// -// nsIStreamObserver methods: +// nsIRequestObserver methods: NS_IMETHODIMP nsJARChannel::OnStartRequest(nsIRequest* jarExtractionTransport, @@ -589,7 +567,7 @@ nsJARChannel::OnStartRequest(nsIRequest* jarExtractionTransport, NS_IMETHODIMP nsJARChannel::OnStopRequest(nsIRequest* jarExtractionTransport, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsresult rv; #ifdef PR_LOGGING @@ -603,11 +581,11 @@ nsJARChannel::OnStopRequest(nsIRequest* jarExtractionTransport, nsISupports* con } #endif - rv = mUserListener->OnStopRequest(this, mUserContext, aStatus, aStatusArg); + rv = mUserListener->OnStopRequest(this, mUserContext, aStatus); NS_ASSERTION(NS_SUCCEEDED(rv), "OnStopRequest failed"); if (mLoadGroup) - mLoadGroup->RemoveRequest(this, context, aStatus, aStatusArg); + mLoadGroup->RemoveRequest(this, context, aStatus); mUserListener = nsnull; mUserContext = nsnull; diff --git a/mozilla/modules/libjar/nsJARChannel.h b/mozilla/modules/libjar/nsJARChannel.h index e8d08e93c06..218c32f068a 100644 --- a/mozilla/modules/libjar/nsJARChannel.h +++ b/mozilla/modules/libjar/nsJARChannel.h @@ -60,7 +60,7 @@ public: NS_DECL_NSIREQUEST NS_DECL_NSICHANNEL NS_DECL_NSIJARCHANNEL - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSISTREAMIO NS_DECL_NSIDOWNLOADOBSERVER @@ -86,7 +86,7 @@ protected: nsCOMPtr mLoadGroup; nsCOMPtr mCallbacks; nsCOMPtr mOriginalURI; - nsLoadFlags mLoadAttributes; + nsLoadFlags mLoadFlags; nsCOMPtr mOwner; nsCOMPtr mUserContext; diff --git a/mozilla/modules/libjar/nsJARProtocolHandler.cpp b/mozilla/modules/libjar/nsJARProtocolHandler.cpp index 1bb22157041..7de4d0488ce 100644 --- a/mozilla/modules/libjar/nsJARProtocolHandler.cpp +++ b/mozilla/modules/libjar/nsJARProtocolHandler.cpp @@ -29,6 +29,7 @@ #include "nsIURL.h" #include "nsJARChannel.h" #include "nsXPIDLString.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kJARUriCID, NS_JARURI_CID); diff --git a/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp b/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp index 070128da7ad..804b9d7382c 100644 --- a/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp +++ b/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp @@ -32,7 +32,7 @@ #include "png.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsRect.h" diff --git a/mozilla/modules/libpr0n/src/DummyChannel.cpp b/mozilla/modules/libpr0n/src/DummyChannel.cpp index 35ac107ae7c..cdcf2f00cba 100644 --- a/mozilla/modules/libpr0n/src/DummyChannel.cpp +++ b/mozilla/modules/libpr0n/src/DummyChannel.cpp @@ -30,9 +30,7 @@ NS_IMPL_ISUPPORTS1(DummyChannel, nsIChannel) DummyChannel::DummyChannel(imgIRequest *aRequest, nsILoadGroup *aLoadGroup) : - mRequest(aRequest), - mLoadGroup(aLoadGroup), - mLoadFlags(nsIChannel::LOAD_NORMAL) + mRequest(aRequest) { NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ @@ -58,10 +56,6 @@ NS_IMETHODIMP DummyChannel::GetURI(nsIURI * *aURI) { return mRequest->GetURI(aURI); } -NS_IMETHODIMP DummyChannel::SetURI(nsIURI * aURI) -{ - return NS_ERROR_FAILURE; -} /* attribute nsISupports owner; */ NS_IMETHODIMP DummyChannel::GetOwner(nsISupports * *aOwner) @@ -73,30 +67,6 @@ NS_IMETHODIMP DummyChannel::SetOwner(nsISupports * aOwner) return NS_ERROR_NOT_IMPLEMENTED; } -/* attribute nsILoadGroup loadGroup; */ -NS_IMETHODIMP DummyChannel::GetLoadGroup(nsILoadGroup * *aLoadGroup) -{ - *aLoadGroup = mLoadGroup; - NS_IF_ADDREF(*aLoadGroup); - return NS_OK; -} -NS_IMETHODIMP DummyChannel::SetLoadGroup(nsILoadGroup * aLoadGroup) -{ - return NS_ERROR_FAILURE; -} - -/* attribute nsLoadFlags loadAttributes; */ -NS_IMETHODIMP DummyChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) -{ - *aLoadAttributes = mLoadFlags; - return NS_OK; -} -NS_IMETHODIMP DummyChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) -{ - mLoadFlags = aLoadAttributes; - return NS_OK; -} - /* attribute nsIInterfaceRequestor notificationCallbacks; */ NS_IMETHODIMP DummyChannel::GetNotificationCallbacks(nsIInterfaceRequestor * *aNotificationCallbacks) { diff --git a/mozilla/modules/libpr0n/src/DummyChannel.h b/mozilla/modules/libpr0n/src/DummyChannel.h index 5a5231a4d7f..67eb05c7d93 100644 --- a/mozilla/modules/libpr0n/src/DummyChannel.h +++ b/mozilla/modules/libpr0n/src/DummyChannel.h @@ -45,9 +45,6 @@ public: private: /* additional members */ nsCOMPtr mRequest; - nsCOMPtr mLoadGroup; - - nsLoadFlags mLoadFlags; }; #endif diff --git a/mozilla/modules/libpr0n/src/imgLoader.cpp b/mozilla/modules/libpr0n/src/imgLoader.cpp index 51cbb41978e..bf358aa3e97 100644 --- a/mozilla/modules/libpr0n/src/imgLoader.cpp +++ b/mozilla/modules/libpr0n/src/imgLoader.cpp @@ -84,19 +84,16 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, nsILoadGroup *aLoadGroup, imgID */ PRUint32 flags = 0; PRBool doomRequest = PR_FALSE; - aLoadGroup->GetDefaultLoadAttributes(&flags); - if (flags & nsIChannel::FORCE_RELOAD) + aLoadGroup->GetLoadFlags(&flags); + if (flags & nsIRequest::FORCE_RELOAD) doomRequest = PR_TRUE; else { nsCOMPtr r; aLoadGroup->GetDefaultLoadRequest(getter_AddRefs(r)); if (r) { - nsCOMPtr c(do_QueryInterface(r)); - if (c) { - c->GetLoadAttributes(&flags); - if (flags & nsIChannel::FORCE_RELOAD) - doomRequest = PR_TRUE; - } + r->GetLoadFlags(&flags); + if (flags & nsIRequest::FORCE_RELOAD) + doomRequest = PR_TRUE; } } @@ -122,8 +119,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, nsILoadGroup *aLoadGroup, imgID if (aLoadGroup) { PRUint32 flags; - aLoadGroup->GetDefaultLoadAttributes(&flags); - newChannel->SetLoadAttributes(flags); + aLoadGroup->GetLoadFlags(&flags); + newChannel->SetLoadFlags(flags); } NS_NEWXPCOM(request, imgRequest); diff --git a/mozilla/modules/libpr0n/src/imgRequest.cpp b/mozilla/modules/libpr0n/src/imgRequest.cpp index cf8a40d988a..944a5ec9474 100644 --- a/mozilla/modules/libpr0n/src/imgRequest.cpp +++ b/mozilla/modules/libpr0n/src/imgRequest.cpp @@ -53,7 +53,7 @@ PRLogModuleInfo *gImgLog = PR_NewLogModule("imgRequest"); NS_IMPL_ISUPPORTS7(imgRequest, imgIRequest, nsIRequest, imgIDecoderObserver, imgIContainerObserver, - nsIStreamListener, nsIStreamObserver, + nsIStreamListener, nsIRequestObserver, nsISupportsWeakReference) imgRequest::imgRequest() : @@ -164,9 +164,9 @@ nsresult imgRequest::AddObserver(imgIDecoderObserver *observer) } if (mState & onStopRequest) { - nsCOMPtr ob(do_QueryInterface(observer)); + nsCOMPtr ob(do_QueryInterface(observer)); PR_ASSERT(observer); - ob->OnStopRequest(nsnull, nsnull, status, nsnull); + ob->OnStopRequest(nsnull, nsnull, status); } return NS_OK; @@ -204,9 +204,9 @@ nsresult imgRequest::RemoveObserver(imgIDecoderObserver *observer, nsresult stat if (!(mState & onStopRequest)) { // make sure that observer gets an onStopRequest message sent to it - nsCOMPtr ob(do_QueryInterface(observer)); + nsCOMPtr ob(do_QueryInterface(observer)); PR_ASSERT(ob); - ob->OnStopRequest(nsnull, nsnull, NS_BINDING_ABORTED, nsnull); + ob->OnStopRequest(nsnull, nsnull, NS_BINDING_ABORTED); } } } @@ -292,6 +292,30 @@ NS_IMETHODIMP imgRequest::Resume() return NS_ERROR_NOT_IMPLEMENTED; } +/* attribute nsILoadGroup loadGroup */ +NS_IMETHODIMP imgRequest::GetLoadGroup(nsILoadGroup **loadGroup) +{ + NS_NOTYETIMPLEMENTED("imgRequest::GetLoadGroup"); + return NS_ERROR_NOT_IMPLEMENTED; +} +NS_IMETHODIMP imgRequest::SetLoadGroup(nsILoadGroup *loadGroup) +{ + NS_NOTYETIMPLEMENTED("imgRequest::SetLoadGroup"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +/* attribute nsLoadFlags loadFlags */ +NS_IMETHODIMP imgRequest::GetLoadFlags(nsLoadFlags *flags) +{ + NS_NOTYETIMPLEMENTED("imgRequest::GetLoadFlags"); + return NS_ERROR_NOT_IMPLEMENTED; +} +NS_IMETHODIMP imgRequest::SetLoadFlags(nsLoadFlags flags) +{ + NS_NOTYETIMPLEMENTED("imgRequest::SetLoadFlags"); + return NS_ERROR_NOT_IMPLEMENTED; +} + /** imgIRequest methods **/ /* attribute imgIContainer image; */ @@ -532,7 +556,7 @@ NS_IMETHODIMP imgRequest::OnStopDecode(imgIRequest *aRequest, nsISupports *aCX, -/** nsIStreamObserver methods **/ +/** nsIRequestObserver methods **/ /* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt) @@ -552,7 +576,7 @@ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt while (++i < count) { imgIDecoderObserver *iob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]); if (iob) { - nsCOMPtr ob(do_QueryInterface(iob)); + nsCOMPtr ob(do_QueryInterface(iob)); if (ob) ob->OnStartRequest(aRequest, ctxt); } } @@ -610,7 +634,7 @@ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt } /* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult status, in wstring statusArg); */ -NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt, nsresult status, const PRUnichar *statusArg) +NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt, nsresult status) { PR_LOG(gImgLog, PR_LOG_DEBUG, ("[this=%p] imgRequest::OnStopRequest\n", this)); @@ -656,8 +680,8 @@ NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt, if (item) { imgIDecoderObserver *iob = NS_STATIC_CAST(imgIDecoderObserver*, item); if (iob) { - nsCOMPtr ob(do_QueryInterface(iob)); - if (ob) ob->OnStopRequest(aRequest, ctxt, status, statusArg); + nsCOMPtr ob(do_QueryInterface(iob)); + if (ob) ob->OnStopRequest(aRequest, ctxt, status); } } } @@ -665,7 +689,7 @@ NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt, // if there was an error loading the image, (mState & onStopDecode) won't be true. // Send an onStopDecode message if (!(mState & onStopDecode)) { - this->OnStopDecode(nsnull, nsnull, status, statusArg); + this->OnStopDecode(nsnull, nsnull, status, nsnull); } return NS_OK; diff --git a/mozilla/modules/libpr0n/src/imgRequest.h b/mozilla/modules/libpr0n/src/imgRequest.h index c886d7ed193..3e97837432e 100644 --- a/mozilla/modules/libpr0n/src/imgRequest.h +++ b/mozilla/modules/libpr0n/src/imgRequest.h @@ -87,7 +87,7 @@ public: NS_DECL_IMGIDECODEROBSERVER NS_DECL_IMGICONTAINEROBSERVER NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER private: nsCOMPtr mChannel; diff --git a/mozilla/modules/libpr0n/src/imgRequestProxy.cpp b/mozilla/modules/libpr0n/src/imgRequestProxy.cpp index 86aee8e0894..d06c5d2dec5 100644 --- a/mozilla/modules/libpr0n/src/imgRequestProxy.cpp +++ b/mozilla/modules/libpr0n/src/imgRequestProxy.cpp @@ -42,7 +42,7 @@ #include "ImageLogging.h" -NS_IMPL_ISUPPORTS5(imgRequestProxy, imgIRequest, nsIRequest, imgIDecoderObserver, imgIContainerObserver, nsIStreamObserver) +NS_IMPL_ISUPPORTS5(imgRequestProxy, imgIRequest, nsIRequest, imgIDecoderObserver, imgIContainerObserver, nsIRequestObserver) imgRequestProxy::imgRequestProxy() : mCanceled(PR_FALSE) @@ -148,6 +148,30 @@ NS_IMETHODIMP imgRequestProxy::Resume() return NS_ERROR_NOT_IMPLEMENTED; } +/* attribute nsILoadGroup loadGroup */ +NS_IMETHODIMP imgRequestProxy::GetLoadGroup(nsILoadGroup **loadGroup) +{ + *loadGroup = nsnull; + return NS_OK; +} +NS_IMETHODIMP imgRequestProxy::SetLoadGroup(nsILoadGroup *loadGroup) +{ + NS_NOTYETIMPLEMENTED("imgRequestProxy::SetLoadGroup"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +/* attribute nsLoadFlags loadFlags */ +NS_IMETHODIMP imgRequestProxy::GetLoadFlags(nsLoadFlags *flags) +{ + *flags = nsIRequest::LOAD_NORMAL; + return NS_OK; +} +NS_IMETHODIMP imgRequestProxy::SetLoadFlags(nsLoadFlags flags) +{ + NS_NOTYETIMPLEMENTED("imgRequestProxy::SetLoadFlags"); + return NS_ERROR_NOT_IMPLEMENTED; +} + /** imgIRequest methods **/ /* attribute imgIContainer image; */ @@ -303,7 +327,7 @@ NS_IMETHODIMP imgRequestProxy::OnStartRequest(nsIRequest *request, nsISupports * } /* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult statusCode, in wstring statusText); */ -NS_IMETHODIMP imgRequestProxy::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult statusCode, const PRUnichar *statusText) +NS_IMETHODIMP imgRequestProxy::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult statusCode) { if (!mDummyChannel) return NS_OK; @@ -311,7 +335,7 @@ NS_IMETHODIMP imgRequestProxy::OnStopRequest(nsIRequest *request, nsISupports *c nsCOMPtr loadGroup; mDummyChannel->GetLoadGroup(getter_AddRefs(loadGroup)); if (loadGroup) { - loadGroup->RemoveRequest(mDummyChannel, mContext, statusCode, statusText); + loadGroup->RemoveRequest(mDummyChannel, mContext, statusCode); } mDummyChannel = nsnull; diff --git a/mozilla/modules/libpr0n/src/imgRequestProxy.h b/mozilla/modules/libpr0n/src/imgRequestProxy.h index 50191128f21..ae6e846227f 100644 --- a/mozilla/modules/libpr0n/src/imgRequestProxy.h +++ b/mozilla/modules/libpr0n/src/imgRequestProxy.h @@ -26,7 +26,7 @@ #include "imgIContainer.h" #include "imgIDecoder.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsIChannel.h" #include "nsILoadGroup.h" #include "nsCOMPtr.h" @@ -41,7 +41,7 @@ class imgRequestProxy : public imgIRequest, public imgIDecoderObserver, - public nsIStreamObserver + public nsIRequestObserver { public: NS_DECL_ISUPPORTS @@ -49,7 +49,7 @@ public: NS_DECL_NSIREQUEST NS_DECL_IMGIDECODEROBSERVER NS_DECL_IMGICONTAINEROBSERVER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER imgRequestProxy(); virtual ~imgRequestProxy(); diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 8d1db163808..db65ea369eb 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -138,7 +138,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); -static NS_DEFINE_IID(kIStreamObserverIID, NS_ISTREAMOBSERVER_IID); +static NS_DEFINE_IID(kIRequestObserverIID, NS_IREQUESTOBSERVER_IID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kHTTPHandlerCID, NS_IHTTPHANDLER_CID); @@ -1001,8 +1001,8 @@ public: // nsIProgressEventSink methods: NS_DECL_NSIPROGRESSEVENTSINK - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener methods: NS_DECL_NSISTREAMLISTENER @@ -1070,7 +1070,7 @@ public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER private: @@ -1124,8 +1124,7 @@ nsPluginCacheListener::OnDataAvailable(nsIRequest *request, nsISupports* ctxt, NS_IMETHODIMP nsPluginCacheListener::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, - const PRUnichar* aMsg) + nsresult aStatus) { return NS_OK; } @@ -1184,9 +1183,9 @@ nsresult nsPluginStreamListenerPeer::QueryInterface(const nsIID& aIID, return NS_OK; } - if (aIID.Equals(kIStreamObserverIID)) + if (aIID.Equals(kIRequestObserverIID)) { - *aInstancePtrResult = (void *)((nsIStreamObserver *)this); + *aInstancePtrResult = (void *)((nsIRequestObserver *)this); AddRef(); return NS_OK; } @@ -1454,8 +1453,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(nsIRequest *request, NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, - const PRUnichar* aMsg) + nsresult aStatus) { nsresult rv = NS_OK; nsCOMPtr aURL; diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp index c195e85cc77..36ac8b6ec33 100644 --- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp @@ -71,8 +71,8 @@ public: // nsISupports NS_DECL_ISUPPORTS - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener methods: NS_DECL_NSISTREAMLISTENER @@ -762,12 +762,12 @@ PluginListener::OnStartRequest(nsIRequest *request, nsISupports *ctxt) NS_IMETHODIMP PluginListener::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg) + nsresult status) { if (nsnull == mNextStream) { return NS_ERROR_FAILURE; } - return mNextStream->OnStopRequest(request, ctxt, status, errorMsg); + return mNextStream->OnStopRequest(request, ctxt, status); } NS_IMETHODIMP diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index 8d1db163808..db65ea369eb 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -138,7 +138,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); -static NS_DEFINE_IID(kIStreamObserverIID, NS_ISTREAMOBSERVER_IID); +static NS_DEFINE_IID(kIRequestObserverIID, NS_IREQUESTOBSERVER_IID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kHTTPHandlerCID, NS_IHTTPHANDLER_CID); @@ -1001,8 +1001,8 @@ public: // nsIProgressEventSink methods: NS_DECL_NSIPROGRESSEVENTSINK - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener methods: NS_DECL_NSISTREAMLISTENER @@ -1070,7 +1070,7 @@ public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER private: @@ -1124,8 +1124,7 @@ nsPluginCacheListener::OnDataAvailable(nsIRequest *request, nsISupports* ctxt, NS_IMETHODIMP nsPluginCacheListener::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, - const PRUnichar* aMsg) + nsresult aStatus) { return NS_OK; } @@ -1184,9 +1183,9 @@ nsresult nsPluginStreamListenerPeer::QueryInterface(const nsIID& aIID, return NS_OK; } - if (aIID.Equals(kIStreamObserverIID)) + if (aIID.Equals(kIRequestObserverIID)) { - *aInstancePtrResult = (void *)((nsIStreamObserver *)this); + *aInstancePtrResult = (void *)((nsIRequestObserver *)this); AddRef(); return NS_OK; } @@ -1454,8 +1453,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(nsIRequest *request, NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, - const PRUnichar* aMsg) + nsresult aStatus) { nsresult rv = NS_OK; nsCOMPtr aURL; diff --git a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp index c195e85cc77..36ac8b6ec33 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp @@ -71,8 +71,8 @@ public: // nsISupports NS_DECL_ISUPPORTS - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener methods: NS_DECL_NSISTREAMLISTENER @@ -762,12 +762,12 @@ PluginListener::OnStartRequest(nsIRequest *request, nsISupports *ctxt) NS_IMETHODIMP PluginListener::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg) + nsresult status) { if (nsnull == mNextStream) { return NS_ERROR_FAILURE; } - return mNextStream->OnStopRequest(request, ctxt, status, errorMsg); + return mNextStream->OnStopRequest(request, ctxt, status); } NS_IMETHODIMP diff --git a/mozilla/netwerk/base/public/Makefile.in b/mozilla/netwerk/base/public/Makefile.in index 6b4a1ccbd89..28d5fcc8118 100644 --- a/mozilla/netwerk/base/public/Makefile.in +++ b/mozilla/netwerk/base/public/Makefile.in @@ -53,7 +53,8 @@ XPIDLSRCS = \ nsISocketTransportService.idl \ nsIStreamIO.idl \ nsIStreamIOChannel.idl \ - nsIStreamObserver.idl \ + nsIRequestObserver.idl \ + nsIRequestObserverProxy.idl \ nsIStreamListener.idl \ nsIStreamProvider.idl \ nsIStreamLoader.idl \ diff --git a/mozilla/netwerk/base/public/makefile.win b/mozilla/netwerk/base/public/makefile.win index e52c0eaffda..2bca8bb8e28 100644 --- a/mozilla/netwerk/base/public/makefile.win +++ b/mozilla/netwerk/base/public/makefile.win @@ -54,7 +54,8 @@ XPIDLSRCS = \ .\nsISocketTransportService.idl \ .\nsIStreamIO.idl \ .\nsIStreamIOChannel.idl \ - .\nsIStreamObserver.idl \ + .\nsIRequestObserver.idl \ + .\nsIRequestObserverProxy.idl \ .\nsIStreamListener.idl \ .\nsIStreamProvider.idl \ .\nsIStreamLoader.idl \ diff --git a/mozilla/netwerk/base/public/nsIChannel.idl b/mozilla/netwerk/base/public/nsIChannel.idl index e8e78e01034..c6f387304d5 100644 --- a/mozilla/netwerk/base/public/nsIChannel.idl +++ b/mozilla/netwerk/base/public/nsIChannel.idl @@ -23,43 +23,25 @@ #include "nsIRequest.idl" interface nsIURI; -interface nsIInputStream; -interface nsIOutputStream; -interface nsIStreamObserver; -interface nsIStreamListener; -interface nsIStreamProvider; -interface nsILoadGroup; interface nsIInterfaceRequestor; -interface nsIStreamIO; - -typedef unsigned long nsLoadFlags; +interface nsIInputStream; +interface nsIStreamListener; /** - * The nsIChannel interface allows the user to construct get requests for + * The nsIChannel interface allows the user to construct GET requests for * specific protocols, and manage them in a uniform way. Once a channel * is created (via nsIIOService::NewChannel), parameters for that request - * may be set by using the channel attributes, or by QueryInterfacing to a - * subclass of nsIChannel for protocol-specific parameters. Then the actual - * request can be issued in one of several ways: - * - * - AsyncOpen is used for asynchronous reading, calling back the - * user's stream listener. - * - Open is used for synchronous read on the underlying channel. + * may be set by using the channel attributes, or by QI'ing to a subclass + * of nsIChannel for protocol-specific parameters. Then the actual request + * can be issued via Open or AsyncOpen. * * After a request has been completed, the channel is still valid for - * accessing protocol-specific results. For example, QueryInterfacing to - * nsIHTTPChannel allows response headers to be retrieved that result from - * http transactions. - * + * accessing protocol-specific results. For example, QI'ing to nsIHTTPChannel + * allows response headers to be retrieved for the http transaction. */ - [scriptable, uuid(1788e79e-f947-11d3-8cda-0060b0fc14a3)] interface nsIChannel : nsIRequest { - //////////////////////////////////////////////////////////////////////////// - // nsIChannel accessors - //////////////////////////////////////////////////////////////////////////// - /** * Returns the original URL used to construct the channel. * This is used in the case of a redirect or URI "resolution" (e.g. @@ -77,7 +59,7 @@ interface nsIChannel : nsIRequest * or URI resolution occurs, this accessor returns the current location * to which the channel is referring. */ - attribute nsIURI URI; + readonly attribute nsIURI URI; /** * Accesses the owner corresponding to the entity that is @@ -90,24 +72,11 @@ interface nsIChannel : nsIRequest */ attribute nsISupports owner; - /** - * Accesses the load group in which the channel is a currently a member. - */ - attribute nsILoadGroup loadGroup; - - /** - * Accesses the load attributes for the channel. E.g. setting the load - * attributes with the LOAD_QUIET bit set causes the loading process to - * not deliver status notifications to the program performing the load, - * and to not contribute to keeping any nsILoadGroup it may be contained - * in from firing its OnLoadComplete notification. - */ - attribute nsLoadFlags loadAttributes; - /** * Accesses the capabilities callbacks of the channel. This is set by clients * who wish to provide a means to receive progress, status and protocol-specific - * notifications. + * notifications. Interfaces commonly requested include: nsIProgressEventSink + * and nsIPrompt. */ attribute nsIInterfaceRequestor notificationCallbacks; @@ -131,107 +100,22 @@ interface nsIChannel : nsIRequest attribute long contentLength; /** - * Open is used for synchronous read on the channel. - **/ + * Synchronously open this channel. Returns a blocking input stream to this + * channel's data. + */ nsIInputStream open(); - /** AsyncOpen is used for asynchronous reading, calling back the - * user's stream listener. - **/ + /** + * Asynchronously open this channel. Data is fed to the specified stream + * listener as it becomes available. + */ void asyncOpen(in nsIStreamListener listener, in nsISupports ctxt); - //////////////////////////////////////////////////////////////////////////// - // Below are Load attribute flags which may be or'd together. - //////////////////////////////////////////////////////////////////////////// - /** - * Note that more will follow for each protocol's implementation of a channel, - * although channel writers have to be careful to not let the flag bits - * overlap. Otherwise, users won't be able to create a single flag word - * of load attributes that applies to a number of different channel types. + /************************************************************************** + * These flags are OBSOLETE and will be removed once the old cache is + * removed from the code base. Support for CACHE_AS_FILE is now provided + * via nsICachingChannel. */ - - /** - * No special load attributes -- use defaults: - */ - const unsigned long LOAD_NORMAL = 0; - - /** - * Don't deliver status notifications to the nsIProgressEventSink, or keep - * this load from completing the nsILoadGroup it may belong to: - */ - const unsigned long LOAD_BACKGROUND = 1 << 0; - - /** - * Used exclusively by the uriloader and docshell to indicate whether or - * not this channel corresponds to the toplevel document. - */ - const unsigned long LOAD_DOCUMENT_URI = 1 << 1; - - /** - * If the end consumer for this load has been retargeted after discovering - * it's content, this flag will be set: - */ - const unsigned long LOAD_RETARGETED_DOCUMENT_URI = 1 << 2; - - //////////////////////////////////////////////////////////////////////////// - /** - * The following flags control caching behavior. Not all protocols pay - * attention to all these flags, but they are applicable to more than one - * protocol, so they are defined here. - */ - - /** - * Don't store data in the disk cache. This can be used to preserve - * privacy, e.g. so that no https transactions are recorded, or to avoid - * caching a stream to disk that is already stored in a local file, - * e.g. the mailbox: protocol. - */ - const unsigned long INHIBIT_PERSISTENT_CACHING = 1 << 8; - - /** - * Force an end-to-end download of content data from the origin server (and - * any intervening proxies that sit between it and the client), e.g. this - * flag is used for a shift-reload. - */ - const unsigned long FORCE_RELOAD = 1 << 9; - - /** - * Force revalidation with server (or proxy) to verify that cached content - * is up-to-date, e.g. by comparing last-modified date on server with that - * of the cached version. For example, this flag is used when the reload - * button is pressed. - */ - const unsigned long FORCE_VALIDATION = 1 << 10; - - /** - * If the CACHE_AS_FILE flag is set, any stream content is stored in the - * cache as a single disk file. Content will not be cached in the memory - * cache nor will it be stored in any other type of cache, e.g. a flat-file - * cache database. This is used to implement the jar protocol handler and - * to provide the stream-as-file semantics required by the classic browser - * plugin API. - */ - const unsigned long CACHE_AS_FILE = 1 << 11; - - /** - * When cache data is potentially out of date, it can be revalidated with - * the origin server to see if the content needs to be reloaded. The - * following four flags control how often this validation occurs. - * These flags are commonly used for "normal" loading. Note that - * the VALIDATE_HEURISTICALLY and VALIDATE_ONCE_PER_SESSION flags can be - * combined to validate heuristically but no more than once per session. - */ - const unsigned long VALIDATE_NEVER = 1 << 12; - const unsigned long VALIDATE_ALWAYS = 1 << 13; - const unsigned long VALIDATE_ONCE_PER_SESSION = 1 << 14; - const unsigned long VALIDATE_HEURISTICALLY = 1 << 15; - - /** - * This flag is used to tell the webshell not to cancel the load in cases - * when the channel is receiving multipart/replace document - */ - const unsigned long LOAD_REPLACE = 1 << 16; - - + const unsigned long CACHE_AS_FILE = 1 << 14; + const unsigned long VALIDATE_HEURISTICALLY = 1 << 15; }; - diff --git a/mozilla/netwerk/base/public/nsIIOService.idl b/mozilla/netwerk/base/public/nsIIOService.idl index 2a8b6589baf..c1709888029 100644 --- a/mozilla/netwerk/base/public/nsIIOService.idl +++ b/mozilla/netwerk/base/public/nsIIOService.idl @@ -21,23 +21,10 @@ */ #include "nsISupports.idl" -#include "nsIChannel.idl" interface nsIProtocolHandler; +interface nsIChannel; interface nsIURI; -interface nsIInterfaceRequestor; -interface nsIStreamObserver; -interface nsIStreamListener; -interface nsIEventQueue; -interface nsIBufferInputStream; -interface nsIInputStream; -interface nsIBufferOutputStream; -interface nsIFileChannel; -interface nsILoadGroup; -interface nsILoadGroupObserver; -interface nsIFile; -interface nsIInputStream; -interface nsIOutputStream; [scriptable, uuid(ab7c3a84-d488-11d3-8cda-0060b0fc14a3)] interface nsIIOService : nsISupports @@ -182,15 +169,3 @@ interface nsIIOService : nsISupports string resolveRelativePath(in string relativePath, in string basePath); }; - -%{C++ - -#define NS_IOSERVICE_CID \ -{ /* 9ac9e770-18bc-11d3-9337-00104ba0fd40 */ \ - 0x9ac9e770, \ - 0x18bc, \ - 0x11d3, \ - {0x93, 0x37, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \ -} - -%} diff --git a/mozilla/netwerk/base/public/nsILoadGroup.idl b/mozilla/netwerk/base/public/nsILoadGroup.idl index 3e6249ca9b7..0386749baac 100644 --- a/mozilla/netwerk/base/public/nsILoadGroup.idl +++ b/mozilla/netwerk/base/public/nsILoadGroup.idl @@ -22,19 +22,9 @@ #include "nsIRequest.idl" -interface nsIChannel; -interface nsIRequest; interface nsISimpleEnumerator; -interface nsIStreamObserver; -interface nsIStreamListener; -interface nsIInputStream; - -[scriptable, uuid(60fdf550-5392-11d3-9a97-0080c7cb1080)] -interface nsILoadGroupListenerFactory : nsISupports -{ - nsIStreamListener createLoadGroupListener(in nsIStreamListener alistener); -}; - +interface nsIRequestObserver; +interface nsIInterfaceRequestor; /** * A load group maintains a collection of active URL requests. @@ -44,40 +34,34 @@ interface nsILoadGroupListenerFactory : nsISupports [scriptable, uuid(19845248-29ab-11d3-8cce-0060b0fc14a3)] interface nsILoadGroup : nsIRequest { - void init(in nsIStreamObserver observer); - /** - * Accesses the default load attributes for the group, returned as - * a flag word. Setting the default load attributes will cause them - * to be applied to each new channel inserted into the group. + * The group observer is notified when requests are added to and removed + * from this load group. The groupObserver is weak referenced. */ - attribute unsigned long defaultLoadAttributes; + attribute nsIRequestObserver groupObserver; /** - * Accesses the default load channel for the group. Each time a number - * of request are added to a group, the DefaultLoadChannel may be set - * to indicate that all of the requests are related to a particular URL. + * Accesses the default load request for the group. Each time a number + * of requests are added to a group, the defaultLoadRequest may be set + * to indicate that all of the requests are related to a base request. */ attribute nsIRequest defaultLoadRequest; /** - * Adds a new request to the group. This will cause the default load - * attributes to be applied to that request. If the request added is - * the first request in the group, the group's observer's OnStartRequest - * method is called. + * Adds a new request to the group. This will cause the default load + * attributes to be applied to the request. If this is a foreground + * request then the groupObserver's onStartRequest will be called. */ void addRequest(in nsIRequest request, in nsISupports ctxt); /** - * Removes a request from the group. If the request removed is - * the last request in the group, the group's observer's OnStopRequest - * method is called. + * Removes a request from the group. If this is a foreground request + * then the groupObserver's onStopRequest will be called. */ void removeRequest(in nsIRequest request, in nsISupports ctxt, - in nsresult status, - in wstring statusArg); + in nsresult status); /** * Returns the requests contained directly in this group. @@ -85,22 +69,14 @@ interface nsILoadGroup : nsIRequest */ readonly attribute nsISimpleEnumerator requests; - attribute nsIStreamObserver groupObserver; - - attribute nsILoadGroupListenerFactory groupListenerFactory; - - + /** + * Returns the count of "active" requests (ie. requests without the + * LOAD_BACKGROUND bit set). + */ readonly attribute unsigned long activeCount; + + /** + * Notification callbacks for the load group. + */ + attribute nsIInterfaceRequestor notificationCallbacks; }; - -%{C++ - -#define NS_LOADGROUP_CID \ -{ /* e1c61582-2a84-11d3-8cce-0060b0fc14a3 */ \ - 0xe1c61582, \ - 0x2a84, \ - 0x11d3, \ - {0x8c, 0xce, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \ -} - -%} diff --git a/mozilla/netwerk/base/public/nsIRequest.idl b/mozilla/netwerk/base/public/nsIRequest.idl index 4b29b2a1bb0..a74c67d804e 100644 --- a/mozilla/netwerk/base/public/nsIRequest.idl +++ b/mozilla/netwerk/base/public/nsIRequest.idl @@ -22,21 +22,26 @@ #include "nsISupports.idl" +interface nsILoadGroup; + +typedef unsigned long nsLoadFlags; + /** + * nsIRequest + * * @status UNDER_REVIEW */ - [scriptable, uuid(F2CAABA0-2F25-11d3-A164-0050041CAF44)] interface nsIRequest : nsISupports { /** - * Returns the name of the request. Often this is the URL of the request. + * Returns the name of the request. Often this is the URL of the request. */ readonly attribute wstring name; /** - * Returns true if the request is pending (active). Returns false - * after completion or successful calling Cancel. Suspended requests + * Returns true if the request is pending (active). Returns false + * after completion or successful calling Cancel. Suspended requests * are still considered pending. */ boolean isPending(); @@ -47,16 +52,16 @@ interface nsIRequest : nsISupports readonly attribute nsresult status; /** - * Cancels the current request. This will close any open input or - * output streams and terminate any async requests. Users should + * Cancels the current request. This will close any open input or + * output streams and terminate any async requests. Users should * normally pass NS_BINDING_ABORTED, although other errors may also - * be passed. The error passed in will become the value of the + * be passed. The error passed in will become the value of the * status attribute. */ void cancel(in nsresult status); /** - * Suspends the current requests. This may have the effect of closing + * Suspends the current requests. This may have the effect of closing * any underlying transport (in order to free up resources), although * any open streams remain logically opened and will continue delivering * data when the transport is resumed. @@ -64,9 +69,94 @@ interface nsIRequest : nsISupports void suspend(); /** - * Resumes the current request. This may have the effect of re-opening + * Resumes the current request. This may have the effect of re-opening * any underlying transport and will resume the delivery of data to * any open streams. */ void resume(); + + /** + * Accesses the load group in which this request is currently a member. + */ + attribute nsILoadGroup loadGroup; + + /** + * Accesses the load flags for this request. + */ + attribute nsLoadFlags loadFlags; + + /************************************************************************** + * Below are the various load flags which may be or'd together. + */ + + /** + * No special load flags: + */ + const unsigned long LOAD_NORMAL = 0; + + /** + * Don't deliver status notifications to the nsIProgressEventSink, or keep + * this load from completing the nsILoadGroup it may belong to: + */ + const unsigned long LOAD_BACKGROUND = 1 << 0; + + /************************************************************************** + * For requests that are channels, the following flags may apply. + */ + + /** + * Used exclusively by the uriloader and docshell to indicate whether or + * not this request corresponds to the toplevel document. + */ + const unsigned long LOAD_DOCUMENT_URI = 1 << 1; + + /** + * If the end consumer for this load has been retargeted after discovering + * it's content, this flag will be set: + */ + const unsigned long LOAD_RETARGETED_DOCUMENT_URI = 1 << 2; + + /** + * This flag is used to tell the webshell not to cancel the load in cases + * when the request is receiving multipart/replace document + */ + const unsigned long LOAD_REPLACE = 1 << 3; + + /************************************************************************** + * The following flags control caching behavior. With the exception of + * INHIBIT_PERSISTENT_CACHING, they are all mutually exclusive. + */ + + /* + * Don't store data in the disk cache. This can be used to preserve + * privacy, e.g. so that no https transactions are recorded, or to avoid + * caching a stream to disk that is already stored in a local file, + * e.g. the mailbox: protocol. + */ + const unsigned long INHIBIT_PERSISTENT_CACHING = 1 << 8; + + /** + * Force an end-to-end download of content data from the origin server (and + * any intervening proxies that sit between it and the client), e.g. this + * flag is used for a shift-reload. + */ + const unsigned long FORCE_RELOAD = 1 << 9; + + /** + * Force revalidation with server (or proxy) to verify that cached content + * is up-to-date, e.g. by comparing last-modified date on server with that + * of the cached version. This flag is used when the reload button is + * pressed. + */ + const unsigned long FORCE_VALIDATION = 1 << 10; + + /** + * When cache data is potentially out of date, it can be revalidated with + * the origin server to see if the content needs to be reloaded. The + * following three flags control how often this validation occurs. + * These flags are commonly used for "normal" loading. + */ + const unsigned long VALIDATE_NEVER = 1 << 11; + const unsigned long VALIDATE_ALWAYS = 1 << 12; + const unsigned long VALIDATE_ONCE_PER_SESSION = 1 << 13; }; diff --git a/mozilla/netwerk/base/public/nsIStreamIOChannel.idl b/mozilla/netwerk/base/public/nsIStreamIOChannel.idl index 9fddb0de60f..65ccd34a39c 100644 --- a/mozilla/netwerk/base/public/nsIStreamIOChannel.idl +++ b/mozilla/netwerk/base/public/nsIStreamIOChannel.idl @@ -20,10 +20,11 @@ * Contributor(s): */ +#include "nsIChannel.idl" + interface nsIURI; interface nsIStreamIO; -#include "nsIChannel.idl" /** * nsIStreamIOChannel specializes nsIChannel to allow a simple channel to be * constructed from an nsIStreamIO object and a URL. @@ -33,20 +34,3 @@ interface nsIStreamIOChannel : nsIChannel { void init(in nsIURI uri, in nsIStreamIO io); }; - -%{C++ - -#define NS_STREAMIOCHANNEL_CLASSNAME "Stream I/O Channel" -#define NS_STREAMIOCHANNEL_CONTRACTID "@mozilla.org/network/stream-io-channel;1" - -#define NS_STREAMIOCHANNEL_CID \ -{ /* 6ddb050c-0d04-11d4-986e-00c04fa0cf4a */ \ - 0x6ddb050c, \ - 0x0d04, \ - 0x11d4, \ - {0x98, 0x6e, 0x00, 0xc0, 0x4f, 0xa0, 0xcf, 0x4a} \ -} - -%} - -//////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/base/public/nsIStreamListener.idl b/mozilla/netwerk/base/public/nsIStreamListener.idl index 3ca6b0afcde..c6d518b698a 100644 --- a/mozilla/netwerk/base/public/nsIStreamListener.idl +++ b/mozilla/netwerk/base/public/nsIStreamListener.idl @@ -20,7 +20,7 @@ * Contributor(s): */ -#include "nsIStreamObserver.idl" +#include "nsIRequestObserver.idl" interface nsIRequest; interface nsIInputStream; @@ -32,7 +32,7 @@ interface nsIEventQueue; * data from the channel, when the channel is ready to provide it. */ [scriptable, uuid(1a637020-1482-11d3-9333-00104ba0fd40)] -interface nsIStreamListener : nsIStreamObserver +interface nsIStreamListener : nsIRequestObserver { /** * Called when there is data to be read from the channel. @@ -98,7 +98,7 @@ interface nsISimpleStreamListener : nsIStreamListener * @param observer - optional stream observer (can be NULL) */ void init(in nsIOutputStream sink, - in nsIStreamObserver observer); + in nsIRequestObserver observer); }; /** diff --git a/mozilla/netwerk/base/public/nsIStreamLoader.idl b/mozilla/netwerk/base/public/nsIStreamLoader.idl index 7b5a6aedb43..7df419629fe 100644 --- a/mozilla/netwerk/base/public/nsIStreamLoader.idl +++ b/mozilla/netwerk/base/public/nsIStreamLoader.idl @@ -26,7 +26,6 @@ interface nsIRequest; interface nsIURI; interface nsILoadGroup; -interface nsIStreamObserver; interface nsIStreamLoader; interface nsIInterfaceRequestor; diff --git a/mozilla/netwerk/base/public/nsIStreamProvider.idl b/mozilla/netwerk/base/public/nsIStreamProvider.idl index 9f76787edea..8f0cd7a2382 100644 --- a/mozilla/netwerk/base/public/nsIStreamProvider.idl +++ b/mozilla/netwerk/base/public/nsIStreamProvider.idl @@ -20,7 +20,7 @@ * Contributor(s): */ -#include "nsIStreamObserver.idl" +#include "nsIRequestObserver.idl" interface nsIChannel; interface nsIInputStream; @@ -32,7 +32,7 @@ interface nsIEventQueue; * data to the channel, when the channel is ready to accept it. */ [scriptable, uuid(d10ef7a9-b728-43d4-9c49-74172186d691)] -interface nsIStreamProvider : nsIStreamObserver +interface nsIStreamProvider : nsIRequestObserver { /** * Called when data may be written to the channel. @@ -96,5 +96,5 @@ interface nsISimpleStreamProvider : nsIStreamProvider * @param - optional stream observer (can be NULL) */ void init(in nsIInputStream source, - in nsIStreamObserver observer); + in nsIRequestObserver observer); }; diff --git a/mozilla/netwerk/base/public/nsIURI.idl b/mozilla/netwerk/base/public/nsIURI.idl index 3aa88cf38bf..0989836fbd9 100644 --- a/mozilla/netwerk/base/public/nsIURI.idl +++ b/mozilla/netwerk/base/public/nsIURI.idl @@ -17,9 +17,8 @@ * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. * - * Original Author: Gagan Saksena - * * Contributor(s): + * Gagan Saksena (original author) */ #include "nsISupports.idl" @@ -162,10 +161,6 @@ interface nsIURI : nsISupports }; -%{C++ -// Malformed URI Error -#define NS_ERROR_MALFORMED_URI NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 10) - /** * Protocol writers can obtain a very basic (ok, degenerate) implementation * of nsIURI by calling the component manager with NS_SIMPLEURI_CID. The @@ -182,14 +177,10 @@ interface nsIURI : nsISupports * * *** What you most likely will want is NS_STANDARDURL_CID which is much more * full featured. Look at nsIURL.idl for more details. + * + * NOTE: CIDs are declared in nsNetCID.h */ -#define NS_SIMPLEURI_CID \ -{ /* e0da1d70-2f7b-11d3-8cd0-0060b0fc14a3 */ \ - 0xe0da1d70, \ - 0x2f7b, \ - 0x11d3, \ - {0x8c, 0xd0, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \ -} - +%{C++ +#define NS_ERROR_MALFORMED_URI NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 10) %} diff --git a/mozilla/netwerk/base/public/nsIURL.idl b/mozilla/netwerk/base/public/nsIURL.idl index 239bb66aaab..ebf89dfeb18 100644 --- a/mozilla/netwerk/base/public/nsIURL.idl +++ b/mozilla/netwerk/base/public/nsIURL.idl @@ -17,9 +17,8 @@ * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. * - * Original Author: Gagan Saksena - * * Contributor(s): + * Gagan Saksena (original author) */ #include "nsIURI.idl" @@ -144,18 +143,3 @@ interface nsIStandardURL : nsISupports in string initialSpec, in nsIURI initialBaseURI); }; - -%{C++ - -#define NS_STANDARDURL_CID \ -{ /* de9472d0-8034-11d3-9399-00104ba0fd40 */ \ - 0xde9472d0, \ - 0x8034, \ - 0x11d3, \ - {0x93, 0x99, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \ -} - -%} - -//////////////////////////////////////////////////////////////////////////////// - diff --git a/mozilla/netwerk/base/public/nsNetUtil.h b/mozilla/netwerk/base/public/nsNetUtil.h index e23620a495a..27d3c586a2e 100644 --- a/mozilla/netwerk/base/public/nsNetUtil.h +++ b/mozilla/netwerk/base/public/nsNetUtil.h @@ -29,6 +29,7 @@ #include "nsIOutputStream.h" #include "nsIStreamListener.h" #include "nsIStreamProvider.h" +#include "nsIRequestObserverProxy.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" #include "nsString.h" @@ -96,7 +97,7 @@ NS_OpenURI(nsIChannel* *result, nsIIOService* ioService = nsnull, // pass in nsIIOService to optimize callers nsILoadGroup* loadGroup = nsnull, nsIInterfaceRequestor* notificationCallbacks = nsnull, - nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIChannel::LOAD_NORMAL)) + nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIRequest::LOAD_NORMAL)) { nsresult rv; @@ -119,8 +120,8 @@ NS_OpenURI(nsIChannel* *result, rv = channel->SetNotificationCallbacks(notificationCallbacks); if (NS_FAILED(rv)) return rv; } - if (loadAttributes != nsIChannel::LOAD_NORMAL) { - rv = channel->SetLoadAttributes(loadAttributes); + if (loadAttributes != nsIRequest::LOAD_NORMAL) { + rv = channel->SetLoadFlags(loadAttributes); if (NS_FAILED(rv)) return rv; } @@ -140,7 +141,7 @@ NS_OpenURI(nsIInputStream* *result, nsIIOService* ioService = nsnull, // pass in nsIIOService to optimize callers nsILoadGroup* loadGroup = nsnull, nsIInterfaceRequestor* notificationCallbacks = nsnull, - nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIChannel::LOAD_NORMAL)) + nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIRequest::LOAD_NORMAL)) { nsresult rv; nsCOMPtr channel; @@ -164,7 +165,7 @@ NS_OpenURI(nsIStreamListener* aConsumer, nsIIOService* ioService = nsnull, // pass in nsIIOService to optimize callers nsILoadGroup* loadGroup = nsnull, nsIInterfaceRequestor* notificationCallbacks = nsnull, - nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIChannel::LOAD_NORMAL)) + nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIRequest::LOAD_NORMAL)) { nsresult rv; nsCOMPtr channel; @@ -286,7 +287,7 @@ NS_NewInputStreamChannel(nsIChannel **result, } inline nsresult -NS_NewLoadGroup(nsILoadGroup* *result, nsIStreamObserver* obs) +NS_NewLoadGroup(nsILoadGroup* *result, nsIRequestObserver* obs) { nsresult rv; nsCOMPtr group; @@ -295,7 +296,7 @@ NS_NewLoadGroup(nsILoadGroup* *result, nsIStreamObserver* obs) NS_GET_IID(nsILoadGroup), getter_AddRefs(group)); if (NS_FAILED(rv)) return rv; - rv = group->Init(obs); + rv = group->SetGroupObserver(obs); if (NS_FAILED(rv)) return rv; *result = group; @@ -312,7 +313,7 @@ NS_NewDownloader(nsIDownloader* *result, PRBool synchronous = PR_FALSE, nsILoadGroup* loadGroup = nsnull, nsIInterfaceRequestor* notificationCallbacks = nsnull, - nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIChannel::LOAD_NORMAL)) + nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIRequest::LOAD_NORMAL)) { nsresult rv; nsCOMPtr downloader; @@ -337,7 +338,7 @@ NS_NewStreamLoader(nsIStreamLoader* *result, nsISupports* context = nsnull, nsILoadGroup* loadGroup = nsnull, nsIInterfaceRequestor* notificationCallbacks = nsnull, - nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIChannel::LOAD_NORMAL)) + nsLoadFlags loadAttributes = NS_STATIC_CAST(nsLoadFlags, nsIRequest::LOAD_NORMAL)) { nsresult rv; nsCOMPtr loader; @@ -357,19 +358,19 @@ NS_NewStreamLoader(nsIStreamLoader* *result, } inline nsresult -NS_NewStreamObserverProxy(nsIStreamObserver **aResult, - nsIStreamObserver *aObserver, - nsIEventQueue *aEventQ=nsnull) +NS_NewRequestObserverProxy(nsIRequestObserver **aResult, + nsIRequestObserver *aObserver, + nsIEventQueue *aEventQ=nsnull) { NS_ENSURE_ARG_POINTER(aResult); nsresult rv; - nsCOMPtr proxy; - static NS_DEFINE_CID(kStreamObserverProxyCID, NS_STREAMOBSERVERPROXY_CID); + nsCOMPtr proxy; + static NS_DEFINE_CID(kRequestObserverProxyCID, NS_REQUESTOBSERVERPROXY_CID); - rv = nsComponentManager::CreateInstance(kStreamObserverProxyCID, + rv = nsComponentManager::CreateInstance(kRequestObserverProxyCID, nsnull, - NS_GET_IID(nsIStreamObserverProxy), + NS_GET_IID(nsIRequestObserverProxy), getter_AddRefs(proxy)); if (NS_FAILED(rv)) return rv; @@ -434,7 +435,7 @@ NS_NewStreamProviderProxy(nsIStreamProvider **aResult, inline nsresult NS_NewSimpleStreamListener(nsIStreamListener **aResult, nsIOutputStream *aSink, - nsIStreamObserver *aObserver=nsnull) + nsIRequestObserver *aObserver=nsnull) { NS_ENSURE_ARG_POINTER(aResult); @@ -457,7 +458,7 @@ NS_NewSimpleStreamListener(nsIStreamListener **aResult, inline nsresult NS_NewSimpleStreamProvider(nsIStreamProvider **aResult, nsIInputStream *aSource, - nsIStreamObserver *aObserver=nsnull) + nsIRequestObserver *aObserver=nsnull) { NS_ENSURE_ARG_POINTER(aResult); @@ -477,10 +478,11 @@ NS_NewSimpleStreamProvider(nsIStreamProvider **aResult, return NS_OK; } +/* // Depracated, prefer NS_NewStreamObserverProxy inline nsresult -NS_NewAsyncStreamObserver(nsIStreamObserver **result, - nsIStreamObserver *receiver, +NS_NewAsyncStreamObserver(nsIRequestObserver **result, + nsIRequestObserver *receiver, nsIEventQueue *eventQueue) { nsresult rv; @@ -497,6 +499,7 @@ NS_NewAsyncStreamObserver(nsIStreamObserver **result, NS_ADDREF(*result = obs); return NS_OK; } +*/ // Depracated, prefer NS_NewStreamListenerProxy inline nsresult @@ -558,7 +561,7 @@ NS_AsyncWriteFromStream(nsIRequest **aRequest, PRUint32 aOffset=0, PRUint32 aCount=0, PRUint32 aFlags=0, - nsIStreamObserver *aObserver=NULL, + nsIRequestObserver *aObserver=NULL, nsISupports *aContext=NULL) { NS_ENSURE_ARG_POINTER(aTransport); @@ -600,7 +603,7 @@ NS_AsyncReadToStream(nsIRequest **aRequest, PRUint32 aOffset=0, PRUint32 aCount=0, PRUint32 aFlags=0, - nsIStreamObserver *aObserver=NULL, + nsIRequestObserver *aObserver=NULL, nsISupports *aContext=NULL) { NS_ENSURE_ARG_POINTER(aTransport); diff --git a/mozilla/netwerk/base/src/Makefile.in b/mozilla/netwerk/base/src/Makefile.in index cad7261508c..7f0f4eb9d31 100644 --- a/mozilla/netwerk/base/src/Makefile.in +++ b/mozilla/netwerk/base/src/Makefile.in @@ -41,7 +41,7 @@ CPPSRCS = \ nsFileTransportService.cpp \ nsSimpleStreamListener.cpp \ nsSimpleStreamProvider.cpp \ - nsStreamObserverProxy.cpp \ + nsRequestObserverProxy.cpp \ nsStreamListenerProxy.cpp \ nsStreamProviderProxy.cpp \ nsStdURLParser.cpp \ diff --git a/mozilla/netwerk/base/src/makefile.win b/mozilla/netwerk/base/src/makefile.win index 56475c4ab10..1ca6ed63e04 100644 --- a/mozilla/netwerk/base/src/makefile.win +++ b/mozilla/netwerk/base/src/makefile.win @@ -37,7 +37,7 @@ CPP_OBJS = \ .\$(OBJDIR)\nsFileTransportService.obj \ .\$(OBJDIR)\nsSimpleStreamListener.obj \ .\$(OBJDIR)\nsSimpleStreamProvider.obj \ - .\$(OBJDIR)\nsStreamObserverProxy.obj \ + .\$(OBJDIR)\nsRequestObserverProxy.obj \ .\$(OBJDIR)\nsStreamListenerProxy.obj \ .\$(OBJDIR)\nsStreamProviderProxy.obj \ .\$(OBJDIR)\nsStdURLParser.obj \ diff --git a/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp b/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp index a7f3209a292..5701f19c613 100644 --- a/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp +++ b/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp @@ -133,9 +133,8 @@ nsStreamListenerEvent::Fire(nsIEventQueue* aEventQueue) //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_THREADSAFE_ISUPPORTS2(nsAsyncStreamObserver, - nsIAsyncStreamObserver, - nsIStreamObserver) +NS_IMPL_THREADSAFE_ISUPPORTS1(nsAsyncStreamObserver, + nsIRequestObserver) NS_IMPL_ADDREF_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver); NS_IMPL_RELEASE_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver); @@ -158,7 +157,7 @@ nsAsyncStreamListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) } NS_IMETHODIMP -nsAsyncStreamObserver::Init(nsIStreamObserver* aObserver, nsIEventQueue* aEventQ) +nsAsyncStreamObserver::Init(nsIRequestObserver* aObserver, nsIEventQueue* aEventQ) { nsresult rv = NS_OK; NS_ASSERTION(aObserver, "null observer"); @@ -198,7 +197,7 @@ nsOnStartRequestEvent::HandleEvent() PR_LOG(gStreamEventLog, PR_LOG_DEBUG, ("netlibEvent: Handle Start [event=%x]", this)); #endif - nsIStreamObserver* receiver = (nsIStreamObserver*)mListener->GetReceiver(); + nsIRequestObserver* receiver = (nsIRequestObserver*)mListener->GetReceiver(); if (receiver == nsnull) { // must have already called OnStopRequest (it clears the receiver) return NS_ERROR_FAILURE; @@ -257,12 +256,11 @@ public: mStatus(NS_OK) {} virtual ~nsOnStopRequestEvent(); - nsresult Init(nsresult aStatus, const PRUnichar* aStatusArg); + nsresult Init(nsresult aStatus); NS_IMETHOD HandleEvent(); protected: nsresult mStatus; - nsString mStatusArg; }; nsOnStopRequestEvent::~nsOnStopRequestEvent() @@ -270,10 +268,9 @@ nsOnStopRequestEvent::~nsOnStopRequestEvent() } nsresult -nsOnStopRequestEvent::Init(nsresult aStatus, const PRUnichar* aStatusArg) +nsOnStopRequestEvent::Init(nsresult aStatus) { mStatus = aStatus; - mStatusArg = aStatusArg; return NS_OK; } @@ -286,7 +283,7 @@ nsOnStopRequestEvent::HandleEvent() PR_LOG(gStreamEventLog, PR_LOG_DEBUG, ("netlibEvent: Handle Stop [event=%x]", this)); #endif - nsIStreamObserver* receiver = (nsIStreamObserver*)mListener->GetReceiver(); + nsIRequestObserver* receiver = (nsIRequestObserver*)mListener->GetReceiver(); if (receiver == nsnull) { // must have already called OnStopRequest (it clears the receiver) return NS_ERROR_FAILURE; @@ -303,7 +300,7 @@ nsOnStopRequestEvent::HandleEvent() if (NS_SUCCEEDED(rv) && NS_FAILED(status)) { mStatus = status; } - rv = receiver->OnStopRequest(mRequest, mContext, mStatus, mStatusArg.GetUnicode()); + rv = receiver->OnStopRequest(mRequest, mContext, mStatus); // Call clear on the listener to make sure it's cleanup is done on the correct thread mListener->Clear(); return rv; @@ -311,7 +308,7 @@ nsOnStopRequestEvent::HandleEvent() NS_IMETHODIMP nsAsyncStreamObserver::OnStopRequest(nsIRequest* request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsresult rv; @@ -324,7 +321,7 @@ nsAsyncStreamObserver::OnStopRequest(nsIRequest* request, nsISupports* context, if (event == nsnull) return NS_ERROR_OUT_OF_MEMORY; - rv = event->Init(aStatus, aStatusArg); + rv = event->Init(aStatus); if (NS_FAILED(rv)) goto failed; #if defined(PR_LOGGING) PLEventQueue *equeue; diff --git a/mozilla/netwerk/base/src/nsAsyncStreamListener.h b/mozilla/netwerk/base/src/nsAsyncStreamListener.h index c1e3b11b02d..ca9fc99716c 100644 --- a/mozilla/netwerk/base/src/nsAsyncStreamListener.h +++ b/mozilla/netwerk/base/src/nsAsyncStreamListener.h @@ -26,17 +26,17 @@ #include "nsIStreamListener.h" #include "nsCOMPtr.h" #include "nsIEventQueue.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsIStreamListener.h" #include "nsIRequest.h" + //////////////////////////////////////////////////////////////////////////////// -class nsAsyncStreamObserver : public nsIAsyncStreamObserver +class nsAsyncStreamObserver : public nsIRequestObserver { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER - NS_DECL_NSIASYNCSTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER // nsAsyncStreamObserver methods: nsAsyncStreamObserver() @@ -49,12 +49,14 @@ public: static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult); + NS_METHOD Init(nsIRequestObserver *, nsIEventQueue *); + nsISupports* GetReceiver() { return mReceiver.get(); } void Clear() { mReceiver = nsnull; } protected: - nsCOMPtr mEventQueue; - nsCOMPtr mReceiver; + nsCOMPtr mEventQueue; + nsCOMPtr mReceiver; }; //////////////////////////////////////////////////////////////////////////////// @@ -74,9 +76,9 @@ public: NS_IMETHOD OnStopRequest(nsIRequest* request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { - return nsAsyncStreamObserver::OnStopRequest(request, context, aStatus, aStatusArg); + return nsAsyncStreamObserver::OnStopRequest(request, context, aStatus); } NS_IMETHOD OnDataAvailable(nsIRequest* request, nsISupports* context, diff --git a/mozilla/netwerk/base/src/nsDownloader.cpp b/mozilla/netwerk/base/src/nsDownloader.cpp index 45704f7e95a..18c6fb60422 100644 --- a/mozilla/netwerk/base/src/nsDownloader.cpp +++ b/mozilla/netwerk/base/src/nsDownloader.cpp @@ -101,7 +101,7 @@ nsDownloader::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) } NS_IMPL_ISUPPORTS3(nsDownloader, nsIDownloader, - nsIStreamObserver, nsIStreamListener) + nsIRequestObserver, nsIStreamListener) NS_IMETHODIMP nsDownloader::OnStartRequest(nsIRequest *request, nsISupports *ctxt) @@ -111,7 +111,7 @@ nsDownloader::OnStartRequest(nsIRequest *request, nsISupports *ctxt) NS_IMETHODIMP nsDownloader::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsCOMPtr file; if (NS_SUCCEEDED(aStatus)) diff --git a/mozilla/netwerk/base/src/nsDownloader.h b/mozilla/netwerk/base/src/nsDownloader.h index 6c0583050e8..c4f8acd3b1a 100644 --- a/mozilla/netwerk/base/src/nsDownloader.h +++ b/mozilla/netwerk/base/src/nsDownloader.h @@ -35,7 +35,7 @@ class nsDownloader : public nsIDownloader, public: NS_DECL_ISUPPORTS NS_DECL_NSIDOWNLOADER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsDownloader() { NS_INIT_REFCNT();} ; diff --git a/mozilla/netwerk/base/src/nsFileTransport.cpp b/mozilla/netwerk/base/src/nsFileTransport.cpp index 588eff37213..88f48379c28 100644 --- a/mozilla/netwerk/base/src/nsFileTransport.cpp +++ b/mozilla/netwerk/base/src/nsFileTransport.cpp @@ -385,6 +385,32 @@ nsFileTransport::Resume() return NS_OK; } +NS_IMETHODIMP +nsFileTransport::GetLoadGroup(nsILoadGroup **loadGroup) +{ + *loadGroup = nsnull; + return NS_OK; +} + +NS_IMETHODIMP +nsFileTransport::SetLoadGroup(nsILoadGroup *loadGroup) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsFileTransport::GetLoadFlags(nsLoadFlags *loadFlags) +{ + *loadFlags = nsIRequest::LOAD_NORMAL; + return NS_OK; +} + +NS_IMETHODIMP +nsFileTransport::SetLoadFlags(nsLoadFlags loadFlags) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + //////////////////////////////////////////////////////////////////////////////// // From nsITransportRequest //////////////////////////////////////////////////////////////////////////////// @@ -751,7 +777,7 @@ nsFileTransport::Process(void) } if (mListener) { - mListener->OnStopRequest(this, mContext, mStatus, nsnull); + mListener->OnStopRequest(this, mContext, mStatus); mListener = 0; } if (mProgress) { @@ -926,7 +952,7 @@ nsFileTransport::Process(void) mSinkWrapper = nsnull; if (mProvider) { - mProvider->OnStopRequest(this, mContext, mStatus, nsnull); + mProvider->OnStopRequest(this, mContext, mStatus); mProvider = 0; } if (mProgress) { diff --git a/mozilla/netwerk/base/src/nsFileTransportService.cpp b/mozilla/netwerk/base/src/nsFileTransportService.cpp index a2369cf32ed..5d313c16123 100644 --- a/mozilla/netwerk/base/src/nsFileTransportService.cpp +++ b/mozilla/netwerk/base/src/nsFileTransportService.cpp @@ -31,8 +31,9 @@ #include "nsISupportsArray.h" #include "nsFileSpec.h" #include "nsAutoLock.h" +#include "nsNetCID.h" -static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); +static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); //////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp index 2584014b1eb..2ba76a74ad2 100644 --- a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp +++ b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp @@ -27,6 +27,7 @@ #include "nsIFileTransportService.h" #include "netCore.h" #include "nsXPIDLString.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); @@ -137,7 +138,7 @@ nsInputStreamIO::GetName(char* *aName) nsStreamIOChannel::nsStreamIOChannel() : mContentType(nsnull), mContentLength(-1), mBufferSegmentSize(0), mBufferMaxSize(0), - mLoadAttributes(LOAD_NORMAL), mStatus(NS_OK) + mLoadFlags(LOAD_NORMAL), mStatus(NS_OK) { NS_INIT_REFCNT(); } @@ -176,7 +177,7 @@ NS_INTERFACE_MAP_BEGIN(nsStreamIOChannel) NS_INTERFACE_MAP_ENTRY(nsIRequest) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIStreamProvider) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIStreamObserver, nsIStreamListener) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIRequestObserver, nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIProgressEventSink) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStreamListener) @@ -273,13 +274,6 @@ nsStreamIOChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsStreamIOChannel::SetURI(nsIURI* aURI) -{ - mURI = aURI; - return NS_OK; -} - NS_IMETHODIMP nsStreamIOChannel::Open(nsIInputStream **result) { @@ -295,20 +289,6 @@ nsStreamIOChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) SetListener(listener); if (mLoadGroup) { - nsCOMPtr factory; - // - // Create a load group "proxy" listener... - // - rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory)); - if (factory) { - nsIStreamListener *newListener; - rv = factory->CreateLoadGroupListener(GetListener(), &newListener); - if (NS_SUCCEEDED(rv)) { - mUserObserver = newListener; - NS_RELEASE(newListener); - } - } - rv = mLoadGroup->AddRequest(this, nsnull); if (NS_FAILED(rv)) return rv; } @@ -326,7 +306,7 @@ nsStreamIOChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) nsCOMPtr requestor = do_QueryInterface(NS_STATIC_CAST(nsIRequest*, this)); rv = mFileTransport->SetNotificationCallbacks - (requestor, (mLoadAttributes & nsIChannel::LOAD_BACKGROUND)); + (requestor, (mLoadFlags & nsIRequest::LOAD_BACKGROUND)); if (NS_FAILED(rv)) goto done; } @@ -341,7 +321,7 @@ nsStreamIOChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) done: if (NS_FAILED(rv)) { nsresult rv2; - rv2 = mLoadGroup->RemoveRequest(this, ctxt, rv, nsnull); + rv2 = mLoadGroup->RemoveRequest(this, ctxt, rv); NS_ASSERTION(NS_SUCCEEDED(rv2), "RemoveRequest failed"); // release the transport so that we don't think we're in progress mFileTransport = nsnull; @@ -350,16 +330,16 @@ nsStreamIOChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) } NS_IMETHODIMP -nsStreamIOChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +nsStreamIOChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsStreamIOChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) +nsStreamIOChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -462,7 +442,7 @@ nsStreamIOChannel::SetContentLength(PRInt32 aContentLength) } //////////////////////////////////////////////////////////////////////////////// -// nsIStreamObserver implementation: +// nsIRequestObserver implementation: //////////////////////////////////////////////////////////////////////////////// NS_IMETHODIMP @@ -473,14 +453,13 @@ nsStreamIOChannel::OnStartRequest(nsIRequest *request, nsISupports* context) } NS_IMETHODIMP -nsStreamIOChannel::OnStopRequest(nsIRequest *request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) +nsStreamIOChannel::OnStopRequest(nsIRequest *request, nsISupports* context, nsresult aStatus) { if (mUserObserver) - mUserObserver->OnStopRequest(this, context, aStatus, aStatusArg); + mUserObserver->OnStopRequest(this, context, aStatus); if (mLoadGroup) - mLoadGroup->RemoveRequest(this, context, aStatus, aStatusArg); + mLoadGroup->RemoveRequest(this, context, aStatus); // Release the reference to the consumer stream listener... mRequest = 0; diff --git a/mozilla/netwerk/base/src/nsInputStreamChannel.h b/mozilla/netwerk/base/src/nsInputStreamChannel.h index 5ef4a9b076c..8caea9b57ef 100644 --- a/mozilla/netwerk/base/src/nsInputStreamChannel.h +++ b/mozilla/netwerk/base/src/nsInputStreamChannel.h @@ -69,7 +69,7 @@ public: NS_DECL_NSIREQUEST NS_DECL_NSICHANNEL NS_DECL_NSISTREAMIOCHANNEL - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSISTREAMPROVIDER NS_DECL_NSIPROGRESSEVENTSINK @@ -99,10 +99,10 @@ protected: nsCOMPtr mOwner; nsCOMPtr mFileTransport; nsCOMPtr mRequest; - nsCOMPtr mUserObserver; + nsCOMPtr mUserObserver; PRUint32 mBufferSegmentSize; PRUint32 mBufferMaxSize; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsresult mStatus; }; diff --git a/mozilla/netwerk/base/src/nsLoadGroup.cpp b/mozilla/netwerk/base/src/nsLoadGroup.cpp index f300db78719..b24d36a0744 100644 --- a/mozilla/netwerk/base/src/nsLoadGroup.cpp +++ b/mozilla/netwerk/base/src/nsLoadGroup.cpp @@ -18,11 +18,10 @@ * Rights Reserved. * * Contributor(s): + * Darin Fisher */ #include "nsLoadGroup.h" -#include "nsIStreamObserver.h" -#include "nsIChannel.h" #include "nsISupportsArray.h" #include "nsEnumeratorUtils.h" #include "nsIServiceManager.h" @@ -48,31 +47,27 @@ // the file nspr.log // PRLogModuleInfo* gLoadGroupLog = nsnull; +#endif -#endif /* PR_LOGGING */ +#define LOG(args) PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, args) //////////////////////////////////////////////////////////////////////////////// nsLoadGroup::nsLoadGroup(nsISupports* outer) - : mDefaultLoadAttributes(nsIChannel::LOAD_NORMAL), - mForegroundCount(0), - mRequests(nsnull), - mStatus(NS_OK) + : mLoadFlags(LOAD_NORMAL) + , mForegroundCount(0) + , mRequests(nsnull) + , mStatus(NS_OK) { NS_INIT_AGGREGATED(outer); #if defined(PR_LOGGING) - // // Initialize the global PRLogModule for nsILoadGroup logging - // if necessary... - // - if (nsnull == gLoadGroupLog) { + if (nsnull == gLoadGroupLog) gLoadGroupLog = PR_NewLogModule("LoadGroup"); - } -#endif /* PR_LOGGING */ +#endif - PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, - ("LOADGROUP [%x]: Created.\n", this)); + LOG(("LOADGROUP [%x]: Created.\n", this)); } nsLoadGroup::~nsLoadGroup() @@ -83,10 +78,9 @@ nsLoadGroup::~nsLoadGroup() NS_ASSERTION(NS_SUCCEEDED(rv), "Cancel failed"); NS_IF_RELEASE(mRequests); - mDefaultLoadRequest = null_nsCOMPtr(); + mDefaultLoadRequest = 0; - PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, - ("LOADGROUP [%x]: Destroyed.\n", this)); + LOG(("LOADGROUP [%x]: Destroyed.\n", this)); } @@ -114,9 +108,8 @@ nsLoadGroup::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) rv = group->AggregatedQueryInterface(aIID, aResult); } - if (NS_FAILED(rv)) { + if (NS_FAILED(rv)) delete group; - } return rv; } @@ -176,12 +169,7 @@ nsLoadGroup::GetName(PRUnichar* *result) NS_IMETHODIMP nsLoadGroup::IsPending(PRBool *aResult) { - if (mForegroundCount > 0) { - *aResult = PR_TRUE; - } else { - *aResult = PR_FALSE; - } - + *aResult = (mForegroundCount > 0) ? PR_TRUE : PR_FALSE; return NS_OK; } @@ -223,43 +211,39 @@ nsLoadGroup::Cancel(nsresult status) request = NS_STATIC_CAST(nsIRequest*, mRequests->ElementAt(--count)); NS_ASSERTION(request, "NULL request found in list."); - if (!request) { + if (!request) continue; - } #if defined(PR_LOGGING) nsXPIDLString nameStr; request->GetName(getter_Copies(nameStr)); - PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, - ("LOADGROUP [%x]: Canceling request %x %s.\n", - this, request, NS_ConvertUCS2toUTF8(nameStr).get())); -#endif /* PR_LOGGING */ + LOG(("LOADGROUP [%x]: Canceling request %x %s.\n", + this, request, NS_ConvertUCS2toUTF8(nameStr).get())); +#endif // // Remove the request from the load group... This may cause // the OnStopRequest notification to fire... // - // XXX: What should the context and error message be? + // XXX: What should the context be? // - (void)RemoveRequest(request, nsnull, status, nsnull); + (void)RemoveRequest(request, nsnull, status); // Cancel the request... rv = request->Cancel(status); // Remember the first failure and return it... - if (NS_FAILED(rv) && NS_SUCCEEDED(firstError)) { - firstError = rv; - } + if (NS_FAILED(rv) && NS_SUCCEEDED(firstError)) + firstError = rv; NS_RELEASE(request); } #if defined(DEBUG) (void)mRequests->Count(&count); - NS_ASSERTION(count == 0, "Request list is not empty."); NS_ASSERTION(mForegroundCount == 0, "Foreground URLs are active."); -#endif /* DEBUG */ +#endif } mStatus = NS_OK; @@ -285,25 +269,22 @@ nsLoadGroup::Suspend() nsIRequest* request = NS_STATIC_CAST(nsIRequest*, mRequests->ElementAt(--count)); NS_ASSERTION(request, "NULL request found in list."); - if (!request) { + if (!request) continue; - } #if defined(PR_LOGGING) - nsXPIDLString nameStr; - request->GetName(getter_Copies(nameStr)); - PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, - ("LOADGROUP [%x]: Suspending request %x %s.\n", - this, request, NS_ConvertUCS2toUTF8(nameStr).get())); -#endif /* PR_LOGGING */ + nsXPIDLString nameStr; + request->GetName(getter_Copies(nameStr)); + LOG(("LOADGROUP [%x]: Suspending request %x %s.\n", + this, request, NS_ConvertUCS2toUTF8(nameStr).get())); +#endif // Suspend the request... rv = request->Suspend(); // Remember the first failure and return it... - if (NS_FAILED(rv) && NS_SUCCEEDED(firstError)) { - firstError = rv; - } + if (NS_FAILED(rv) && NS_SUCCEEDED(firstError)) + firstError = rv; NS_RELEASE(request); } @@ -330,25 +311,22 @@ nsLoadGroup::Resume() nsIRequest* request = NS_STATIC_CAST(nsIRequest*, mRequests->ElementAt(--count)); NS_ASSERTION(request, "NULL request found in list."); - if (!request) { + if (!request) continue; - } #if defined(PR_LOGGING) nsXPIDLString nameStr; request->GetName(getter_Copies(nameStr)); - PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, - ("LOADGROUP [%x]: Resuming request %x %s.\n", - this, request, NS_ConvertUCS2toUTF8(nameStr).get())); -#endif /* PR_LOGGING */ + LOG(("LOADGROUP [%x]: Resuming request %x %s.\n", + this, request, NS_ConvertUCS2toUTF8(nameStr).get())); +#endif // Resume the request... rv = request->Resume(); // Remember the first failure and return it... - if (NS_FAILED(rv) && NS_SUCCEEDED(firstError)) { - firstError = rv; - } + if (NS_FAILED(rv) && NS_SUCCEEDED(firstError)) + firstError = rv; NS_RELEASE(request); } @@ -356,33 +334,37 @@ nsLoadGroup::Resume() return firstError; } +NS_IMETHODIMP +nsLoadGroup::GetLoadFlags(PRUint32 *aLoadFlags) +{ + *aLoadFlags = mLoadFlags; + return NS_OK; +} + +NS_IMETHODIMP +nsLoadGroup::SetLoadFlags(PRUint32 aLoadFlags) +{ + mLoadFlags = aLoadFlags; + return NS_OK; +} + +NS_IMETHODIMP +nsLoadGroup::GetLoadGroup(nsILoadGroup **loadGroup) +{ + *loadGroup = mLoadGroup; + return NS_OK; +} + +NS_IMETHODIMP +nsLoadGroup::SetLoadGroup(nsILoadGroup *loadGroup) +{ + mLoadGroup = loadGroup; + return NS_OK; +} + //////////////////////////////////////////////////////////////////////////////// // nsILoadGroup methods: -NS_IMETHODIMP -nsLoadGroup::Init(nsIStreamObserver *aObserver) -{ - nsresult rv; - - rv = SetGroupObserver(aObserver); - - return rv; -} - -NS_IMETHODIMP -nsLoadGroup::GetDefaultLoadAttributes(PRUint32 *aDefaultLoadAttributes) -{ - *aDefaultLoadAttributes = mDefaultLoadAttributes; - return NS_OK; -} - -NS_IMETHODIMP -nsLoadGroup::SetDefaultLoadAttributes(PRUint32 aDefaultLoadAttributes) -{ - mDefaultLoadAttributes = aDefaultLoadAttributes; - return NS_OK; -} - NS_IMETHODIMP nsLoadGroup::GetDefaultLoadRequest(nsIRequest * *aRequest) { @@ -398,7 +380,6 @@ nsLoadGroup::SetDefaultLoadRequest(nsIRequest *aRequest) return NS_OK; } - NS_IMETHODIMP nsLoadGroup::AddRequest(nsIRequest *request, nsISupports* ctxt) { @@ -409,13 +390,12 @@ nsLoadGroup::AddRequest(nsIRequest *request, nsISupports* ctxt) (void)mRequests->Count(&count); nsXPIDLString nameStr; request->GetName(getter_Copies(nameStr)); - PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, - ("LOADGROUP [%x]: Adding request %x %s (count=%d).\n", - this, request, NS_ConvertUCS2toUTF8(nameStr).get(), count)); -#endif /* PR_LOGGING */ + LOG(("LOADGROUP [%x]: Adding request %x %s (count=%d).\n", + this, request, NS_ConvertUCS2toUTF8(nameStr).get(), count)); +#endif nsLoadFlags flags; - rv = MergeLoadAttributes(request, flags); + rv = MergeLoadFlags(request, flags); if (NS_FAILED(rv)) return rv; // @@ -426,7 +406,7 @@ nsLoadGroup::AddRequest(nsIRequest *request, nsISupports* ctxt) rv = mRequests->AppendElement(request) ? NS_OK : NS_ERROR_FAILURE; if (NS_FAILED(rv)) return rv; - if (!(flags & nsIChannel::LOAD_BACKGROUND)) { + if (!(flags & nsIRequest::LOAD_BACKGROUND)) { // Update the count of foreground URIs.. mForegroundCount += 1; @@ -436,18 +416,15 @@ nsLoadGroup::AddRequest(nsIRequest *request, nsISupports* ctxt) // If the notification fails then DO NOT add the request to // the load group. // - nsCOMPtr observer (do_QueryReferent(mObserver)); + nsCOMPtr observer = do_QueryReferent(mObserver); if (observer) { - PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, - ("LOADGROUP [%x]: Firing OnStartRequest for request %x." - "(foreground count=%d).\n", - this, request, mForegroundCount)); + LOG(("LOADGROUP [%x]: Firing OnStartRequest for request %x." + "(foreground count=%d).\n", this, request, mForegroundCount)); rv = observer->OnStartRequest(request, ctxt); if (NS_FAILED(rv)) { - PR_LOG(gLoadGroupLog, PR_LOG_ERROR, - ("LOADGROUP [%x]: OnStartRequest for request %x FAILED.\n", - this, request)); + LOG(("LOADGROUP [%x]: OnStartRequest for request %x FAILED.\n", + this, request)); // // The URI load has been canceled by the observer. Clean up // the damage... @@ -464,8 +441,7 @@ nsLoadGroup::AddRequest(nsIRequest *request, nsISupports* ctxt) } NS_IMETHODIMP -nsLoadGroup::RemoveRequest(nsIRequest *request, nsISupports* ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) +nsLoadGroup::RemoveRequest(nsIRequest *request, nsISupports* ctxt, nsresult aStatus) { nsresult rv; @@ -474,10 +450,9 @@ nsLoadGroup::RemoveRequest(nsIRequest *request, nsISupports* ctxt, (void)mRequests->Count(&count); nsXPIDLString nameStr; request->GetName(getter_Copies(nameStr)); - PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, - ("LOADGROUP [%x]: Removing request %x %s status %x (count=%d).\n", - this, request, NS_ConvertUCS2toUTF8(nameStr).get(), aStatus, count-1)); -#endif /* PR_LOGGING */ + LOG(("LOADGROUP [%x]: Removing request %x %s status %x (count=%d).\n", + this, request, NS_ConvertUCS2toUTF8(nameStr).get(), aStatus, count-1)); +#endif // // Remove the request from the group. If this fails, it means that @@ -489,172 +464,125 @@ nsLoadGroup::RemoveRequest(nsIRequest *request, nsISupports* ctxt, // rv = mRequests->RemoveElement(request) ? NS_OK : NS_ERROR_FAILURE; if (NS_FAILED(rv)) { - PR_LOG(gLoadGroupLog, PR_LOG_ERROR, - ("LOADGROUP [%x]: Unable to remove request %x. Not in group!\n", - this, request)); + LOG(("LOADGROUP [%x]: Unable to remove request %x. Not in group!\n", + this, request)); return rv; } nsLoadFlags flags; - nsCOMPtr aChannel = do_QueryInterface(request, &rv); - if (NS_FAILED(rv)) - return NS_ERROR_FAILURE; - - rv = aChannel->GetLoadAttributes(&flags); + rv = request->GetLoadFlags(&flags); if (NS_FAILED(rv)) return rv; - if (!(flags & nsIChannel::LOAD_BACKGROUND)) { + if (!(flags & nsIRequest::LOAD_BACKGROUND)) { NS_ASSERTION(mForegroundCount > 0, "ForegroundCount messed up"); mForegroundCount -= 1; // Fire the OnStopRequest out to the observer... - nsCOMPtr observer (do_QueryReferent(mObserver)); + nsCOMPtr observer = do_QueryReferent(mObserver); if (observer) { - PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, - ("LOADGROUP [%x]: Firing OnStopRequest for request %x." - "(foreground count=%d).\n", - this, request, mForegroundCount)); + LOG(("LOADGROUP [%x]: Firing OnStopRequest for request %x." + "(foreground count=%d).\n", this, request, mForegroundCount)); - rv = observer->OnStopRequest(request, ctxt, aStatus, aStatusArg); - if (NS_FAILED(rv)) { - PR_LOG(gLoadGroupLog, PR_LOG_ERROR, - ("LOADGROUP [%x]: OnStopRequest for request %x FAILED.\n", - this, request)); - } + rv = observer->OnStopRequest(request, ctxt, aStatus); + if (NS_FAILED(rv)) + LOG(("LOADGROUP [%x]: OnStopRequest for request %x FAILED.\n", + this, request)); } } return rv; } - - NS_IMETHODIMP nsLoadGroup::GetRequests(nsISimpleEnumerator * *aRequests) { return NS_NewArrayEnumerator(aRequests, mRequests); } - NS_IMETHODIMP -nsLoadGroup::GetGroupListenerFactory(nsILoadGroupListenerFactory * *aFactory) +nsLoadGroup::SetGroupObserver(nsIRequestObserver* aObserver) { - if (mGroupListenerFactory) { - mGroupListenerFactory->QueryReferent(NS_GET_IID(nsILoadGroupListenerFactory), (void**)aFactory); - } - return NS_OK; -} - -NS_IMETHODIMP -nsLoadGroup::SetGroupListenerFactory(nsILoadGroupListenerFactory *aFactory) -{ - mGroupListenerFactory = getter_AddRefs(NS_GetWeakReference(aFactory)); - return NS_OK; -} - - -NS_IMETHODIMP -nsLoadGroup::SetGroupObserver(nsIStreamObserver* aObserver) -{ - nsresult rv = NS_OK; - - // Release the old observer (if any...) - mObserver = null_nsCOMPtr(); -#if 0 - if (aObserver) { - nsCOMPtr eventQueue; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); - if (NS_FAILED(rv)) return rv; - - rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQueue)); - if (NS_FAILED(rv)) return rv; - - rv = NS_NewAsyncStreamObserver(getter_AddRefs(mObserver), - eventQueue, aObserver); - } -#else - //mObserver = aObserver; mObserver = getter_AddRefs(NS_GetWeakReference(aObserver)); -#endif - - return rv; + return NS_OK; } - NS_IMETHODIMP -nsLoadGroup::GetGroupObserver(nsIStreamObserver* *aResult) +nsLoadGroup::GetGroupObserver(nsIRequestObserver* *aResult) { - nsCOMPtr observer (do_QueryReferent(mObserver)); - *aResult = observer; - NS_IF_ADDREF(*aResult); - return NS_OK; + nsCOMPtr observer = do_QueryReferent(mObserver); + *aResult = observer; + NS_IF_ADDREF(*aResult); + return NS_OK; } - NS_IMETHODIMP nsLoadGroup::GetActiveCount(PRUint32* aResult) { *aResult = mForegroundCount; + return NS_OK; +} +NS_IMETHODIMP +nsLoadGroup::GetNotificationCallbacks(nsIInterfaceRequestor **aCallbacks) +{ + NS_ENSURE_ARG_POINTER(aCallbacks); + *aCallbacks = mCallbacks; + NS_IF_ADDREF(*aCallbacks); + return NS_OK; +} + +NS_IMETHODIMP +nsLoadGroup::SetNotificationCallbacks(nsIInterfaceRequestor *aCallbacks) +{ + mCallbacks = aCallbacks; return NS_OK; } //////////////////////////////////////////////////////////////////////////////// -nsresult nsLoadGroup::MergeLoadAttributes(nsIRequest *aRequest, nsLoadFlags& outFlags) +nsresult nsLoadGroup::MergeLoadFlags(nsIRequest *aRequest, nsLoadFlags& outFlags) { - nsresult rv; - nsLoadFlags flags, oldFlags; + nsresult rv; + nsLoadFlags flags, oldFlags; - nsCOMPtr aChannel = do_QueryInterface(aRequest, &rv); - if (NS_FAILED(rv)) - return NS_ERROR_FAILURE; + rv = aRequest->GetLoadFlags(&flags); + if (NS_FAILED(rv)) + return rv; - rv = aChannel->GetLoadAttributes(&flags); - if (NS_FAILED(rv)) + oldFlags = flags; + // + // Inherit the group cache validation policy + // + if ( !((nsIRequest::VALIDATE_NEVER | + nsIRequest::VALIDATE_ALWAYS | + nsIRequest::VALIDATE_ONCE_PER_SESSION) & flags) ) { + flags |= (nsIRequest::VALIDATE_NEVER | + nsIRequest::VALIDATE_ALWAYS | + nsIRequest::VALIDATE_ONCE_PER_SESSION) & mLoadFlags; + } + // + // Inherit the group reload policy + // + if (!(nsIRequest::FORCE_VALIDATION & flags)) + flags |= (nsIRequest::FORCE_VALIDATION & mLoadFlags); + if (!(nsIRequest::FORCE_RELOAD & flags)) + flags |= (nsIRequest::FORCE_RELOAD & mLoadFlags); + + // + // Inherit the group persistent cache policy + // + if (!(nsIRequest::INHIBIT_PERSISTENT_CACHING & flags)) + flags |= (nsIRequest::INHIBIT_PERSISTENT_CACHING & mLoadFlags); + + // + // Inherit the group loading policy + // + if (!(nsIRequest::LOAD_BACKGROUND & flags)) + flags |= (nsIRequest::LOAD_BACKGROUND & mLoadFlags); + + if (flags != oldFlags) + rv = aRequest->SetLoadFlags(flags); + + outFlags = flags; return rv; - - oldFlags = flags; - // - // Inherit the group cache validation policy (bits 12-15) - // - if ( !((nsIChannel::VALIDATE_NEVER | - nsIChannel::VALIDATE_ALWAYS | - nsIChannel::VALIDATE_ONCE_PER_SESSION | - nsIChannel::VALIDATE_HEURISTICALLY) & flags)) { - flags |= (nsIChannel::VALIDATE_NEVER | - nsIChannel::VALIDATE_ALWAYS | - nsIChannel::VALIDATE_ONCE_PER_SESSION | - nsIChannel::VALIDATE_HEURISTICALLY) & mDefaultLoadAttributes; - } - // - // Inherit the group reload policy (bits 9-10) - // - if (!(nsIChannel::FORCE_VALIDATION & flags)) { - flags |= (nsIChannel::FORCE_VALIDATION & mDefaultLoadAttributes); - } - - if (!(nsIChannel::FORCE_RELOAD & flags)) { - flags |= (nsIChannel::FORCE_RELOAD & mDefaultLoadAttributes); - } - // - // Inherit the group persistent cache policy (bit 8) - // - if (!(nsIChannel::INHIBIT_PERSISTENT_CACHING & flags)) { - flags |= (nsIChannel::INHIBIT_PERSISTENT_CACHING & mDefaultLoadAttributes); - } - // - // Inherit the group loading policy (bit 0) - // - if (!(nsIChannel::LOAD_BACKGROUND & flags)) { - flags |= (nsIChannel::LOAD_BACKGROUND & mDefaultLoadAttributes); - } - - if (flags != oldFlags) { - rv = aChannel->SetLoadAttributes(flags); - } - - outFlags = flags; - - return rv; } diff --git a/mozilla/netwerk/base/src/nsLoadGroup.h b/mozilla/netwerk/base/src/nsLoadGroup.h index 5c505c9de26..71c20250f1c 100644 --- a/mozilla/netwerk/base/src/nsLoadGroup.h +++ b/mozilla/netwerk/base/src/nsLoadGroup.h @@ -30,6 +30,7 @@ #include "nsCOMPtr.h" #include "nsWeakPtr.h" #include "nsWeakReference.h" +#include "nsIInterfaceRequestor.h" class nsISupportsArray; @@ -59,20 +60,21 @@ protected: virtual ~nsLoadGroup(); nsresult Init(); - nsresult MergeLoadAttributes(nsIRequest *aRequest, nsLoadFlags& flags); + nsresult MergeLoadFlags(nsIRequest *aRequest, nsLoadFlags& flags); protected: - PRUint32 mDefaultLoadAttributes; - PRUint32 mForegroundCount; + PRUint32 mForegroundCount; + PRUint32 mLoadFlags; - nsCOMPtr mDefaultLoadRequest; - nsISupportsArray* mRequests; + nsCOMPtr mLoadGroup; // load groups can contain load groups + nsCOMPtr mCallbacks; - nsWeakPtr mObserver; - // nsCOMPtr mObserver; + nsCOMPtr mDefaultLoadRequest; + nsISupportsArray* mRequests; + + nsWeakPtr mObserver; - nsWeakPtr mGroupListenerFactory; - nsresult mStatus; + nsresult mStatus; }; #endif // nsLoadGroup_h__ diff --git a/mozilla/netwerk/base/src/nsSimpleStreamListener.cpp b/mozilla/netwerk/base/src/nsSimpleStreamListener.cpp index 1b79dfbf835..b7bfff35f11 100644 --- a/mozilla/netwerk/base/src/nsSimpleStreamListener.cpp +++ b/mozilla/netwerk/base/src/nsSimpleStreamListener.cpp @@ -31,11 +31,11 @@ NS_IMPL_ISUPPORTS3(nsSimpleStreamListener, nsISimpleStreamListener, nsIStreamListener, - nsIStreamObserver) + nsIRequestObserver) // //---------------------------------------------------------------------------- -// nsIStreamObserver implementation... +// nsIRequestObserver implementation... //---------------------------------------------------------------------------- // NS_IMETHODIMP @@ -49,11 +49,10 @@ nsSimpleStreamListener::OnStartRequest(nsIRequest *aRequest, NS_IMETHODIMP nsSimpleStreamListener::OnStopRequest(nsIRequest* request, nsISupports *aContext, - nsresult aStatus, - const PRUnichar *aStatusText) + nsresult aStatus) { return mObserver ? - mObserver->OnStopRequest(request, aContext, aStatus, aStatusText) : NS_OK; + mObserver->OnStopRequest(request, aContext, aStatus) : NS_OK; } // @@ -85,7 +84,7 @@ nsSimpleStreamListener::OnDataAvailable(nsIRequest* request, // NS_IMETHODIMP nsSimpleStreamListener::Init(nsIOutputStream *aSink, - nsIStreamObserver *aObserver) + nsIRequestObserver *aObserver) { NS_PRECONDITION(aSink, "null output stream"); diff --git a/mozilla/netwerk/base/src/nsSimpleStreamListener.h b/mozilla/netwerk/base/src/nsSimpleStreamListener.h index 840a826c7ad..3899eb6f050 100644 --- a/mozilla/netwerk/base/src/nsSimpleStreamListener.h +++ b/mozilla/netwerk/base/src/nsSimpleStreamListener.h @@ -1,3 +1,26 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 2001 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * Darin Fisher (original author) + */ + #include "nsIStreamListener.h" #include "nsIOutputStream.h" #include "nsCOMPtr.h" @@ -6,7 +29,7 @@ class nsSimpleStreamListener : public nsISimpleStreamListener { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSISIMPLESTREAMLISTENER @@ -14,6 +37,6 @@ public: virtual ~nsSimpleStreamListener() {} protected: - nsCOMPtr mSink; - nsCOMPtr mObserver; + nsCOMPtr mSink; + nsCOMPtr mObserver; }; diff --git a/mozilla/netwerk/base/src/nsSimpleStreamProvider.cpp b/mozilla/netwerk/base/src/nsSimpleStreamProvider.cpp index 4f1b77ef5a7..2934253b9be 100644 --- a/mozilla/netwerk/base/src/nsSimpleStreamProvider.cpp +++ b/mozilla/netwerk/base/src/nsSimpleStreamProvider.cpp @@ -32,11 +32,11 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsSimpleStreamProvider, nsISimpleStreamProvider, nsIStreamProvider, - nsIStreamObserver) + nsIRequestObserver) // //---------------------------------------------------------------------------- -// nsIStreamObserver implementation... +// nsIRequestObserver implementation... //---------------------------------------------------------------------------- // NS_IMETHODIMP @@ -50,11 +50,10 @@ nsSimpleStreamProvider::OnStartRequest(nsIRequest *request, NS_IMETHODIMP nsSimpleStreamProvider::OnStopRequest(nsIRequest* request, nsISupports *aContext, - nsresult aStatus, - const PRUnichar *aStatusText) + nsresult aStatus) { return mObserver ? - mObserver->OnStopRequest(request, aContext, aStatus, aStatusText) : NS_OK; + mObserver->OnStopRequest(request, aContext, aStatus) : NS_OK; } // @@ -86,7 +85,7 @@ nsSimpleStreamProvider::OnDataWritable(nsIRequest *request, // NS_IMETHODIMP nsSimpleStreamProvider::Init(nsIInputStream *aSource, - nsIStreamObserver *aObserver) + nsIRequestObserver *aObserver) { NS_PRECONDITION(aSource, "null input stream"); diff --git a/mozilla/netwerk/base/src/nsSimpleStreamProvider.h b/mozilla/netwerk/base/src/nsSimpleStreamProvider.h index 0d9e00ac5e8..8496f4b6340 100644 --- a/mozilla/netwerk/base/src/nsSimpleStreamProvider.h +++ b/mozilla/netwerk/base/src/nsSimpleStreamProvider.h @@ -1,3 +1,26 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 2001 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * Darin Fisher (original author) + */ + #include "nsIStreamProvider.h" #include "nsIInputStream.h" #include "nsCOMPtr.h" @@ -6,7 +29,7 @@ class nsSimpleStreamProvider : public nsISimpleStreamProvider { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMPROVIDER NS_DECL_NSISIMPLESTREAMPROVIDER @@ -14,6 +37,6 @@ public: virtual ~nsSimpleStreamProvider() {} protected: - nsCOMPtr mSource; - nsCOMPtr mObserver; + nsCOMPtr mSource; + nsCOMPtr mObserver; }; diff --git a/mozilla/netwerk/base/src/nsSimpleURI.cpp b/mozilla/netwerk/base/src/nsSimpleURI.cpp index 87980a8525e..e0f91074fb5 100644 --- a/mozilla/netwerk/base/src/nsSimpleURI.cpp +++ b/mozilla/netwerk/base/src/nsSimpleURI.cpp @@ -29,6 +29,7 @@ #include "prmem.h" #include "prprf.h" #include "nsURLHelper.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); static NS_DEFINE_CID(kThisSimpleURIImplementationCID, diff --git a/mozilla/netwerk/base/src/nsSocketTransport.cpp b/mozilla/netwerk/base/src/nsSocketTransport.cpp index 9f56a8a577b..05a9b186761 100644 --- a/mozilla/netwerk/base/src/nsSocketTransport.cpp +++ b/mozilla/netwerk/base/src/nsSocketTransport.cpp @@ -1399,7 +1399,7 @@ nsSocketTransport::AsyncRead(nsIStreamListener* aListener, rv = NS_ERROR_IN_PROGRESS; nsCOMPtr listener; - nsCOMPtr observer; + nsCOMPtr observer; if (NS_SUCCEEDED(rv)) { // Proxy the stream listener and observer methods by default. @@ -1413,7 +1413,7 @@ nsSocketTransport::AsyncRead(nsIStreamListener* aListener, observer = do_QueryInterface(listener); } else { - rv = NS_NewStreamObserverProxy(getter_AddRefs(observer), aListener); + rv = NS_NewRequestObserverProxy(getter_AddRefs(observer), aListener); listener = aListener; } } @@ -1476,7 +1476,7 @@ nsSocketTransport::AsyncWrite(nsIStreamProvider* aProvider, rv = NS_ERROR_IN_PROGRESS; nsCOMPtr provider; - nsCOMPtr observer; + nsCOMPtr observer; if (NS_SUCCEEDED(rv)) { // Proxy the stream provider and observer methods by default. @@ -1490,7 +1490,7 @@ nsSocketTransport::AsyncWrite(nsIStreamProvider* aProvider, observer = do_QueryInterface(provider); } else { - rv = NS_NewStreamObserverProxy(getter_AddRefs(observer), aProvider); + rv = NS_NewRequestObserverProxy(getter_AddRefs(observer), aProvider); provider = aProvider; } } @@ -2429,7 +2429,7 @@ nsSocketRequest::OnStop() mObserver->OnStartRequest(this, mContext); mStartFired = PR_TRUE; } - mObserver->OnStopRequest(this, mContext, mStatus, nsnull); + mObserver->OnStopRequest(this, mContext, mStatus); mObserver = 0; mStopFired = PR_TRUE; } @@ -2462,6 +2462,7 @@ nsSocketRequest::GetStatus(nsresult *aResult) NS_IMETHODIMP nsSocketRequest::Cancel(nsresult status) { + NS_BREAK(); if (!mTransport) return NS_ERROR_NOT_INITIALIZED; LOG(("nsSocketRequest: Cancel [this=%x status=%x]\n", this, status)); @@ -2508,6 +2509,32 @@ nsSocketRequest::GetTransport(nsITransport **result) return NS_OK; } +NS_IMETHODIMP +nsSocketRequest::GetLoadGroup(nsILoadGroup **loadGroup) +{ + *loadGroup = nsnull; + return NS_OK; +} + +NS_IMETHODIMP +nsSocketRequest::SetLoadGroup(nsILoadGroup *loadGroup) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsSocketRequest::GetLoadFlags(nsLoadFlags *loadFlags) +{ + *loadFlags = nsIRequest::LOAD_NORMAL; + return NS_OK; +} + +NS_IMETHODIMP +nsSocketRequest::SetLoadFlags(nsLoadFlags loadFlags) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + // //---------------------------------------------------------------------------- // nsSocketReadRequest diff --git a/mozilla/netwerk/base/src/nsSocketTransport.h b/mozilla/netwerk/base/src/nsSocketTransport.h index ba8179c73ab..bbeadfed0e0 100644 --- a/mozilla/netwerk/base/src/nsSocketTransport.h +++ b/mozilla/netwerk/base/src/nsSocketTransport.h @@ -392,7 +392,7 @@ public: PRBool IsCanceled() { return mCanceled; } void SetTransport(nsSocketTransport *); - void SetObserver(nsIStreamObserver *obs) { mObserver = obs; } + void SetObserver(nsIRequestObserver *obs) { mObserver = obs; } void SetContext(nsISupports *ctx) { mContext = ctx; } void SetStatus(nsresult status) { mStatus = status; } @@ -402,14 +402,14 @@ public: virtual nsresult OnStop(); protected: - nsSocketTransport *mTransport; - nsCOMPtr mObserver; - nsCOMPtr mContext; - nsresult mStatus; - PRIntn mSuspendCount; - PRPackedBool mCanceled; - PRPackedBool mStartFired; - PRPackedBool mStopFired; + nsSocketTransport *mTransport; + nsCOMPtr mObserver; + nsCOMPtr mContext; + nsresult mStatus; + PRIntn mSuspendCount; + PRPackedBool mCanceled; + PRPackedBool mStartFired; + PRPackedBool mStopFired; }; /** diff --git a/mozilla/netwerk/base/src/nsSocketTransportService.cpp b/mozilla/netwerk/base/src/nsSocketTransportService.cpp index ff7acd0f296..4e407c65e0d 100644 --- a/mozilla/netwerk/base/src/nsSocketTransportService.cpp +++ b/mozilla/netwerk/base/src/nsSocketTransportService.cpp @@ -29,6 +29,7 @@ #include "nsIServiceManager.h" #include "nsProxiedService.h" #include "nsString.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); diff --git a/mozilla/netwerk/base/src/nsStdURL.cpp b/mozilla/netwerk/base/src/nsStdURL.cpp index 233afc1f48b..16341e8e1fb 100644 --- a/mozilla/netwerk/base/src/nsStdURL.cpp +++ b/mozilla/netwerk/base/src/nsStdURL.cpp @@ -37,6 +37,7 @@ #include "nsIServiceManager.h" #include "nsILocalFile.h" #include "nsEscape.h" +#include "nsNetCID.h" #if defined(XP_PC) && !defined(XP_OS2) #include diff --git a/mozilla/netwerk/base/src/nsStorageTransport.cpp b/mozilla/netwerk/base/src/nsStorageTransport.cpp index 157928359bb..65c49aeee1a 100644 --- a/mozilla/netwerk/base/src/nsStorageTransport.cpp +++ b/mozilla/netwerk/base/src/nsStorageTransport.cpp @@ -469,7 +469,7 @@ nsStorageTransport::nsReadRequest::Process() mTransport->ReadRequestCompleted(this); // no need to proxy this callback - (void) mListener->OnStopRequest(this, mListenerContext, mStatus, nsnull); + (void) mListener->OnStopRequest(this, mListenerContext, mStatus); } else mWaitingForWrite = PR_TRUE; @@ -481,7 +481,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS5(nsStorageTransport::nsReadRequest, nsITransportRequest, nsIRequest, nsIStreamListener, - nsIStreamObserver, + nsIRequestObserver, nsIInputStream) NS_IMETHODIMP @@ -536,6 +536,32 @@ nsStorageTransport::nsReadRequest::Resume() return NS_ERROR_NOT_IMPLEMENTED; } +NS_IMETHODIMP +nsStorageTransport::nsReadRequest::GetLoadGroup(nsILoadGroup **loadGroup) +{ + *loadGroup = nsnull; + return NS_OK; +} + +NS_IMETHODIMP +nsStorageTransport::nsReadRequest::SetLoadGroup(nsILoadGroup *loadGroup) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsStorageTransport::nsReadRequest::GetLoadFlags(nsLoadFlags *loadFlags) +{ + *loadFlags = nsIRequest::LOAD_NORMAL; + return NS_OK; +} + +NS_IMETHODIMP +nsStorageTransport::nsReadRequest::SetLoadFlags(nsLoadFlags loadFlags) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + NS_IMETHODIMP nsStorageTransport::nsReadRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) @@ -546,9 +572,8 @@ nsStorageTransport::nsReadRequest::OnStartRequest(nsIRequest *aRequest, NS_IMETHODIMP nsStorageTransport::nsReadRequest::OnStopRequest(nsIRequest *aRequest, - nsISupports *aContext, - nsresult aStatus, - const PRUnichar *aStatusText) + nsISupports *aContext, + nsresult aStatus) { NS_NOTREACHED("nsStorageTransport::nsReadRequest::OnStopRequest"); return NS_ERROR_FAILURE; diff --git a/mozilla/netwerk/base/src/nsStorageTransport.h b/mozilla/netwerk/base/src/nsStorageTransport.h index e1f1faf6112..2db6921918b 100644 --- a/mozilla/netwerk/base/src/nsStorageTransport.h +++ b/mozilla/netwerk/base/src/nsStorageTransport.h @@ -66,7 +66,7 @@ public: /* internal */ NS_DECL_NSITRANSPORTREQUEST NS_DECL_NSIREQUEST NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIINPUTSTREAM nsReadRequest(); diff --git a/mozilla/netwerk/base/src/nsStreamListenerProxy.cpp b/mozilla/netwerk/base/src/nsStreamListenerProxy.cpp index 40dffd17d80..7791e2eaf5a 100644 --- a/mozilla/netwerk/base/src/nsStreamListenerProxy.cpp +++ b/mozilla/netwerk/base/src/nsStreamListenerProxy.cpp @@ -26,13 +26,17 @@ #include "nsIInputStream.h" #include "nsIPipe.h" #include "nsAutoLock.h" +#include "prlog.h" -#define LOG(args) PR_LOG(gStreamProxyLog, PR_LOG_DEBUG, args) +#if defined(PR_LOGGING) +static PRLogModuleInfo *gStreamListenerProxyLog; +#endif + +#define LOG(args) PR_LOG(gStreamListenerProxyLog, PR_LOG_DEBUG, args) #define DEFAULT_BUFFER_SEGMENT_SIZE 2048 #define DEFAULT_BUFFER_MAX_SIZE (4*2048) -// //---------------------------------------------------------------------------- // Design Overview // @@ -49,20 +53,19 @@ // XXX The current design does NOT allow the request to be "externally" // suspended!! For the moment this is not a problem, but it should be fixed. //---------------------------------------------------------------------------- -// -// //---------------------------------------------------------------------------- // nsStreamListenerProxy implementation... //---------------------------------------------------------------------------- -// nsStreamListenerProxy::nsStreamListenerProxy() : mLock(nsnull) , mPendingCount(0) , mPipeEmptied(PR_FALSE) , mListenerStatus(NS_OK) -{ } +{ + NS_INIT_ISUPPORTS(); +} nsStreamListenerProxy::~nsStreamListenerProxy() { @@ -70,6 +73,14 @@ nsStreamListenerProxy::~nsStreamListenerProxy() PR_DestroyLock(mLock); mLock = nsnull; } + NS_IF_RELEASE(mObserverProxy); +} + +nsresult +nsStreamListenerProxy::GetListener(nsIStreamListener **listener) +{ + NS_ENSURE_TRUE(mObserverProxy, NS_ERROR_NOT_INITIALIZED); + return CallQueryInterface(mObserverProxy->Observer(), listener); } PRUint32 @@ -78,178 +89,171 @@ nsStreamListenerProxy::GetPendingCount() return PR_AtomicSet((PRInt32 *) &mPendingCount, 0); } -// //---------------------------------------------------------------------------- // nsOnDataAvailableEvent internal class... //---------------------------------------------------------------------------- -// -class nsOnDataAvailableEvent : public nsStreamObserverEvent + +class nsOnDataAvailableEvent : public nsARequestObserverEvent { public: - nsOnDataAvailableEvent(nsStreamProxyBase *aProxy, - nsIRequest *aRequest, - nsISupports *aContext, - nsIInputStream *aSource, - PRUint32 aOffset) - : nsStreamObserverEvent(aProxy, aRequest, aContext) - , mSource(aSource) - , mOffset(aOffset) + nsOnDataAvailableEvent(nsStreamListenerProxy *proxy, + nsIRequest *request, + nsISupports *context, + nsIInputStream *source, + PRUint32 offset) + : nsARequestObserverEvent(request, context) + , mProxy(proxy) + , mSource(source) + , mOffset(offset) { MOZ_COUNT_CTOR(nsOnDataAvailableEvent); + NS_PRECONDITION(mProxy, "null pointer"); + NS_ADDREF(mProxy); } ~nsOnDataAvailableEvent() { MOZ_COUNT_DTOR(nsOnDataAvailableEvent); + NS_RELEASE(mProxy); } - NS_IMETHOD HandleEvent(); + void HandleEvent(); protected: - nsCOMPtr mSource; - PRUint32 mOffset; + nsStreamListenerProxy *mProxy; + nsCOMPtr mSource; + PRUint32 mOffset; }; -NS_IMETHODIMP +void nsOnDataAvailableEvent::HandleEvent() { - LOG(("nsOnDataAvailableEvent: HandleEvent [event=%x, chan=%x]", this, mRequest.get())); + LOG(("nsOnDataAvailableEvent: HandleEvent [req=%x]", mRequest.get())); - nsStreamListenerProxy *listenerProxy = - NS_STATIC_CAST(nsStreamListenerProxy *, mProxy); - - if (NS_FAILED(listenerProxy->GetListenerStatus())) { - LOG(("nsOnDataAvailableEvent: Discarding event [listener_status=%x, chan=%x]\n", - listenerProxy->GetListenerStatus(), mRequest.get())); - return NS_ERROR_FAILURE; - } - - nsCOMPtr listener = listenerProxy->GetListener(); - if (!listener) { - LOG(("nsOnDataAvailableEvent: Already called OnStopRequest (listener is NULL), [chan=%x]\n", - mRequest.get())); - return NS_ERROR_FAILURE; + if (NS_FAILED(mProxy->GetListenerStatus())) { + LOG(("nsOnDataAvailableEvent: Discarding event [listener_status=%x, req=%x]\n", + mProxy->GetListenerStatus(), mRequest.get())); + return; } nsresult status = NS_OK; nsresult rv = mRequest->GetStatus(&status); NS_ASSERTION(NS_SUCCEEDED(rv), "GetStatus failed"); - // // We should only forward this event to the listener if the request is // still in a "good" state. Because these events are being processed // asynchronously, there is a very real chance that the listener might // have cancelled the request after _this_ event was triggered. - // - if (NS_SUCCEEDED(status)) { - // - // Find out from the listener proxy how many bytes to report. - // - PRUint32 count = listenerProxy->GetPendingCount(); + + if (NS_FAILED(status)) { + LOG(("nsOnDataAvailableEvent: Not calling OnDataAvailable [req=%x]", + mRequest.get())); + return; + } + + // Find out from the listener proxy how many bytes to report. + PRUint32 count = mProxy->GetPendingCount(); #if defined(PR_LOGGING) - { - PRUint32 avail; - mSource->Available(&avail); - LOG(("nsOnDataAvailableEvent: Calling the consumer's OnDataAvailable " - "[offset=%u count=%u avail=%u chan=%x]\n", - mOffset, count, avail, mRequest.get())); - } + { + PRUint32 avail; + mSource->Available(&avail); + LOG(("nsOnDataAvailableEvent: Calling the consumer's OnDataAvailable " + "[offset=%u count=%u avail=%u req=%x]\n", + mOffset, count, avail, mRequest.get())); + } #endif - // Forward call to listener - rv = listener->OnDataAvailable(mRequest, mContext, mSource, mOffset, count); + nsCOMPtr listener; + rv = mProxy->GetListener(getter_AddRefs(listener)); - LOG(("nsOnDataAvailableEvent: Done with the consumer's OnDataAvailable " - "[rv=%x, chan=%x]\n", - rv, mRequest.get())); + // Forward call to listener + if (listener) + rv = listener->OnDataAvailable(mRequest, mContext, + mSource, mOffset, count); - // - // XXX Need to suspend the underlying request... must consider - // other pending events (such as OnStopRequest). These - // should not be forwarded to the listener if the request - // is suspended. Also, handling the Resume could be tricky. - // - if (rv == NS_BASE_STREAM_WOULD_BLOCK) { - NS_NOTREACHED("listener returned NS_BASE_STREAM_WOULD_BLOCK" - " -- support for this is not implemented"); - rv = NS_ERROR_NOT_IMPLEMENTED; - } + LOG(("nsOnDataAvailableEvent: Done with the consumer's OnDataAvailable " + "[rv=%x, req=%x]\n", rv, mRequest.get())); - // Cancel the request on unexpected errors - if (NS_FAILED(rv) && (rv != NS_BASE_STREAM_CLOSED)) { - LOG(("OnDataAvailable failed [rv=%x] canceling request!\n")); - mRequest->Cancel(rv); - } + // XXX Need to suspend the underlying request... must consider + // other pending events (such as OnStopRequest). These + // should not be forwarded to the listener if the request + // is suspended. Also, handling the Resume could be tricky. - // - // Update the listener status - // - listenerProxy->SetListenerStatus(rv); + if (rv == NS_BASE_STREAM_WOULD_BLOCK) { + NS_NOTREACHED("listener returned NS_BASE_STREAM_WOULD_BLOCK" + " -- support for this is not implemented"); + rv = NS_BINDING_FAILED; } - else - LOG(("nsOnDataAvailableEvent: Not calling OnDataAvailable [chan=%x]", - mRequest.get())); - return NS_OK; + + // Cancel the request on unexpected errors + if (NS_FAILED(rv) && (rv != NS_BASE_STREAM_CLOSED)) { + LOG(("OnDataAvailable failed [rv=%x] canceling request!\n")); + mRequest->Cancel(rv); + } + + mProxy->SetListenerStatus(rv); } -// //---------------------------------------------------------------------------- -// nsISupports implementation... +// nsStreamListenerProxy::nsISupports implementation... //---------------------------------------------------------------------------- -// -NS_IMPL_ISUPPORTS_INHERITED3(nsStreamListenerProxy, - nsStreamProxyBase, - nsIStreamListenerProxy, - nsIStreamListener, - nsIInputStreamObserver) -// +NS_IMPL_THREADSAFE_ISUPPORTS4(nsStreamListenerProxy, + nsIStreamListener, + nsIRequestObserver, + nsIStreamListenerProxy, + nsIInputStreamObserver) + //---------------------------------------------------------------------------- -// nsIStreamObserver implementation... +// nsStreamListenerProxy::nsIRequestObserver implementation... //---------------------------------------------------------------------------- -// + NS_IMETHODIMP -nsStreamListenerProxy::OnStartRequest(nsIRequest *aRequest, - nsISupports *aContext) +nsStreamListenerProxy::OnStartRequest(nsIRequest *request, + nsISupports *context) { + NS_ENSURE_TRUE(mObserverProxy, NS_ERROR_NOT_INITIALIZED); + + // This will create a cyclic reference between the pipe and |this|, which + // will be broken when onStopRequest is called. nsresult rv = mPipeIn->SetObserver(this); if (NS_FAILED(rv)) return rv; - return nsStreamProxyBase::OnStartRequest(aRequest, aContext); + return mObserverProxy->OnStartRequest(request, context); } NS_IMETHODIMP -nsStreamListenerProxy::OnStopRequest(nsIRequest *aRequest, - nsISupports *aContext, - nsresult aStatus, - const PRUnichar *aStatusText) +nsStreamListenerProxy::OnStopRequest(nsIRequest *request, + nsISupports *context, + nsresult status) { + NS_ENSURE_TRUE(mObserverProxy, NS_ERROR_NOT_INITIALIZED); + mPipeIn = 0; mPipeOut = 0; - return nsStreamProxyBase::OnStopRequest(aRequest, aContext, - aStatus, aStatusText); + return mObserverProxy->OnStopRequest(request, context, status); } -// //---------------------------------------------------------------------------- // nsIStreamListener implementation... //---------------------------------------------------------------------------- -// + NS_IMETHODIMP -nsStreamListenerProxy::OnDataAvailable(nsIRequest *aRequest, - nsISupports *aContext, - nsIInputStream *aSource, - PRUint32 aOffset, - PRUint32 aCount) +nsStreamListenerProxy::OnDataAvailable(nsIRequest *request, + nsISupports *context, + nsIInputStream *source, + PRUint32 offset, + PRUint32 count) { nsresult rv; PRUint32 bytesWritten=0; - LOG(("nsStreamListenerProxy: OnDataAvailable [offset=%u count=%u chan=%x]\n", - aOffset, aCount, aRequest)); + LOG(("nsStreamListenerProxy: OnDataAvailable [offset=%u count=%u req=%x]\n", + offset, count, request)); + NS_ENSURE_TRUE(mObserverProxy, NS_ERROR_NOT_INITIALIZED); NS_PRECONDITION(mRequestToResume == 0, "Unexpected call to OnDataAvailable"); NS_PRECONDITION(mPipeIn, "Pipe not initialized"); NS_PRECONDITION(mPipeOut, "Pipe not initialized"); @@ -260,7 +264,8 @@ nsStreamListenerProxy::OnDataAvailable(nsIRequest *aRequest, { nsresult status = mListenerStatus; if (NS_FAILED(status)) { - LOG(("nsStreamListenerProxy: Listener failed [status=%x chan=%x]\n", status, aRequest)); + LOG(("nsStreamListenerProxy: Listener failed [status=%x req=%x]\n", + status, request)); return status; } } @@ -275,25 +280,25 @@ nsStreamListenerProxy::OnDataAvailable(nsIRequest *aRequest, // that the pipe was emptied during this time, we retry copying data // into the pipe. // - rv = mPipeOut->WriteFrom(aSource, aCount, &bytesWritten); + rv = mPipeOut->WriteFrom(source, count, &bytesWritten); - LOG(("nsStreamListenerProxy: Wrote data to pipe [rv=%x count=%u bytesWritten=%u chan=%x]\n", - rv, aCount, bytesWritten, aRequest)); + LOG(("nsStreamListenerProxy: Wrote data to pipe [rv=%x count=%u bytesWritten=%u req=%x]\n", + rv, count, bytesWritten, request)); if (NS_FAILED(rv)) { if (rv == NS_BASE_STREAM_WOULD_BLOCK) { nsAutoLock lock(mLock); if (mPipeEmptied) { - LOG(("nsStreamListenerProxy: Pipe emptied; looping back [chan=%x]\n", aRequest)); + LOG(("nsStreamListenerProxy: Pipe emptied; looping back [req=%x]\n", request)); continue; } - LOG(("nsStreamListenerProxy: Pipe full; setting request to resume [chan=%x]\n", aRequest)); - mRequestToResume = aRequest; + LOG(("nsStreamListenerProxy: Pipe full; setting request to resume [req=%x]\n", request)); + mRequestToResume = request; } return rv; } if (bytesWritten == 0) { - LOG(("nsStreamListenerProxy: Copied zero bytes; not posting an event [chan=%x]\n", aRequest)); + LOG(("nsStreamListenerProxy: Copied zero bytes; not posting an event [req=%x]\n", request)); return NS_OK; } @@ -306,8 +311,8 @@ nsStreamListenerProxy::OnDataAvailable(nsIRequest *aRequest, // PRUint32 total = PR_AtomicAdd((PRInt32 *) &mPendingCount, bytesWritten); if (total > bytesWritten) { - LOG(("nsStreamListenerProxy: Piggy-backing pending event [total=%u, chan=%x]\n", - total, aRequest)); + LOG(("nsStreamListenerProxy: Piggy-backing pending event [total=%u, req=%x]\n", + total, request)); return NS_OK; } @@ -315,66 +320,73 @@ nsStreamListenerProxy::OnDataAvailable(nsIRequest *aRequest, // Post an event for the number of bytes actually written. // nsOnDataAvailableEvent *ev = - new nsOnDataAvailableEvent(this, aRequest, aContext, mPipeIn, aOffset); + new nsOnDataAvailableEvent(this, request, context, mPipeIn, offset); if (!ev) return NS_ERROR_OUT_OF_MEMORY; - rv = ev->FireEvent(GetEventQueue()); - if (NS_FAILED(rv)) { + // Reuse the event queue of the observer proxy + rv = mObserverProxy->FireEvent(ev); + if (NS_FAILED(rv)) delete ev; - return rv; - } - return NS_OK; + return rv; } -// //---------------------------------------------------------------------------- -// nsIStreamListenerProxy implementation... +// nsStreamListenerProxy::nsIStreamListenerProxy implementation... //---------------------------------------------------------------------------- -// + NS_IMETHODIMP -nsStreamListenerProxy::Init(nsIStreamListener *aListener, - nsIEventQueue *aEventQ, - PRUint32 aBufferSegmentSize, - PRUint32 aBufferMaxSize) +nsStreamListenerProxy::Init(nsIStreamListener *listener, + nsIEventQueue *eventQ, + PRUint32 bufferSegmentSize, + PRUint32 bufferMaxSize) { - NS_PRECONDITION(GetReceiver() == nsnull, "Listener already set"); - NS_PRECONDITION(GetEventQueue() == nsnull, "Event queue already set"); + NS_ENSURE_ARG_POINTER(listener); + +#if defined(PR_LOGGING) + if (!gStreamListenerProxyLog) + gStreamListenerProxyLog = PR_NewLogModule("nsStreamListenerProxy"); +#endif // - // Create the ChannelToResume lock + // Create the RequestToResume lock // mLock = PR_NewLock(); if (!mLock) return NS_ERROR_OUT_OF_MEMORY; + // + // Create the request observer proxy + // + mObserverProxy = new nsRequestObserverProxy(); + if (!mObserverProxy) return NS_ERROR_OUT_OF_MEMORY; + NS_ADDREF(mObserverProxy); + // // Create the pipe // - if (aBufferSegmentSize == 0) - aBufferSegmentSize = DEFAULT_BUFFER_SEGMENT_SIZE; - if (aBufferMaxSize == 0) - aBufferMaxSize = DEFAULT_BUFFER_MAX_SIZE; + if (bufferSegmentSize == 0) + bufferSegmentSize = DEFAULT_BUFFER_SEGMENT_SIZE; + if (bufferMaxSize == 0) + bufferMaxSize = DEFAULT_BUFFER_MAX_SIZE; // The segment size must not exceed the maximum - aBufferSegmentSize = PR_MIN(aBufferMaxSize, aBufferSegmentSize); + bufferSegmentSize = PR_MIN(bufferMaxSize, bufferSegmentSize); nsresult rv = NS_NewPipe(getter_AddRefs(mPipeIn), getter_AddRefs(mPipeOut), - aBufferSegmentSize, - aBufferMaxSize, + bufferSegmentSize, + bufferMaxSize, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) return rv; - nsCOMPtr observer = do_QueryInterface(aListener); - SetReceiver(observer); - return SetEventQueue(aEventQ); + nsCOMPtr observer = do_QueryInterface(listener); + return mObserverProxy->Init(observer, eventQ); } -// //---------------------------------------------------------------------------- -// nsIInputStreamObserver implementation... +// nsStreamListenerProxy::nsIInputStreamObserver implementation... //---------------------------------------------------------------------------- -// + NS_IMETHODIMP -nsStreamListenerProxy::OnEmpty(nsIInputStream *aInputStream) +nsStreamListenerProxy::OnEmpty(nsIInputStream *inputStream) { LOG(("nsStreamListenerProxy: OnEmpty\n")); // diff --git a/mozilla/netwerk/base/src/nsStreamListenerProxy.h b/mozilla/netwerk/base/src/nsStreamListenerProxy.h index 99265db8752..859edf84571 100644 --- a/mozilla/netwerk/base/src/nsStreamListenerProxy.h +++ b/mozilla/netwerk/base/src/nsStreamListenerProxy.h @@ -1,20 +1,42 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 2001 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * Darin Fisher (original author) + */ + #ifndef nsStreamListenerProxy_h__ #define nsStreamListenerProxy_h__ -#include "nsStreamObserverProxy.h" +#include "nsRequestObserverProxy.h" #include "nsIStreamListener.h" -#include "nsIChannel.h" #include "nsIInputStream.h" #include "nsIOutputStream.h" +#include "nsIRequest.h" #include "nsCOMPtr.h" -class nsStreamListenerProxy : public nsStreamProxyBase - , public nsIStreamListenerProxy +class nsStreamListenerProxy : public nsIStreamListenerProxy , public nsIInputStreamObserver { public: - NS_DECL_ISUPPORTS_INHERITED - NS_DECL_NSISTREAMOBSERVER + NS_DECL_ISUPPORTS + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSISTREAMLISTENERPROXY NS_DECL_NSIINPUTSTREAMOBSERVER @@ -22,31 +44,24 @@ public: nsStreamListenerProxy(); virtual ~nsStreamListenerProxy(); - nsIStreamListener *GetListener() - { - return NS_STATIC_CAST(nsIStreamListener *, GetReceiver()); - } + nsresult GetListener(nsIStreamListener **); - void SetListenerStatus(nsresult status) - { - mListenerStatus = status; - } - - nsresult GetListenerStatus() - { - return mListenerStatus; - } + void SetListenerStatus(nsresult status) { mListenerStatus = status; } + nsresult GetListenerStatus() { return mListenerStatus; } PRUint32 GetPendingCount(); protected: - nsCOMPtr mPipeIn; - nsCOMPtr mPipeOut; - nsCOMPtr mRequestToResume; - PRLock *mLock; - PRUint32 mPendingCount; - PRBool mPipeEmptied; - nsresult mListenerStatus; + nsRequestObserverProxy *mObserverProxy; + + nsCOMPtr mPipeIn; + nsCOMPtr mPipeOut; + + nsCOMPtr mRequestToResume; + PRLock *mLock; + PRUint32 mPendingCount; + PRBool mPipeEmptied; + nsresult mListenerStatus; }; -#endif /* !nsStreamListenerProxy_h__ */ +#endif // nsStreamListenerProxy_h__ diff --git a/mozilla/netwerk/base/src/nsStreamListenerTee.cpp b/mozilla/netwerk/base/src/nsStreamListenerTee.cpp index 453dfc7bbd4..d47a3684af1 100644 --- a/mozilla/netwerk/base/src/nsStreamListenerTee.cpp +++ b/mozilla/netwerk/base/src/nsStreamListenerTee.cpp @@ -15,13 +15,12 @@ nsStreamListenerTee::OnStartRequest(nsIRequest *request, NS_IMETHODIMP nsStreamListenerTee::OnStopRequest(nsIRequest *request, nsISupports *context, - nsresult status, - const PRUnichar *statusText) + nsresult status) { NS_ENSURE_TRUE(mListener, NS_ERROR_NOT_INITIALIZED); mInputTee = 0; mSink = 0; - return mListener->OnStopRequest(request, context, status, statusText); + return mListener->OnStopRequest(request, context, status); } NS_IMETHODIMP diff --git a/mozilla/netwerk/base/src/nsStreamListenerTee.h b/mozilla/netwerk/base/src/nsStreamListenerTee.h index 4586caf3224..97eb5d18504 100644 --- a/mozilla/netwerk/base/src/nsStreamListenerTee.h +++ b/mozilla/netwerk/base/src/nsStreamListenerTee.h @@ -10,7 +10,7 @@ class nsStreamListenerTee : public nsIStreamListenerTee { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSISTREAMLISTENERTEE diff --git a/mozilla/netwerk/base/src/nsStreamLoader.cpp b/mozilla/netwerk/base/src/nsStreamLoader.cpp index d85268315bd..97894822062 100644 --- a/mozilla/netwerk/base/src/nsStreamLoader.cpp +++ b/mozilla/netwerk/base/src/nsStreamLoader.cpp @@ -79,7 +79,7 @@ nsStreamLoader::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) } NS_IMPL_ISUPPORTS3(nsStreamLoader, nsIStreamLoader, - nsIStreamObserver, nsIStreamListener) + nsIRequestObserver, nsIStreamListener) NS_IMETHODIMP nsStreamLoader::GetNumBytesRead(PRUint32* aNumBytes) @@ -111,7 +111,7 @@ nsStreamLoader::OnStartRequest(nsIRequest* request, nsISupports *ctxt) NS_IMETHODIMP nsStreamLoader::OnStopRequest(nsIRequest* request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsresult rv; mRequest = request; diff --git a/mozilla/netwerk/base/src/nsStreamLoader.h b/mozilla/netwerk/base/src/nsStreamLoader.h index 3d8deaa6c2d..3aa523950a8 100644 --- a/mozilla/netwerk/base/src/nsStreamLoader.h +++ b/mozilla/netwerk/base/src/nsStreamLoader.h @@ -34,7 +34,7 @@ class nsStreamLoader : public nsIStreamLoader, public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMLOADER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsStreamLoader() { NS_INIT_REFCNT();} ; diff --git a/mozilla/netwerk/base/src/nsStreamProviderProxy.cpp b/mozilla/netwerk/base/src/nsStreamProviderProxy.cpp index 499b3c3b72c..14a3076a7b4 100644 --- a/mozilla/netwerk/base/src/nsStreamProviderProxy.cpp +++ b/mozilla/netwerk/base/src/nsStreamProviderProxy.cpp @@ -23,13 +23,18 @@ #include "nsStreamProviderProxy.h" #include "nsIPipe.h" +#include "nsIRequest.h" +#include "prlog.h" -#define LOG(args) PR_LOG(gStreamProxyLog, PR_LOG_DEBUG, args) +#if defined(PR_LOGGING) +static PRLogModuleInfo *gStreamProviderProxyLog; +#endif + +#define LOG(args) PR_LOG(gStreamProviderProxyLog, PR_LOG_DEBUG, args) #define DEFAULT_BUFFER_SEGMENT_SIZE 2048 #define DEFAULT_BUFFER_MAX_SIZE (4*2048) -// //---------------------------------------------------------------------------- // Design Overview // @@ -42,64 +47,68 @@ // The request is only resumed once the event has been successfully handled; // meaning that data has been written to the pipe. //---------------------------------------------------------------------------- -// nsStreamProviderProxy::nsStreamProviderProxy() : mProviderStatus(NS_OK) -{ } +{ + NS_INIT_ISUPPORTS(); +} nsStreamProviderProxy::~nsStreamProviderProxy() -{ } +{ + NS_IF_RELEASE(mObserverProxy); +} + +nsresult +nsStreamProviderProxy::GetProvider(nsIStreamProvider **provider) +{ + NS_ENSURE_TRUE(mObserverProxy, NS_ERROR_NOT_INITIALIZED); + return CallQueryInterface(mObserverProxy->Observer(), provider); +} -// //---------------------------------------------------------------------------- // nsOnDataWritableEvent internal class... //---------------------------------------------------------------------------- -// -class nsOnDataWritableEvent : public nsStreamObserverEvent + +class nsOnDataWritableEvent : public nsARequestObserverEvent { public: - nsOnDataWritableEvent(nsStreamProxyBase *aProxy, - nsIRequest *aRequest, - nsISupports *aContext, - nsIOutputStream *aSink, - PRUint32 aOffset, - PRUint32 aCount) - : nsStreamObserverEvent(aProxy, aRequest, aContext) - , mSink(aSink) - , mOffset(aOffset) - , mCount(aCount) + nsOnDataWritableEvent(nsStreamProviderProxy *proxy, + nsIRequest *request, + nsISupports *context, + nsIOutputStream *sink, + PRUint32 offset, + PRUint32 count) + : nsARequestObserverEvent(request, context) + , mProxy(proxy) + , mSink(sink) + , mOffset(offset) + , mCount(count) { MOZ_COUNT_CTOR(nsOnDataWritableEvent); + NS_PRECONDITION(mProxy, "null pointer"); + NS_ADDREF(mProxy); } ~nsOnDataWritableEvent() { MOZ_COUNT_DTOR(nsOnDataWritableEvent); + NS_RELEASE(mProxy); } - NS_IMETHOD HandleEvent(); + void HandleEvent(); protected: - nsCOMPtr mSink; - PRUint32 mOffset; - PRUint32 mCount; + nsStreamProviderProxy *mProxy; + nsCOMPtr mSink; + PRUint32 mOffset; + PRUint32 mCount; }; -NS_IMETHODIMP +void nsOnDataWritableEvent::HandleEvent() { - LOG(("nsOnDataWritableEvent: HandleEvent [event=%x chan=%x]", - this, mRequest.get())); - - nsStreamProviderProxy *providerProxy = - NS_STATIC_CAST(nsStreamProviderProxy *, mProxy); - - nsCOMPtr provider = providerProxy->GetProvider(); - if (!provider) { - LOG(("nsOnDataWritableEvent: Already called OnStopRequest (provider is NULL)\n")); - return NS_ERROR_FAILURE; - } + LOG(("nsOnDataWritableEvent::HandleEvent [req=%x]", mRequest.get())); nsresult status = NS_OK; nsresult rv = mRequest->GetStatus(&status); @@ -111,72 +120,75 @@ nsOnDataWritableEvent::HandleEvent() // asynchronously, there is a very real chance that the provider might // have cancelled the request after _this_ event was triggered. // - if (NS_SUCCEEDED(status)) { - LOG(("nsOnDataWritableEvent: Calling the consumer's OnDataWritable\n")); - rv = provider->OnDataWritable(mRequest, mContext, mSink, mOffset, mCount); - LOG(("nsOnDataWritableEvent: Done with the consumer's OnDataWritable [rv=%x]\n", rv)); - - // - // Mask NS_BASE_STREAM_WOULD_BLOCK return values. - // - providerProxy->SetProviderStatus( - rv != NS_BASE_STREAM_WOULD_BLOCK ? rv : NS_OK); - - // - // The request is already suspended, so unless the provider returned - // NS_BASE_STREAM_WOULD_BLOCK, we should wake up the request. - // - if (rv != NS_BASE_STREAM_WOULD_BLOCK) - mRequest->Resume(); - } - else + if (NS_FAILED(status)) { LOG(("nsOnDataWritableEvent: Not calling OnDataWritable")); - return NS_OK; + return; + } + + LOG(("nsOnDataWritableEvent: Calling the consumer's OnDataWritable\n")); + + nsCOMPtr provider; + rv = mProxy->GetProvider(getter_AddRefs(provider)); + + if (provider) + rv = provider->OnDataWritable(mRequest, mContext, + mSink, mOffset, mCount); + + LOG(("nsOnDataWritableEvent: Done with the consumer's OnDataWritable " + "[rv=%x]\n", rv)); + + // + // Mask NS_BASE_STREAM_WOULD_BLOCK return values. + // + mProxy->SetProviderStatus(rv != NS_BASE_STREAM_WOULD_BLOCK ? rv : NS_OK); + + // + // The request is already suspended, so unless the provider returned + // NS_BASE_STREAM_WOULD_BLOCK, we should wake up the request. + // + if (rv != NS_BASE_STREAM_WOULD_BLOCK) + mRequest->Resume(); } -// //---------------------------------------------------------------------------- -// nsISupports implementation... +// nsStreamProviderProxy::nsISupports implementation... //---------------------------------------------------------------------------- -// -NS_IMPL_ISUPPORTS_INHERITED2(nsStreamProviderProxy, - nsStreamProxyBase, - nsIStreamProviderProxy, - nsIStreamProvider) -// +NS_IMPL_THREADSAFE_ISUPPORTS3(nsStreamProviderProxy, + nsIStreamProvider, + nsIRequestObserver, + nsIStreamProviderProxy) + //---------------------------------------------------------------------------- -// nsIStreamObserver implementation... +// nsStreamProviderProxy::nsIRequestObserver implementation... //---------------------------------------------------------------------------- -// + NS_IMETHODIMP nsStreamProviderProxy::OnStartRequest(nsIRequest *request, - nsISupports *aContext) + nsISupports *context) { - return nsStreamProxyBase::OnStartRequest(request, aContext); + NS_ENSURE_TRUE(mObserverProxy, NS_ERROR_NOT_INITIALIZED); + return mObserverProxy->OnStartRequest(request, context); } NS_IMETHODIMP nsStreamProviderProxy::OnStopRequest(nsIRequest* request, - nsISupports *aContext, - nsresult aStatus, - const PRUnichar *aStatusText) + nsISupports *context, + nsresult status) { - // + NS_ENSURE_TRUE(mObserverProxy, NS_ERROR_NOT_INITIALIZED); + // Close the pipe - // mPipeIn = 0; mPipeOut = 0; - return nsStreamProxyBase::OnStopRequest(request, aContext, - aStatus, aStatusText); + return mObserverProxy->OnStopRequest(request, context, status); } -// //---------------------------------------------------------------------------- -// nsIStreamProvider implementation... +// nsStreamProviderProxy::nsIStreamProvider implementation... //---------------------------------------------------------------------------- -// + static NS_METHOD nsWriteToSink(nsIInputStream *source, void *closure, @@ -190,18 +202,19 @@ nsWriteToSink(nsIInputStream *source, } NS_IMETHODIMP -nsStreamProviderProxy::OnDataWritable(nsIRequest *aRequest, - nsISupports *aContext, - nsIOutputStream *aSink, - PRUint32 aOffset, - PRUint32 aCount) +nsStreamProviderProxy::OnDataWritable(nsIRequest *request, + nsISupports *context, + nsIOutputStream *sink, + PRUint32 offset, + PRUint32 count) { nsresult rv; LOG(("nsStreamProviderProxy: OnDataWritable [offset=%u, count=%u]\n", - aOffset, aCount)); + offset, count)); - NS_PRECONDITION(aCount > 0, "Invalid parameter"); + NS_ENSURE_TRUE(mObserverProxy, NS_ERROR_NOT_INITIALIZED); + NS_PRECONDITION(count > 0, "Invalid parameter"); NS_PRECONDITION(mPipeIn, "Pipe not initialized"); NS_PRECONDITION(mPipeOut, "Pipe not initialized"); NS_PRECONDITION(mProviderStatus != NS_BASE_STREAM_WOULD_BLOCK, @@ -217,17 +230,17 @@ nsStreamProviderProxy::OnDataWritable(nsIRequest *aRequest, // // Provide the request with whatever data is already in the pipe (not - // exceeding aCount). + // exceeding count). // - PRUint32 count; - rv = mPipeIn->Available(&count); + PRUint32 amount; + rv = mPipeIn->Available(&amount); if (NS_FAILED(rv)) return rv; - if (count > 0) { - count = PR_MIN(count, aCount); + if (amount > 0) { + amount = PR_MIN(amount, count); PRUint32 bytesWritten; - rv = mPipeIn->ReadSegments(nsWriteToSink, aSink, count, &bytesWritten); + rv = mPipeIn->ReadSegments(nsWriteToSink, sink, amount, &bytesWritten); if (NS_FAILED(rv)) return rv; return NS_OK; @@ -237,12 +250,12 @@ nsStreamProviderProxy::OnDataWritable(nsIRequest *aRequest, // Post an event requesting the provider for more data. // nsOnDataWritableEvent *ev = - new nsOnDataWritableEvent(this, aRequest, aContext, - mPipeOut, aOffset, aCount); + new nsOnDataWritableEvent(this, request, context, mPipeOut, offset, count); if (!ev) return NS_ERROR_OUT_OF_MEMORY; - rv = ev->FireEvent(GetEventQueue()); + // Reuse the event queue of the observer proxy + rv = mObserverProxy->FireEvent(ev); if (NS_FAILED(rv)) { delete ev; return rv; @@ -250,38 +263,47 @@ nsStreamProviderProxy::OnDataWritable(nsIRequest *aRequest, return NS_BASE_STREAM_WOULD_BLOCK; } -// //---------------------------------------------------------------------------- -// nsIStreamProviderProxy implementation... +// nsStreamProviderProxy::nsIStreamProviderProxy implementation... //---------------------------------------------------------------------------- -// + NS_IMETHODIMP -nsStreamProviderProxy::Init(nsIStreamProvider *aProvider, - nsIEventQueue *aEventQ, - PRUint32 aBufferSegmentSize, - PRUint32 aBufferMaxSize) +nsStreamProviderProxy::Init(nsIStreamProvider *provider, + nsIEventQueue *eventQ, + PRUint32 bufferSegmentSize, + PRUint32 bufferMaxSize) { - NS_PRECONDITION(GetReceiver() == nsnull, "Listener already set"); - NS_PRECONDITION(GetEventQueue() == nsnull, "Event queue already set"); + NS_ENSURE_ARG_POINTER(provider); + +#if defined(PR_LOGGING) + if (!gStreamProviderProxyLog) + gStreamProviderProxyLog = PR_NewLogModule("nsStreamProviderProxy"); +#endif + + // + // Create the request observer proxy + // + mObserverProxy = new nsRequestObserverProxy(); + if (!mObserverProxy) return NS_ERROR_OUT_OF_MEMORY; + NS_ADDREF(mObserverProxy); // // Create the pipe // - if (aBufferSegmentSize == 0) - aBufferSegmentSize = DEFAULT_BUFFER_SEGMENT_SIZE; - if (aBufferMaxSize == 0) - aBufferMaxSize = DEFAULT_BUFFER_MAX_SIZE; + if (bufferSegmentSize == 0) + bufferSegmentSize = DEFAULT_BUFFER_SEGMENT_SIZE; + if (bufferMaxSize == 0) + bufferMaxSize = DEFAULT_BUFFER_MAX_SIZE; // The segment size must not exceed the maximum - aBufferSegmentSize = PR_MIN(aBufferMaxSize, aBufferSegmentSize); + bufferSegmentSize = PR_MIN(bufferMaxSize, bufferSegmentSize); nsresult rv = NS_NewPipe(getter_AddRefs(mPipeIn), getter_AddRefs(mPipeOut), - aBufferSegmentSize, - aBufferMaxSize, + bufferSegmentSize, + bufferMaxSize, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) return rv; - nsCOMPtr observer = do_QueryInterface(aProvider); - SetReceiver(observer); - return SetEventQueue(aEventQ); + nsCOMPtr observer = do_QueryInterface(provider); + return mObserverProxy->Init(observer, eventQ); } diff --git a/mozilla/netwerk/base/src/nsStreamProviderProxy.h b/mozilla/netwerk/base/src/nsStreamProviderProxy.h index 6aa19bfd6d4..d78869b829b 100644 --- a/mozilla/netwerk/base/src/nsStreamProviderProxy.h +++ b/mozilla/netwerk/base/src/nsStreamProviderProxy.h @@ -1,37 +1,54 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * Darin Fisher (original author) + */ + #ifndef nsStreamProviderProxy_h__ #define nsStreamProviderProxy_h__ -#include "nsStreamObserverProxy.h" +#include "nsRequestObserverProxy.h" #include "nsIStreamProvider.h" #include "nsIInputStream.h" #include "nsIOutputStream.h" -class nsStreamProviderProxy : public nsStreamProxyBase - , public nsIStreamProviderProxy +class nsStreamProviderProxy : public nsIStreamProviderProxy { public: - NS_DECL_ISUPPORTS_INHERITED - NS_DECL_NSISTREAMOBSERVER + NS_DECL_ISUPPORTS + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMPROVIDER NS_DECL_NSISTREAMPROVIDERPROXY nsStreamProviderProxy(); virtual ~nsStreamProviderProxy(); - nsIStreamProvider *GetProvider() - { - return NS_STATIC_CAST(nsIStreamProvider *, GetReceiver()); - } + nsresult GetProvider(nsIStreamProvider **); - void SetProviderStatus(nsresult status) - { - mProviderStatus = status; - } + void SetProviderStatus(nsresult status) { mProviderStatus = status; } protected: - nsCOMPtr mPipeIn; - nsCOMPtr mPipeOut; - nsresult mProviderStatus; + nsRequestObserverProxy *mObserverProxy; + nsCOMPtr mPipeIn; + nsCOMPtr mPipeOut; + nsresult mProviderStatus; }; -#endif /* !nsStreamProviderProxy_h__ */ +#endif // nsStreamProviderProxy_h__ diff --git a/mozilla/netwerk/base/src/nsSyncStreamListener.cpp b/mozilla/netwerk/base/src/nsSyncStreamListener.cpp index 7f32fd4a2cd..2b8aedf2afd 100644 --- a/mozilla/netwerk/base/src/nsSyncStreamListener.cpp +++ b/mozilla/netwerk/base/src/nsSyncStreamListener.cpp @@ -52,7 +52,7 @@ nsSyncStreamListener::~nsSyncStreamListener() NS_IMPL_THREADSAFE_ISUPPORTS3(nsSyncStreamListener, nsISyncStreamListener, nsIStreamListener, - nsIStreamObserver) + nsIRequestObserver) NS_IMETHODIMP nsSyncStreamListener::OnStartRequest(nsIRequest* request, nsISupports* context) diff --git a/mozilla/netwerk/build/nsNetCID.h b/mozilla/netwerk/build/nsNetCID.h index cc7194019c4..acf9892f20b 100644 --- a/mozilla/netwerk/build/nsNetCID.h +++ b/mozilla/netwerk/build/nsNetCID.h @@ -26,31 +26,62 @@ /****************************************************************************** - * Cache CIDs + * netwerk/base/ classes */ -#define NS_CACHESERVICE_CLASSNAME \ - "Cache Service" -#define NS_CACHESERVICE_CONTRACTID \ - "@mozilla.org/network/cache-service;1" -#define NS_CACHESERVICE_CID \ -{ /* 6c84aec9-29a5-4264-8fbc-bee8f922ea67 */ \ - 0x6c84aec9, \ - 0x29a5, \ - 0x4264, \ - {0x8f, 0xbc, 0xbe, 0xe8, 0xf9, 0x22, 0xea, 0x67} \ +#define NS_IOSERVICE_CLASSNAME \ + "I/O Service" +#define NS_IOSERVICE_CONTRACTID \ + "@mozilla.org/network/io-service;1" +#define NS_IOSERVICE_CID \ +{ /* 9ac9e770-18bc-11d3-9337-00104ba0fd40 */ \ + 0x9ac9e770, \ + 0x18bc, \ + 0x11d3, \ + {0x93, 0x37, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \ } +#define NS_LOADGROUP_CLASSNAME \ + "Load Group" +#define NS_LOADGROUP_CONTRACTID \ + "@mozilla.org/network/load-group;1" +#define NS_LOADGROUP_CID \ +{ /* e1c61582-2a84-11d3-8cce-0060b0fc14a3 */ \ + 0xe1c61582, \ + 0x2a84, \ + 0x11d3, \ + {0x8c, 0xce, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \ +} -/****************************************************************************** - * Stream observer/listener/provider CIDs - */ +#define NS_SIMPLEURI_CLASSNAME \ + "Simple URI" +#define NS_SIMPLEURI_CONTRACTID \ + "@mozilla.org/network/simple-uri;1" +#define NS_SIMPLEURI_CID \ +{ /* e0da1d70-2f7b-11d3-8cd0-0060b0fc14a3 */ \ + 0xe0da1d70, \ + 0x2f7b, \ + 0x11d3, \ + {0x8c, 0xd0, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \ +} -#define NS_STREAMOBSERVERPROXY_CLASSNAME \ - "Stream Observer Proxy" -#define NS_STREAMOBSERVERPROXY_CONTRACTID \ - "@mozilla.org/network/stream-observer-proxy;1" -#define NS_STREAMOBSERVERPROXY_CID \ +#define NS_STANDARDURL_CLASSNAME \ + "Standard URL" +#define NS_STANDARDURL_CONTRACTID \ + "@mozilla.org/network/standard-url;1" +#define NS_STANDARDURL_CID \ +{ /* de9472d0-8034-11d3-9399-00104ba0fd40 */ \ + 0xde9472d0, \ + 0x8034, \ + 0x11d3, \ + {0x93, 0x99, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \ +} + +#define NS_REQUESTOBSERVERPROXY_CLASSNAME \ + "Request Observer Proxy" +#define NS_REQUESTOBSERVERPROXY_CONTRACTID \ + "@mozilla.org/network/request-observer-proxy;1" +#define NS_REQUESTOBSERVERPROXY_CID \ { /* 51fa28c7-74c0-4b85-9c46-d03faa7b696b */ \ 0x51fa28c7, \ 0x74c0, \ @@ -106,18 +137,6 @@ {0xaf, 0x40, 0x2a, 0x5e, 0xc3, 0x99, 0x27, 0x10} \ } -#define NS_ASYNCSTREAMOBSERVER_CLASSNAME \ - "Async Stream Observer" -#define NS_ASYNCSTREAMOBSERVER_CONTRACTID \ - "@mozilla.org/network/async-stream-observer;1" -#define NS_ASYNCSTREAMOBSERVER_CID \ -{ /* fcc7c380-91b3-11d3-8cd9-0060b0fc14a3 */ \ - 0xfcc7c380, \ - 0x91b3, \ - 0x11d3, \ - {0x8c, 0xd9, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \ -} - #define NS_ASYNCSTREAMLISTENER_CLASSNAME \ "Async Stream Listener" #define NS_ASYNCSTREAMLISTENER_CONTRACTID \ @@ -142,11 +161,6 @@ {0xb0, 0x2e, 0x77, 0xc8, 0x81, 0xcc, 0x57, 0x73} \ } - -/****************************************************************************** - * Transport CIDs - */ - #define NS_STORAGETRANSPORT_CLASSNAME \ "Storage Transport" #define NS_STORAGETRANSPORT_CONTRACTID \ @@ -159,4 +173,33 @@ {0x86, 0xb5, 0x3b, 0x0f, 0x4d, 0x54, 0xb9, 0xd2} \ } +#define NS_STREAMIOCHANNEL_CLASSNAME \ + "Stream I/O Channel" +#define NS_STREAMIOCHANNEL_CONTRACTID \ + "@mozilla.org/network/stream-io-channel;1" +#define NS_STREAMIOCHANNEL_CID \ +{ /* 6ddb050c-0d04-11d4-986e-00c04fa0cf4a */ \ + 0x6ddb050c, \ + 0x0d04, \ + 0x11d4, \ + {0x98, 0x6e, 0x00, 0xc0, 0x4f, 0xa0, 0xcf, 0x4a} \ +} + + +/****************************************************************************** + * netwerk/cache/ classes + */ + +#define NS_CACHESERVICE_CLASSNAME \ + "Cache Service" +#define NS_CACHESERVICE_CONTRACTID \ + "@mozilla.org/network/cache-service;1" +#define NS_CACHESERVICE_CID \ +{ /* 6c84aec9-29a5-4264-8fbc-bee8f922ea67 */ \ + 0x6c84aec9, \ + 0x29a5, \ + 0x4264, \ + {0x8f, 0xbc, 0xbe, 0xe8, 0xf9, 0x22, 0xea, 0x67} \ +} + #endif /* !defined(nsNetCID_h__) */ diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp index a505ecb45b9..07832616510 100644 --- a/mozilla/netwerk/build/nsNetModule.cpp +++ b/mozilla/netwerk/build/nsNetModule.cpp @@ -80,13 +80,13 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMIMEInfoImpl) /////////////////////////////////////////////////////////////////////////////// -#include "nsStreamObserverProxy.h" +#include "nsRequestObserverProxy.h" #include "nsStreamListenerProxy.h" #include "nsStreamProviderProxy.h" #include "nsSimpleStreamListener.h" #include "nsSimpleStreamProvider.h" -NS_GENERIC_FACTORY_CONSTRUCTOR(nsStreamObserverProxy) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsRequestObserverProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsStreamListenerProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsStreamProviderProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSimpleStreamListener) @@ -521,9 +521,9 @@ static void PR_CALLBACK nsNeckoShutdown(nsIModule *neckoModule) } static nsModuleComponentInfo gNetModuleInfo[] = { - { "I/O Service", + { NS_IOSERVICE_CLASSNAME, NS_IOSERVICE_CID, - "@mozilla.org/network/io-service;1", + NS_IOSERVICE_CONTRACTID, nsIOService::Create }, { "File Transport Service", NS_FILETRANSPORTSERVICE_CID, @@ -541,13 +541,13 @@ static nsModuleComponentInfo gNetModuleInfo[] = { NS_DNSSERVICE_CID, "@mozilla.org/network/dns-service;1", nsDNSService::Create }, - { "Standard URL Implementation", + { NS_STANDARDURL_CLASSNAME, NS_STANDARDURL_CID, - "@mozilla.org/network/standard-url;1", + NS_STANDARDURL_CONTRACTID, nsStdURL::Create }, - { "Simple URI Implementation", + { NS_SIMPLEURI_CLASSNAME, NS_SIMPLEURI_CID, - "@mozilla.org/network/simple-uri;1", + NS_SIMPLEURI_CONTRACTID, nsSimpleURI::Create }, { "External Module Manager", NS_NETMODULEMGR_CID, @@ -573,10 +573,10 @@ static nsModuleComponentInfo gNetModuleInfo[] = { NS_DOWNLOADER_CID, "@mozilla.org/network/downloader;1", nsDownloader::Create }, - { NS_STREAMOBSERVERPROXY_CLASSNAME, - NS_STREAMOBSERVERPROXY_CID, - NS_STREAMOBSERVERPROXY_CONTRACTID, - nsStreamObserverProxyConstructor }, + { NS_REQUESTOBSERVERPROXY_CLASSNAME, + NS_REQUESTOBSERVERPROXY_CID, + NS_REQUESTOBSERVERPROXY_CONTRACTID, + nsRequestObserverProxyConstructor }, { NS_STREAMLISTENERPROXY_CLASSNAME, NS_STREAMLISTENERPROXY_CID, NS_STREAMLISTENERPROXY_CONTRACTID, @@ -593,10 +593,6 @@ static nsModuleComponentInfo gNetModuleInfo[] = { NS_SIMPLESTREAMPROVIDER_CID, NS_SIMPLESTREAMPROVIDER_CONTRACTID, nsSimpleStreamProviderConstructor }, - { NS_ASYNCSTREAMOBSERVER_CLASSNAME, - NS_ASYNCSTREAMOBSERVER_CID, - NS_ASYNCSTREAMOBSERVER_CONTRACTID, - nsAsyncStreamObserver::Create }, { NS_ASYNCSTREAMLISTENER_CLASSNAME, NS_ASYNCSTREAMLISTENER_CID, NS_ASYNCSTREAMLISTENER_CONTRACTID, @@ -609,15 +605,9 @@ static nsModuleComponentInfo gNetModuleInfo[] = { NS_STORAGETRANSPORT_CID, NS_STORAGETRANSPORT_CONTRACTID, nsStorageTransportConstructor }, - /* - { "Sync Stream Listener", - NS_SYNCSTREAMLISTENER_CID, - "@mozilla.org/network/sync-stream-listener;1", - nsSyncStreamListener::Create }, - */ - { "Load Group", + { NS_LOADGROUP_CLASSNAME, NS_LOADGROUP_CID, - "@mozilla.org/network/load-group;1", + NS_LOADGROUP_CONTRACTID, nsLoadGroup::Create }, { NS_LOCALFILEINPUTSTREAM_CLASSNAME, NS_LOCALFILEINPUTSTREAM_CID, diff --git a/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp b/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp index 61740b8e481..02bd079f55a 100644 --- a/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp +++ b/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp @@ -37,6 +37,7 @@ #include "nsISupportsUtils.h" #include "prio.h" #include "nsMimeTypes.h" +#include "nsNetCID.h" //static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); @@ -173,7 +174,7 @@ nsDiskCacheRecordChannel::nsDiskCacheRecordChannel(nsDiskCacheRecord *aRecord, nsILoadGroup *aLoadGroup) : mRecord(aRecord), mLoadGroup(aLoadGroup), - mLoadAttributes(nsIChannel::LOAD_NORMAL), + mLoadFlags(nsIRequest::LOAD_NORMAL), mStatus(NS_OK) { NS_INIT_REFCNT(); @@ -238,7 +239,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS5(nsDiskCacheRecordChannel, nsIChannel, nsIRequest, nsIStreamListener, - nsIStreamObserver) + nsIRequestObserver) // implement nsIRequest NS_IMETHODIMP @@ -319,24 +320,17 @@ nsDiskCacheRecordChannel::GetURI(nsIURI* *aURI) return NS_ERROR_NOT_IMPLEMENTED ; } -NS_IMETHODIMP -nsDiskCacheRecordChannel::SetURI(nsIURI* aURI) -{ - NS_NOTREACHED("nsDiskCacheRecordChannel::SetURI"); - return NS_ERROR_NOT_IMPLEMENTED ; -} - NS_IMETHODIMP nsDiskCacheRecordChannel::Open(nsIInputStream **aResult) { - return OpenInputStream(0, -1, 0, aResult); + return OpenInputStream(0, PRUint32(-1), 0, aResult); } NS_IMETHODIMP nsDiskCacheRecordChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext) { nsCOMPtr req; - return AsyncRead(aListener, aContext, 0, -1, 0, getter_AddRefs(req)); + return AsyncRead(aListener, aContext, 0, PRUint32(-1), 0, getter_AddRefs(req)); } NS_IMETHODIMP @@ -411,20 +405,6 @@ nsDiskCacheRecordChannel::AsyncRead(nsIStreamListener *aListener, nsISupports *a nsCOMPtr tempListener = this; if (mLoadGroup) { - nsCOMPtr factory; - // - // Create a load group "proxy" listener... - // - rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory)); - if (factory) { - nsIStreamListener *newListener; - rv = factory->CreateLoadGroupListener(mRealListener, &newListener); - if (NS_SUCCEEDED(rv)) { - mRealListener = newListener; - NS_RELEASE(newListener); - } - } - rv = mLoadGroup->AddRequest(this, nsnull); if (NS_FAILED(rv)) return rv; } @@ -474,16 +454,16 @@ nsDiskCacheRecordChannel::AsyncWrite(nsIStreamProvider *provider, nsISupports *c } NS_IMETHODIMP -nsDiskCacheRecordChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +nsDiskCacheRecordChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsDiskCacheRecordChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) +nsDiskCacheRecordChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -649,14 +629,14 @@ nsDiskCacheRecordChannel::OnStartRequest(nsIRequest* transportRequest, nsISuppor NS_IMETHODIMP nsDiskCacheRecordChannel::OnStopRequest(nsIRequest* transportRequest, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsresult rv; - rv = mRealListener->OnStopRequest(this, context, aStatus, aStatusArg); + rv = mRealListener->OnStopRequest(this, context, aStatus); if (mLoadGroup) - mLoadGroup->RemoveRequest(this, context, aStatus, aStatusArg); + mLoadGroup->RemoveRequest(this, context, aStatus); // Release the reference to the consumer stream listener... mRealListener = null_nsCOMPtr(); diff --git a/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.h b/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.h index dbf62ff4309..9c39ee17714 100644 --- a/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.h +++ b/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.h @@ -59,8 +59,8 @@ class nsDiskCacheRecordChannel : public nsIChannel, NS_IMETHOD AsyncWrite(nsIStreamProvider *, nsISupports *, PRUint32, PRUint32, PRUint32, nsIRequest **); NS_IMETHOD SetNotificationCallbacks(nsIInterfaceRequestor*, PRBool); - // Declare nsIStreamObserver methods - NS_DECL_NSISTREAMOBSERVER + // Declare nsIRequestObserver methods + NS_DECL_NSIREQUESTOBSERVER // Declare nsIStreamListener methods NS_DECL_NSISTREAMLISTENER @@ -73,7 +73,7 @@ class nsDiskCacheRecordChannel : public nsIChannel, nsDiskCacheRecord* mRecord ; nsCOMPtr mLoadGroup ; - nsLoadFlags mLoadAttributes; + nsLoadFlags mLoadFlags; nsCOMPtr mOwner ; nsCOMPtr mFileTransport ; nsCOMPtr mFileRequest; diff --git a/mozilla/netwerk/cache/filecache/test/diskcache.cpp b/mozilla/netwerk/cache/filecache/test/diskcache.cpp index f2f068a155b..4ceec73a544 100644 --- a/mozilla/netwerk/cache/filecache/test/diskcache.cpp +++ b/mozilla/netwerk/cache/filecache/test/diskcache.cpp @@ -17,7 +17,6 @@ */ #include "nsIStreamListener.h" -#include "nsIStreamObserver.h" #include "nsIServiceManager.h" #include "nsIInputStream.h" #include "nsIOutputStream.h" @@ -258,7 +257,7 @@ protected: nsCOMPtr mChannel; }; -NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver) +NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIRequestObserver) static nsIEventQueue* eventQueue; diff --git a/mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp b/mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp index 8910d21f1e8..82a4dbad013 100644 --- a/mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp +++ b/mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp @@ -76,7 +76,7 @@ public: if (NS_SUCCEEDED(mAbortStatus)) { mAbortStatus = status; return mEventQueueStreamListener ? - mEventQueueStreamListener->OnStopRequest(mChannel, mContext, status, nsnull): + mEventQueueStreamListener->OnStopRequest(mChannel, mContext, status): status; } else { // Cancel has already been called... Do not fire another OnStopRequest! @@ -140,14 +140,14 @@ public: NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { nsresult rv = NS_OK; NS_ASSERTION(mDownstreamListener, "no downstream listener"); if (mDownstreamListener) { - rv = mDownstreamListener->OnStopRequest(mChannel, aContext, aStatus, aStatusArg); + rv = mDownstreamListener->OnStopRequest(mChannel, aContext, aStatus); mDownstreamListener = 0; } // Tricky: causes this instance to be free'ed because mEventQueueStreamListener @@ -253,7 +253,7 @@ protected: nsresult Fail(void) { mAbortStatus = NS_BINDING_ABORTED; - return mEventQueueStreamListener->OnStopRequest(mChannel, mContext, NS_BINDING_FAILED, nsnull); + return mEventQueueStreamListener->OnStopRequest(mChannel, mContext, NS_BINDING_FAILED); } // If more data remains in the source stream that the downstream consumer @@ -276,7 +276,7 @@ protected: mAvailable += size; return rv; } else { - rv = mEventQueueStreamListener->OnStopRequest(mChannel, mContext, NS_OK, nsnull); + rv = mEventQueueStreamListener->OnStopRequest(mChannel, mContext, NS_OK); AsyncReadStreamAdaptor* thisAlias = this; NS_RELEASE(thisAlias); return rv; @@ -300,7 +300,7 @@ private: }; NS_IMPL_ISUPPORTS3(AsyncReadStreamAdaptor, nsIInputStream, - nsIStreamListener, nsIStreamObserver) + nsIStreamListener, nsIRequestObserver) // The only purpose of this output stream wrapper is to adjust the cache's // overall occupancy as new data flows into the cache entry. @@ -386,7 +386,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(MemCacheWriteStreamWrapper, nsIOutputStream) nsMemCacheChannel::nsMemCacheChannel(nsMemCacheRecord *aRecord, nsILoadGroup *aLoadGroup) : mRecord(aRecord), mStatus(NS_OK), - mLoadAttributes(nsIChannel::LOAD_NORMAL) + mLoadFlags(nsIRequest::LOAD_NORMAL) { NS_INIT_REFCNT(); mRecord->mNumChannels++; @@ -469,25 +469,17 @@ nsMemCacheChannel::GetURI(nsIURI* *aURI) return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP -nsMemCacheChannel::SetURI(nsIURI* aURI) -{ - // Not required to be implemented, since it is implemented by cache manager - NS_NOTREACHED("nsMemCacheChannel::SetURI"); - return NS_ERROR_NOT_IMPLEMENTED; -} - NS_IMETHODIMP nsMemCacheChannel::Open(nsIInputStream **aResult) { - return OpenInputStream(0, -1, 0, aResult); + return OpenInputStream(0, PRUint32(-1), 0, aResult); } NS_IMETHODIMP nsMemCacheChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext) { nsCOMPtr req; - return AsyncRead(aListener, aContext, 0, -1, 0, getter_AddRefs(req)); + return AsyncRead(aListener, aContext, 0, PRUint32(-1), 0, getter_AddRefs(req)); } NS_IMETHODIMP @@ -569,16 +561,16 @@ nsMemCacheChannel::SetContentLength(PRInt32 aContentLength) } NS_IMETHODIMP -nsMemCacheChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +nsMemCacheChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsMemCacheChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) +nsMemCacheChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } diff --git a/mozilla/netwerk/cache/memcache/nsMemCacheChannel.h b/mozilla/netwerk/cache/memcache/nsMemCacheChannel.h index 164620a23e7..f7531bf8d1a 100644 --- a/mozilla/netwerk/cache/memcache/nsMemCacheChannel.h +++ b/mozilla/netwerk/cache/memcache/nsMemCacheChannel.h @@ -64,7 +64,7 @@ protected: PRUint32 mStartOffset; nsresult mStatus; - nsLoadFlags mLoadAttributes; + nsLoadFlags mLoadFlags; friend class MemCacheWriteStreamWrapper; friend class AsyncReadStreamAdaptor; diff --git a/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp b/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp index cad8e2c2a38..5a7559e3458 100644 --- a/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp +++ b/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp @@ -29,6 +29,7 @@ #include "nsIServiceManager.h" #include "nsIStreamListener.h" #include "nsMemory.h" +#include "nsNetCID.h" nsCacheEntryChannel::nsCacheEntryChannel( nsCachedNetData* aCacheEntry, @@ -138,14 +139,14 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(CacheOutputStream, nsIOutputStream) NS_IMETHODIMP nsCacheEntryChannel::Open(nsIInputStream **aInputStream) { - return OpenInputStream(0, -1, 0, aInputStream); + return OpenInputStream(0, PRUint32(-1), 0, aInputStream); } NS_IMETHODIMP nsCacheEntryChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext) { nsCOMPtr req; - return AsyncRead(aListener, aContext, 0, -1, 0, getter_AddRefs(req)); + return AsyncRead(aListener, aContext, 0, PRUint32(-1), 0, getter_AddRefs(req)); } NS_IMETHODIMP @@ -241,18 +242,6 @@ nsCacheEntryChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup) return NS_OK; } -NS_IMETHODIMP -nsCacheEntryChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) -{ - return mChannel->GetLoadAttributes(aLoadAttributes); -} - -NS_IMETHODIMP -nsCacheEntryChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) -{ - return mChannel->SetLoadAttributes(aLoadAttributes); -} - static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); NS_IMETHODIMP diff --git a/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.h b/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.h index 17d921f2d10..da3f3fc4bc8 100644 --- a/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.h +++ b/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.h @@ -56,8 +56,6 @@ public: // nsIChannel methods NS_IMETHOD Open(nsIInputStream* *aInputStream); NS_IMETHOD AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext); - NS_IMETHOD GetLoadAttributes(nsLoadFlags *aLoadAttributes); - NS_IMETHOD SetLoadAttributes(nsLoadFlags aLoadAttributes); NS_IMETHOD GetLoadGroup(nsILoadGroup* *aLoadGroup); NS_IMETHOD GetURI(nsIURI * *aURI); NS_IMETHOD GetOriginalURI(nsIURI * *aURI); diff --git a/mozilla/netwerk/cache/mgr/nsCachedNetData.cpp b/mozilla/netwerk/cache/mgr/nsCachedNetData.cpp index ab75a68bd04..db0f85e6de8 100644 --- a/mozilla/netwerk/cache/mgr/nsCachedNetData.cpp +++ b/mozilla/netwerk/cache/mgr/nsCachedNetData.cpp @@ -1191,7 +1191,7 @@ public: } NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { if (NS_FAILED(aStatus)) { mCacheEntry->SetFlag(nsCachedNetData::TRUNCATED_CONTENT); } else { @@ -1208,7 +1208,7 @@ public: // Tell any stream-as-file observers that the file has been completely written mCacheEntry->Notify(nsIStreamAsFileObserver::NOTIFY_AVAILABLE, NS_OK); - return mOriginalListener->OnStopRequest(request, ctxt, aStatus, aStatusArg); + return mOriginalListener->OnStopRequest(request, ctxt, aStatus); } NS_IMETHOD OnDataAvailable(nsIRequest *request, nsISupports *ctxt, @@ -1310,7 +1310,7 @@ private: }; -NS_IMPL_THREADSAFE_ISUPPORTS3(InterceptStreamListener, nsIInputStream, nsIStreamListener, nsIStreamObserver) +NS_IMPL_THREADSAFE_ISUPPORTS3(InterceptStreamListener, nsIInputStream, nsIStreamListener, nsIRequestObserver) NS_IMETHODIMP nsCachedNetData::InterceptAsyncRead(nsIStreamListener *aOriginalListener, diff --git a/mozilla/netwerk/dns/src/nsDnsService.cpp b/mozilla/netwerk/dns/src/nsDnsService.cpp index 8dbba6197ec..fcd0c1b6519 100644 --- a/mozilla/netwerk/dns/src/nsDnsService.cpp +++ b/mozilla/netwerk/dns/src/nsDnsService.cpp @@ -29,7 +29,7 @@ #include "nsIServiceManager.h" #include "netCore.h" #include "nsAutoLock.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsTime.h" #ifdef DNS_TIMING #include "prinrval.h" @@ -362,6 +362,32 @@ nsDNSRequest::Resume(void) return NS_OK; } +NS_IMETHODIMP +nsDNSRequest::GetLoadGroup(nsILoadGroup **loadGroup) +{ + *loadGroup = nsnull; + return NS_OK; +} + +NS_IMETHODIMP +nsDNSRequest::SetLoadGroup(nsILoadGroup *loadGroup) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsDNSRequest::GetLoadFlags(nsLoadFlags *loadFlags) +{ + *loadFlags = nsIRequest::LOAD_NORMAL; + return NS_OK; +} + +NS_IMETHODIMP +nsDNSRequest::SetLoadFlags(nsLoadFlags loadFlags) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + //////////////////////////////////////////////////////////////////////////////// // nsDNSLookup methods: //////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp b/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp index 7242acfb26c..ab33d5b20fe 100644 --- a/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp +++ b/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp @@ -25,6 +25,7 @@ #include "nsIServiceManager.h" #include "nsCOMPtr.h" #include "nsIURI.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp index 3de13b72754..3355d482df0 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp @@ -51,11 +51,11 @@ nsAboutCacheEntry::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; - mStreamChannel = do_CreateInstance(NS_STREAMIOCHANNEL_CONTRACTID, &rv); + nsCOMPtr chan; + rv = NS_NewStreamIOChannel(getter_AddRefs(chan), aURI, nsnull); if (NS_FAILED(rv)) return rv; - rv = mStreamChannel->SetURI(aURI); - if (NS_FAILED(rv)) return rv; + mStreamChannel = do_QueryInterface(chan); return CallQueryInterface((nsIAboutModule *) this, result); } @@ -194,13 +194,6 @@ nsAboutCacheEntry::GetURI(nsIURI **value) return mStreamChannel->GetURI(value); } -NS_IMETHODIMP -nsAboutCacheEntry::SetURI(nsIURI *value) -{ - NS_ENSURE_TRUE(mStreamChannel, NS_ERROR_NOT_INITIALIZED); - return mStreamChannel->SetURI(value); -} - NS_IMETHODIMP nsAboutCacheEntry::GetOwner(nsISupports **value) { @@ -230,17 +223,17 @@ nsAboutCacheEntry::SetLoadGroup(nsILoadGroup *value) } NS_IMETHODIMP -nsAboutCacheEntry::GetLoadAttributes(PRUint32 *value) +nsAboutCacheEntry::GetLoadFlags(PRUint32 *value) { NS_ENSURE_TRUE(mStreamChannel, NS_ERROR_NOT_INITIALIZED); - return mStreamChannel->GetLoadAttributes(value); + return mStreamChannel->GetLoadFlags(value); } NS_IMETHODIMP -nsAboutCacheEntry::SetLoadAttributes(PRUint32 value) +nsAboutCacheEntry::SetLoadFlags(PRUint32 value) { NS_ENSURE_TRUE(mStreamChannel, NS_ERROR_NOT_INITIALIZED); - return mStreamChannel->SetLoadAttributes(value); + return mStreamChannel->SetLoadFlags(value); } NS_IMETHODIMP diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp index 79badd1a5d5..c1dcf834973 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp @@ -25,6 +25,7 @@ #include "nsIServiceManager.h" #include "nsCOMPtr.h" #include "nsIURI.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp b/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp index e4a275cb0d1..71f366f7ba7 100755 --- a/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp @@ -26,6 +26,7 @@ #include "nsIServiceManager.h" #include "nsCOMPtr.h" #include "nsIURI.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp index 5a77af885a0..750e0a79438 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp @@ -30,6 +30,7 @@ #include "nsIAboutModule.h" #include "nsString.h" #include "nsReadableUtils.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp b/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp index 237b4de8cea..a7bf421497f 100644 --- a/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp +++ b/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp @@ -295,13 +295,6 @@ nsDataChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsDataChannel::SetURI(nsIURI* aURI) -{ - mUrl = aURI; - return NS_OK; -} - // This class NS_IMETHODIMP @@ -340,21 +333,21 @@ nsDataChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) rv = listener->OnDataAvailable(this, ctxt, mDataStream, 0, streamLen); if (NS_FAILED(rv)) return rv; - rv = listener->OnStopRequest(this, ctxt, NS_OK, nsnull); + rv = listener->OnStopRequest(this, ctxt, NS_OK); return rv; } NS_IMETHODIMP -nsDataChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsDataChannel::GetLoadFlags(PRUint32 *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsDataChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsDataChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } diff --git a/mozilla/netwerk/protocol/data/src/nsDataChannel.h b/mozilla/netwerk/protocol/data/src/nsDataChannel.h index 6e0ee4b7b2c..f2b3e3c2319 100644 --- a/mozilla/netwerk/protocol/data/src/nsDataChannel.h +++ b/mozilla/netwerk/protocol/data/src/nsDataChannel.h @@ -58,7 +58,7 @@ protected: nsCOMPtr mOriginalURI; nsCOMPtr mUrl; nsCOMPtr mDataStream; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsCOMPtr mLoadGroup; nsCString mContentType; PRInt32 mContentLength; diff --git a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp index 6e3ec9bbbc1..dec30edc76c 100644 --- a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp +++ b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp @@ -29,8 +29,9 @@ #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" #include "nsIProgressEventSink.h" +#include "nsNetCID.h" -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); +static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); //////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp index 2a2e3b721ea..8cc49b0b1ab 100644 --- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp +++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp @@ -47,7 +47,7 @@ NS_IMPL_ISUPPORTS4(nsDateTimeChannel, nsIChannel, nsIRequest, nsIStreamListener, - nsIStreamObserver) + nsIRequestObserver) nsresult nsDateTimeChannel::Init(nsIURI* uri) @@ -153,13 +153,6 @@ nsDateTimeChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsDateTimeChannel::SetURI(nsIURI* aURI) -{ - mUrl = aURI; - return NS_OK; -} - NS_IMETHODIMP nsDateTimeChannel::Open(nsIInputStream **_retval) { @@ -173,7 +166,7 @@ nsDateTimeChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; transport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); return transport->OpenInputStream(0, -1, 0, _retval); } @@ -191,7 +184,7 @@ nsDateTimeChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; transport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); mListener = aListener; @@ -200,16 +193,16 @@ nsDateTimeChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) } NS_IMETHODIMP -nsDateTimeChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsDateTimeChannel::GetLoadFlags(PRUint32 *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsDateTimeChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsDateTimeChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -258,7 +251,7 @@ NS_IMETHODIMP nsDateTimeChannel::SetLoadGroup(nsILoadGroup* aLoadGroup) { if (mLoadGroup) // if we already had a load group remove ourselves... - (void)mLoadGroup->RemoveRequest(this, nsnull, NS_OK, nsnull); + (void)mLoadGroup->RemoveRequest(this, nsnull, NS_OK); mLoadGroup = aLoadGroup; if (mLoadGroup) { @@ -305,7 +298,7 @@ nsDateTimeChannel::GetSecurityInfo(nsISupports **sec) return NS_OK; } -// nsIStreamObserver methods +// nsIRequestObserver methods NS_IMETHODIMP nsDateTimeChannel::OnStartRequest(nsIRequest *request, nsISupports *aContext) { return mListener->OnStartRequest(this, aContext); @@ -314,12 +307,12 @@ nsDateTimeChannel::OnStartRequest(nsIRequest *request, nsISupports *aContext) { NS_IMETHODIMP nsDateTimeChannel::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { if (mLoadGroup) { - nsresult rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus, aStatusArg); + nsresult rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus); if (NS_FAILED(rv)) return rv; } - return mListener->OnStopRequest(this, aContext, aStatus, aStatusArg); + return mListener->OnStopRequest(this, aContext, aStatus); } diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h index 278f9c7a198..1caf8c24de9 100644 --- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h +++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h @@ -48,7 +48,7 @@ public: NS_DECL_NSIREQUEST NS_DECL_NSICHANNEL NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER // nsDateTimeChannel methods: nsDateTimeChannel(); @@ -65,7 +65,7 @@ protected: nsCOMPtr mOriginalURI; nsCOMPtr mUrl; nsCOMPtr mListener; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsCOMPtr mLoadGroup; nsCString mContentType; PRInt32 mContentLength; diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp b/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp index dad291537f5..5d2a5083b33 100644 --- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp +++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp @@ -29,6 +29,7 @@ #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" #include "nsIProgressEventSink.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); diff --git a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp index 0f3aeb4c327..55a0dc3cb19 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp +++ b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp @@ -32,6 +32,7 @@ #include "nsIFile.h" #include "nsInt64.h" #include "nsMimeTypes.h" +#include "nsNetCID.h" #include "prio.h" // Need to pick up def of PR_RDONLY static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); @@ -42,7 +43,7 @@ static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); nsFileChannel::nsFileChannel() : mIOFlags(-1), mPerm(-1), - mLoadAttributes(LOAD_NORMAL), + mLoadFlags(LOAD_NORMAL), mTransferOffset(0), mTransferCount(-1), mBufferSegmentSize(0), @@ -93,7 +94,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS7(nsFileChannel, nsIChannel, nsIRequest, nsIStreamListener, - nsIStreamObserver, + nsIRequestObserver, nsIProgressEventSink, nsIInterfaceRequestor) @@ -212,13 +213,6 @@ nsFileChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsFileChannel::SetURI(nsIURI* aURI) -{ - mURI = aURI; - return NS_OK; -} - nsresult nsFileChannel::EnsureTransport() { @@ -240,7 +234,7 @@ nsFileChannel::EnsureTransport() if (NS_FAILED(rv)) return rv; mFileTransport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); return rv; } @@ -288,20 +282,6 @@ nsFileChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) nsCOMPtr tempListener = this; if (mLoadGroup) { - nsCOMPtr factory; - // - // Create a load group "proxy" listener... - // - rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory)); - if (factory) { - nsIStreamListener *newListener; - rv = factory->CreateLoadGroupListener(mRealListener, &newListener); - if (NS_SUCCEEDED(rv)) { - mRealListener = newListener; - NS_RELEASE(newListener); - } - } - rv = mLoadGroup->AddRequest(this, nsnull); if (NS_FAILED(rv)) return rv; } @@ -310,7 +290,7 @@ nsFileChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) getter_AddRefs(mCurrentRequest)); if (NS_FAILED(rv)) { - nsresult rv2 = mLoadGroup->RemoveRequest(this, ctxt, rv, nsnull); // XXX fix error message + nsresult rv2 = mLoadGroup->RemoveRequest(this, ctxt, rv); // XXX fix error message NS_ASSERTION(NS_SUCCEEDED(rv2), "RemoveRequest failed"); // release the transport so that we don't think we're in progress mFileTransport = nsnull; @@ -320,16 +300,16 @@ nsFileChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) } NS_IMETHODIMP -nsFileChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsFileChannel::GetLoadFlags(PRUint32 *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsFileChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsFileChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -477,7 +457,7 @@ nsFileChannel::OnStartRequest(nsIRequest* request, nsISupports* context) NS_IMETHODIMP nsFileChannel::OnStopRequest(nsIRequest* request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { #ifdef DEBUG NS_ASSERTION(mInitiator == PR_CurrentThread(), @@ -486,11 +466,11 @@ nsFileChannel::OnStopRequest(nsIRequest* request, nsISupports* context, nsresult rv = NS_OK; if (mRealListener) { - rv = mRealListener->OnStopRequest(this, context, aStatus, aStatusArg); + rv = mRealListener->OnStopRequest(this, context, aStatus); } if (mLoadGroup) { - mLoadGroup->RemoveRequest(this, context, aStatus, aStatusArg); + mLoadGroup->RemoveRequest(this, context, aStatus); } // Release the reference to the consumer stream listener... diff --git a/mozilla/netwerk/protocol/file/src/nsFileChannel.h b/mozilla/netwerk/protocol/file/src/nsFileChannel.h index a82ca7e9d61..b362ca3a598 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileChannel.h +++ b/mozilla/netwerk/protocol/file/src/nsFileChannel.h @@ -52,7 +52,7 @@ public: NS_DECL_NSICHANNEL NS_DECL_NSIFILECHANNEL NS_DECL_NSIINTERFACEREQUESTOR - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSIPROGRESSEVENTSINK @@ -76,7 +76,7 @@ protected: PRInt32 mPerm; nsCOMPtr mFileTransport; nsCString mContentType; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsCOMPtr mLoadGroup; nsCOMPtr mOwner; nsCOMPtr mRealListener; diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp index b7f26b2c9ea..163572f6486 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp @@ -35,6 +35,7 @@ #include "nsFileSpec.h" #include "nsAutoLock.h" #include "nsXPIDLString.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); static NS_DEFINE_CID(kNoAuthUrlParserCID, NS_NOAUTHORITYURLPARSER_CID); diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp index 6ef9f010e5c..a6a75842d60 100644 --- a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp +++ b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp @@ -58,7 +58,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsFingerChannel, nsIChannel, nsIRequest, nsIStreamListener, - nsIStreamObserver) + nsIRequestObserver) nsresult nsFingerChannel::Init(nsIURI* uri) @@ -183,13 +183,6 @@ nsFingerChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsFingerChannel::SetURI(nsIURI* aURI) -{ - mUrl = aURI; - return NS_OK; -} - NS_IMETHODIMP nsFingerChannel::Open(nsIInputStream **_retval) { @@ -203,9 +196,9 @@ nsFingerChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; mTransport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); - return mTransport->OpenInputStream(0, -1, 0, _retval); + return mTransport->OpenInputStream(0, PRUint32(-1), 0, _retval); } NS_IMETHODIMP @@ -221,7 +214,7 @@ nsFingerChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; mTransport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); mListener = aListener; mResponseContext = ctxt; @@ -230,16 +223,16 @@ nsFingerChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) } NS_IMETHODIMP -nsFingerChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsFingerChannel::GetLoadFlags(PRUint32 *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsFingerChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsFingerChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -328,7 +321,7 @@ nsFingerChannel::GetSecurityInfo(nsISupports * *aSecurityInfo) return NS_OK; } -// nsIStreamObserver methods +// nsIRequestObserver methods NS_IMETHODIMP nsFingerChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) { if (!mActAsObserver) { @@ -344,16 +337,16 @@ nsFingerChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) { NS_IMETHODIMP nsFingerChannel::OnStopRequest(nsIRequest *aRequest, nsISupports* aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsresult rv = NS_OK; if (NS_FAILED(aStatus) || !mActAsObserver) { if (mLoadGroup) { - rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus, aStatusArg); + rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus); if (NS_FAILED(rv)) return rv; } - rv = mListener->OnStopRequest(this, mResponseContext, aStatus, aStatusArg); + rv = mListener->OnStopRequest(this, mResponseContext, aStatus); mTransport = 0; return rv; } else { @@ -385,7 +378,7 @@ nsFingerChannel::OnStopRequest(nsIRequest *aRequest, nsISupports* aContext, converter->PreFormatHTML(PR_TRUE); } - return mTransport->AsyncRead(converterListener, mResponseContext, 0,-1, 0, + return mTransport->AsyncRead(converterListener, mResponseContext, 0, PRUint32(-1), 0, getter_AddRefs(mTransportRequest)); } diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h index b15716d09ee..ff8b7bccebd 100644 --- a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h +++ b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h @@ -44,7 +44,7 @@ public: NS_DECL_NSIREQUEST NS_DECL_NSICHANNEL NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER // nsFingerChannel methods: nsFingerChannel(); @@ -61,7 +61,7 @@ protected: nsCOMPtr mOriginalURI; nsCOMPtr mUrl; nsCOMPtr mListener; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsCOMPtr mLoadGroup; nsCString mContentType; PRInt32 mContentLength; diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp b/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp index 60d8f97389d..448bfe6544a 100644 --- a/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp +++ b/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp @@ -29,6 +29,7 @@ #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" #include "nsIProgressEventSink.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); diff --git a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp index e9b1f120590..932b5cffca9 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp @@ -44,7 +44,7 @@ extern PRLogModuleInfo* gFTPLog; // Client initiation is the most common case and is attempted first. nsFTPChannel::nsFTPChannel() - : mLoadAttributes(LOAD_NORMAL), + : mLoadFlags(LOAD_NORMAL), mSourceOffset(0), mAmount(0), mContentLength(-1), @@ -77,7 +77,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS8(nsFTPChannel, nsIInterfaceRequestor, nsIProgressEventSink, nsIStreamListener, - nsIStreamObserver); + nsIRequestObserver); nsresult nsFTPChannel::Init(nsIURI* uri) @@ -237,13 +237,6 @@ nsFTPChannel::GetURI(nsIURI* *aURL) return NS_OK; } -NS_IMETHODIMP -nsFTPChannel::SetURI(nsIURI* aURL) -{ - mURL = aURL; - return NS_OK; -} - NS_IMETHODIMP nsFTPChannel::Open(nsIInputStream **result) { @@ -289,20 +282,20 @@ nsFTPChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) } NS_IMETHODIMP -nsFTPChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsFTPChannel::GetLoadFlags(PRUint32 *aLoadFlags) { if (mProxyChannel) - return mProxyChannel->GetLoadAttributes(aLoadAttributes); - *aLoadAttributes = mLoadAttributes; + return mProxyChannel->GetLoadFlags(aLoadFlags); + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsFTPChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsFTPChannel::SetLoadFlags(PRUint32 aLoadFlags) { if (mProxyChannel) - return mProxyChannel->SetLoadAttributes(aLoadAttributes); - mLoadAttributes = aLoadAttributes; + return mProxyChannel->SetLoadFlags(aLoadFlags); + mLoadFlags = aLoadFlags; return NS_OK; } @@ -466,10 +459,10 @@ nsFTPChannel::OnProgress(nsIRequest *request, nsISupports* aContext, } -// nsIStreamObserver methods. +// nsIRequestObserver methods. NS_IMETHODIMP nsFTPChannel::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { PR_LOG(gFTPLog, PR_LOG_DEBUG, @@ -481,16 +474,16 @@ nsFTPChannel::OnStopRequest(nsIRequest *request, nsISupports* aContext, mStatus = aStatus; if (mObserver) { - rv = mObserver->OnStopRequest(this, mUserContext, aStatus, aStatusArg); + rv = mObserver->OnStopRequest(this, mUserContext, aStatus); if (NS_FAILED(rv)) return rv; } if (mListener) { - rv = mListener->OnStopRequest(this, mUserContext, aStatus, aStatusArg); + rv = mListener->OnStopRequest(this, mUserContext, aStatus); if (NS_FAILED(rv)) return rv; } if (mLoadGroup) { - rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus, aStatusArg); + rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus); if (NS_FAILED(rv)) return rv; } return rv; diff --git a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h index 4989bdcdc36..8f74ed0222b 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h +++ b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h @@ -70,7 +70,7 @@ public: NS_DECL_NSIINTERFACEREQUESTOR NS_DECL_NSIPROGRESSEVENTSINK NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER // nsFTPChannel methods: nsFTPChannel(); @@ -93,7 +93,7 @@ protected: nsCOMPtr mCallbacks; PRBool mConnected; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; PRUint32 mSourceOffset; PRInt32 mAmount; @@ -103,7 +103,7 @@ protected: nsCOMPtr mOwner; nsCOMPtr mListener; - nsCOMPtr mObserver; + nsCOMPtr mObserver; nsFtpState* mFTPState; diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index c9522739ec0..422f37b8453 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -76,7 +76,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_FORWARD_NSIREQUEST(mRequest->) NS_FORWARD_NSICHANNEL(mChannel->) @@ -102,7 +102,7 @@ protected: NS_IMPL_THREADSAFE_ISUPPORTS4(DataRequestForwarder, nsIStreamListener, - nsIStreamObserver, + nsIRequestObserver, nsIChannel, nsIRequest); @@ -190,7 +190,7 @@ DataRequestForwarder::OnStartRequest(nsIRequest *request, nsISupports *ctxt) } NS_IMETHODIMP -DataRequestForwarder::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult statusCode, const PRUnichar *statusText) +DataRequestForwarder::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult statusCode) { PR_LOG(gFTPLog, PR_LOG_DEBUG, ("(%x) DataRequestForwarder OnStopRequest [status=%x]\n", this, statusCode)); #ifdef DOUGT_NEW_CACHE @@ -212,7 +212,7 @@ DataRequestForwarder::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsre } #endif if (mListener) - return mListener->OnStopRequest(this, ctxt, statusCode, statusText); + return mListener->OnStopRequest(this, ctxt, statusCode); return NS_OK; } @@ -250,7 +250,7 @@ DataRequestForwarder::OnDataAvailable(nsIRequest *request, nsISupports *ctxt, ns NS_IMPL_THREADSAFE_ISUPPORTS3(nsFtpState, nsIStreamListener, - nsIStreamObserver, + nsIRequestObserver, nsIRequest); nsFtpState::nsFtpState() { @@ -421,7 +421,7 @@ printf("!!! %s\n", logString.get()); } -// nsIStreamObserver implementation +// nsIRequestObserver implementation NS_IMETHODIMP nsFtpState::OnStartRequest(nsIRequest *request, nsISupports *aContext) { @@ -437,7 +437,7 @@ nsFtpState::OnStartRequest(nsIRequest *request, nsISupports *aContext) NS_IMETHODIMP nsFtpState::OnStopRequest(nsIRequest *request, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { PR_LOG(gFTPLog, PR_LOG_DEBUG, ("(%x) nsFtpState::OnStopRequest() rv=%x\n", this, aStatus)); mControlStatus = aStatus; @@ -1557,7 +1557,7 @@ nsFtpState::S_stor() { NS_ASSERTION(mWriteStream, "we're trying to upload without any data"); if (NS_FAILED(rv)) return rv; - nsCOMPtr observer = do_QueryInterface(mChannel, &rv); + nsCOMPtr observer = do_QueryInterface(mChannel, &rv); if (NS_FAILED(rv)) return rv; PR_LOG(gFTPLog, PR_LOG_DEBUG, ("(%x) writing on Data Transport\n", this)); @@ -1901,6 +1901,32 @@ nsFtpState::Resume(void) return rv; } +NS_IMETHODIMP +nsFtpState::GetLoadGroup(nsILoadGroup **aLoadGroup) +{ + *aLoadGroup = nsnull; + return NS_OK; +} + +NS_IMETHODIMP +nsFtpState::SetLoadGroup(nsILoadGroup *aLoadGroup) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsFtpState::GetLoadFlags(nsLoadFlags *aLoadFlags) +{ + *aLoadFlags = nsIRequest::LOAD_NORMAL; + return NS_OK; +} + +NS_IMETHODIMP +nsFtpState::SetLoadFlags(nsLoadFlags aLoadFlags) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + nsresult nsFtpState::Init(nsIFTPChannel* aChannel, nsIPrompt* aPrompter) { @@ -2002,8 +2028,8 @@ nsFtpState::Connect() if (accessMode & nsICache::ACCESS_READ) { // we can read from the cache. - PRUint32 aLoadAttributes; - mChannel->GetLoadAttributes(&aLoadAttributes); + PRUint32 aLoadFlags; + mChannel->GetLoadFlags(&aLoadFlags); if (accessMode & nsICache::ACCESS_WRITE) { // we said that we could validate, so here we do it. @@ -2139,7 +2165,7 @@ nsFtpState::StopProcessing() { if(NS_FAILED(rv)) return rv; //(void) asyncListener->OnStartRequest(channelRequest, nsnull); - (void) asyncListener->OnStopRequest(channelRequest, nsnull, broadcastErrorCode, nsnull); + (void) asyncListener->OnStopRequest(channelRequest, nsnull, broadcastErrorCode); } // Clean up the event loop diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.h b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.h index 5f5f76e2cbf..9538a31071c 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.h +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.h @@ -99,7 +99,7 @@ class nsFtpState : public nsIStreamListener, public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIREQUEST nsFtpState(); diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp index c6ff6b5f713..d86c5506c6c 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp @@ -40,10 +40,10 @@ public: virtual ~nsFtpStreamProvider() {} // - // nsIStreamObserver implementation ... + // nsIRequestObserver implementation ... // NS_IMETHODIMP OnStartRequest(nsIRequest *req, nsISupports *ctxt) { return NS_OK; } - NS_IMETHODIMP OnStopRequest(nsIRequest *req, nsISupports *ctxt, nsresult status, const PRUnichar *statusText) { return NS_OK; } + NS_IMETHODIMP OnStopRequest(nsIRequest *req, nsISupports *ctxt, nsresult status) { return NS_OK; } // // nsIStreamProvider implementation ... @@ -77,7 +77,7 @@ public: NS_IMPL_THREADSAFE_ISUPPORTS2(nsFtpStreamProvider, nsIStreamProvider, - nsIStreamObserver) + nsIRequestObserver) // @@ -86,7 +86,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsFtpStreamProvider, NS_IMPL_THREADSAFE_QUERY_INTERFACE2(nsFtpControlConnection, nsIStreamListener, - nsIStreamObserver); + nsIRequestObserver); NS_IMPL_THREADSAFE_ADDREF(nsFtpControlConnection); nsrefcnt nsFtpControlConnection::Release(void) @@ -272,7 +272,7 @@ nsFtpControlConnection::OnStartRequest(nsIRequest *request, nsISupports *aContex NS_IMETHODIMP nsFtpControlConnection::OnStopRequest(nsIRequest *request, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { if (!mConnected) @@ -290,7 +290,7 @@ nsFtpControlConnection::OnStopRequest(nsIRequest *request, nsISupports *aContext if (!myListener) return NS_OK; - return myListener->OnStopRequest(request, aContext, aStatus, aStatusArg); + return myListener->OnStopRequest(request, aContext, aStatus); } diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.h b/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.h index 4073a84d1b2..7e95175cfab 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.h +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.h @@ -37,7 +37,7 @@ class nsFtpControlConnection : public nsIStreamListener public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER nsFtpControlConnection(nsITransport* socketTransport); virtual ~nsFtpControlConnection(); diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp index 0ef7ed9d8f7..521cfd853e6 100644 --- a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp +++ b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp @@ -73,7 +73,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS5(nsGopherChannel, nsIChannel, nsIRequest, nsIStreamListener, - nsIStreamObserver, + nsIRequestObserver, nsIProxy); nsresult @@ -301,13 +301,6 @@ nsGopherChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsGopherChannel::SetURI(nsIURI* aURI) -{ - mUrl = aURI; - return NS_OK; -} - NS_IMETHODIMP nsGopherChannel::Open(nsIInputStream **_retval) { @@ -333,7 +326,7 @@ nsGopherChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; mTransport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); return mTransport->OpenInputStream(0, (PRUint32)-1, 0, _retval); } @@ -373,26 +366,26 @@ nsGopherChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; mTransport->SetNotificationCallbacks(mCallbacks, - (mLoadAttributes & LOAD_BACKGROUND)); + (mLoadFlags & LOAD_BACKGROUND)); return SendRequest(mTransport); } NS_IMETHODIMP -nsGopherChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsGopherChannel::GetLoadFlags(PRUint32 *aLoadFlags) { if (mProxyChannel) - mProxyChannel->GetLoadAttributes(aLoadAttributes); - *aLoadAttributes = mLoadAttributes; + mProxyChannel->GetLoadFlags(aLoadFlags); + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsGopherChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsGopherChannel::SetLoadFlags(PRUint32 aLoadFlags) { if (mProxyChannel) - mProxyChannel->SetLoadAttributes(aLoadAttributes); - mLoadAttributes = aLoadAttributes; + mProxyChannel->SetLoadFlags(aLoadFlags); + mLoadFlags = aLoadFlags; return NS_OK; } @@ -531,7 +524,7 @@ nsGopherChannel::GetSecurityInfo(nsISupports * *aSecurityInfo) return NS_OK; } -// nsIStreamObserver methods +// nsIRequestObserver methods NS_IMETHODIMP nsGopherChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) { @@ -552,7 +545,7 @@ nsGopherChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) NS_IMETHODIMP nsGopherChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { PR_LOG(gGopherLog, PR_LOG_DEBUG, @@ -566,12 +559,12 @@ nsGopherChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext, aContext=mResponseContext; if (mListener) { - rv = mListener->OnStopRequest(this, aContext, aStatus, aStatusArg); + rv = mListener->OnStopRequest(this, aContext, aStatus); if (NS_FAILED(rv)) return rv; } if (mLoadGroup) { - rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus, aStatusArg); + rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus); } mTransport = 0; diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.h b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.h index adfe54defed..fde01645aaa 100644 --- a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.h +++ b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.h @@ -47,7 +47,7 @@ public: NS_DECL_NSICHANNEL NS_DECL_NSIPROXY NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER // nsGopherChannel methods: nsGopherChannel(); @@ -66,7 +66,7 @@ protected: nsCOMPtr mCallbacks; nsCOMPtr mUrl; nsCOMPtr mListener; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsCOMPtr mLoadGroup; nsCString mContentType; PRInt32 mContentLength; diff --git a/mozilla/netwerk/protocol/http/src/nsAuthEngine.cpp b/mozilla/netwerk/protocol/http/src/nsAuthEngine.cpp index e74bf6674a5..288c6388d99 100644 --- a/mozilla/netwerk/protocol/http/src/nsAuthEngine.cpp +++ b/mozilla/netwerk/protocol/http/src/nsAuthEngine.cpp @@ -32,6 +32,7 @@ #include "nsString.h" #include "nsIIOService.h" #include "nsIServiceManager.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp index d8771054323..5626671cb74 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp @@ -126,7 +126,7 @@ nsHTTPChannel::nsHTTPChannel(nsIURI *aURL, nsHTTPHandler *aHandler) , mCachedResponse(nsnull) , mHTTPServerListener(nsnull) , mURI(dont_QueryInterface(aURL)) - , mLoadAttributes(LOAD_NORMAL) + , mLoadFlags(LOAD_NORMAL) , mLoadGroup(nsnull) #ifdef MOZ_NEW_CACHE , mCacheAccess(nsICache::ACCESS_NONE) @@ -168,7 +168,7 @@ nsHTTPChannel::nsHTTPChannel(nsIURI *aURL, nsHTTPHandler *aHandler) PRBool isHTTPS = PR_FALSE; if (NS_SUCCEEDED(mURI->SchemeIs("https", &isHTTPS)) && isHTTPS) - mLoadAttributes |= nsIChannel::INHIBIT_PERSISTENT_CACHING; + mLoadFlags |= nsIRequest::INHIBIT_PERSISTENT_CACHING; } nsHTTPChannel::~nsHTTPChannel() @@ -305,13 +305,6 @@ nsHTTPChannel::GetURI(nsIURI **aURI) return NS_OK; } -NS_IMETHODIMP -nsHTTPChannel::SetURI(nsIURI *aURI) -{ - mURI = aURI; - return NS_OK; -} - NS_IMETHODIMP nsHTTPChannel::GetOpenHasEventQueue(PRBool *hasEventQueue) { @@ -393,17 +386,17 @@ nsHTTPChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext) } NS_IMETHODIMP -nsHTTPChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsHTTPChannel::GetLoadFlags(PRUint32 *aLoadFlags) { - NS_ENSURE_ARG_POINTER(aLoadAttributes); - *aLoadAttributes = mLoadAttributes; + NS_ENSURE_ARG_POINTER(aLoadFlags); + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsHTTPChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsHTTPChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -852,7 +845,7 @@ nsHTTPChannel::OpenCacheEntry() // Get a cache session with appropriate storage policy nsCacheStoragePolicy storagePolicy; - if (mLoadAttributes & INHIBIT_PERSISTENT_CACHING) + if (mLoadFlags & INHIBIT_PERSISTENT_CACHING) storagePolicy = nsICache::STORE_IN_MEMORY; else storagePolicy = nsICache::STORE_ANYWHERE; // allow on disk @@ -873,7 +866,7 @@ nsHTTPChannel::OpenCacheEntry() accessRequested = nsICache::ACCESS_READ; mFromCacheOnly = PR_TRUE; } - else if (mLoadAttributes & FORCE_RELOAD) + else if (mLoadFlags & FORCE_RELOAD) accessRequested = nsICache::ACCESS_WRITE; // replace cache entry else if (mFromCacheOnly) accessRequested = nsICache::ACCESS_READ; // read from cache @@ -1098,14 +1091,17 @@ nsHTTPChannel::CheckCache() LOG(("Content-length=%d, CacheEntryDataSize=%u\n", contentLength, size)); if (size != (PRUint32) contentLength) { - NS_WARNING("Cached data size does not match the Content-Length header"); + LOG(("Cached data size does not match the Content-Length header " + "[content-length=%u size=%u]\n", contentLength, size)); + NS_BREAK(); + //NS_WARNING("Cached data size does not match the Content-Length header"); return NS_OK; // must re-fetch } } // If validation is inhibited, we'll just use whatever data is in // the cache, regardless of whether or not it has expired. - if (mLoadAttributes & nsIChannel::VALIDATE_NEVER) { + if (mLoadFlags & nsIRequest::VALIDATE_NEVER) { mCachedContentIsValid = PR_TRUE; return NS_OK; } @@ -1134,8 +1130,8 @@ nsHTTPChannel::CheckCache() // If the FORCE_VALIDATION flag is set, any cached data won't be used until // it's revalidated with the server. - if (mLoadAttributes & nsIChannel::FORCE_VALIDATION) { - LOG(("honoring nsIChannel::FORCE_VALIDATION\n")); + if (mLoadFlags & nsIRequest::FORCE_VALIDATION) { + LOG(("honoring nsIRequest::FORCE_VALIDATION\n")); doIfModifiedSince = PR_TRUE; goto end; } @@ -1185,11 +1181,11 @@ nsHTTPChannel::CheckCache() // Check to see if we can use the cache data without revalidating // it with the server. //PRBool useHeuristicExpiration = - // mLoadAttributes & nsIChannel::VALIDATE_HEURISTICALLY; + // mLoadFlags & nsIRequest::VALIDATE_HEURISTICALLY; // If the content is stale, issue an if-modified-since request if (now > expirationTime) { - if (mLoadAttributes & nsIChannel::VALIDATE_ONCE_PER_SESSION) + if (mLoadFlags & nsIRequest::VALIDATE_ONCE_PER_SESSION) doIfModifiedSince = firstAccessThisSession; else // VALIDATE_ALWAYS || VALIDATE_HEURISTICALLY || default @@ -1268,7 +1264,7 @@ nsHTTPChannel::ReadFromCache() NS_RELEASE(listener); if (NS_FAILED(rv)) - ResponseCompleted(nsnull, rv, nsnull); + ResponseCompleted(nsnull, rv); return rv; } @@ -1389,7 +1385,7 @@ nsHTTPChannel::CacheReceivedResponse(nsIStreamListener *aListener, // For HTTPS connections, the storage policy will already be IN_MEMORY. // We are concerned instead about load attributes which may have changed. - if (mLoadAttributes & nsIChannel::INHIBIT_PERSISTENT_CACHING) { + if (mLoadFlags & nsIRequest::INHIBIT_PERSISTENT_CACHING) { rv = mCacheEntry->SetStoragePolicy(nsICache::STORE_IN_MEMORY); if (NS_FAILED(rv)) return rv; } @@ -1499,9 +1495,9 @@ nsHTTPChannel::CheckCache() return rv; PRUint32 cacheFlags; - if (mLoadAttributes & nsIChannel::CACHE_AS_FILE) + if (mLoadFlags & nsIRequest::CACHE_AS_FILE) cacheFlags = nsINetDataCacheManager::CACHE_AS_FILE; - else if (mLoadAttributes & nsIChannel::INHIBIT_PERSISTENT_CACHING) + else if (mLoadFlags & nsIRequest::INHIBIT_PERSISTENT_CACHING) cacheFlags = nsINetDataCacheManager::BYPASS_PERSISTENT_CACHE; else cacheFlags = 0; @@ -1541,7 +1537,7 @@ nsHTTPChannel::CheckCache() // If we can't use the cache data (because an end-to-end reload // has been requested) // there's no point in inspecting it since it's about to be overwritten. - if (mLoadAttributes & nsIChannel::FORCE_RELOAD) + if (mLoadFlags & nsIRequest::FORCE_RELOAD) return NS_OK; // Due to architectural limitations in the cache manager, a cache entry can @@ -1587,7 +1583,7 @@ nsHTTPChannel::CheckCache() // If validation is inhibited, we'll just use whatever data is in // the cache, regardless of whether or not it has expired. - if (mLoadAttributes & nsIChannel::VALIDATE_NEVER) { + if (mLoadFlags & nsIRequest::VALIDATE_NEVER) { LOG(("nsHTTPChannel::checkCache() [this=%x].\t" "obeying VALIDATE_NEVER\n", this)); mCachedContentIsValid = PR_TRUE; @@ -1633,7 +1629,7 @@ nsHTTPChannel::CheckCache() // it's revalidated with the server, so there's no point in checking if it's // expired. PRBool doIfModifiedSince; - if ((mLoadAttributes & nsIChannel::FORCE_VALIDATION) || mustRevalidate) + if ((mLoadFlags & nsIRequest::FORCE_VALIDATION) || mustRevalidate) doIfModifiedSince = PR_TRUE; else { doIfModifiedSince = PR_FALSE; @@ -1655,14 +1651,14 @@ nsHTTPChannel::CheckCache() // Check to see if we can use the cache data without revalidating // it with the server. - PRBool useHeuristicExpiration = mLoadAttributes & - nsIChannel::VALIDATE_HEURISTICALLY; + PRBool useHeuristicExpiration = mLoadFlags & + nsIRequest::VALIDATE_HEURISTICALLY; PRBool cacheEntryIsStale; cacheEntryIsStale = mCachedResponse->IsStale(useHeuristicExpiration); // If the content is stale, issue an if-modified-since request if (cacheEntryIsStale) { - if (mLoadAttributes & nsIChannel::VALIDATE_ONCE_PER_SESSION) + if (mLoadFlags & nsIRequest::VALIDATE_ONCE_PER_SESSION) doIfModifiedSince = firstAccessThisSession; else // VALIDATE_ALWAYS || VALIDATE_HEURISTICALLY || default @@ -1729,7 +1725,7 @@ nsHTTPChannel::ReadFromCache() // Propagate the load attributes of this channel into the cache channel. // This will ensure that notifications are suppressed if necessary. - rv = mCacheChannel->SetLoadAttributes(mLoadAttributes); + rv = mCacheChannel->SetLoadFlags(mLoadFlags); if (NS_FAILED(rv)) return rv; // Fake it so that HTTP headers come from cached versions @@ -1754,7 +1750,7 @@ nsHTTPChannel::ReadFromCache() NS_RELEASE(listener); if (NS_FAILED(rv)) - ResponseCompleted(nsnull, rv, nsnull); + ResponseCompleted(nsnull, rv); return rv; } @@ -2021,7 +2017,7 @@ nsHTTPChannel::Connect() // If this was a refetch of a POST transaction's resposne, then // this failure indicates that the response is no longer cached. rv = mPostID ? NS_ERROR_DOCUMENT_NOT_CACHED : NS_BINDING_FAILED; - return ResponseCompleted(mResponseDataListener, rv, nsnull); + return ResponseCompleted(mResponseDataListener, rv); } } #else @@ -2141,7 +2137,7 @@ nsHTTPChannel::Connect() if (NS_FAILED(rv)) { mConnected = PR_TRUE; - ResponseCompleted(mResponseDataListener, rv, nsnull); + ResponseCompleted(mResponseDataListener, rv); return rv; } } @@ -2167,7 +2163,7 @@ nsresult nsHTTPChannel::ReportProgress(PRUint32 aProgress, * Only fire progress notifications if the URI is being loaded in * the forground... */ - if (!(nsIChannel::LOAD_BACKGROUND & mLoadAttributes) && mProgressEventSink) + if (!(nsIRequest::LOAD_BACKGROUND & mLoadFlags) && mProgressEventSink) rv = mProgressEventSink->OnProgress(this, mResponseContext, aProgress, aProgressMax); return rv; @@ -2264,8 +2260,8 @@ nsresult nsHTTPChannel::Redirect(const char *aNewLocation, } // Add in LOAD_REPLACE to loadattributes indicate that this is a redirect - nsLoadFlags loadFlags = mLoadAttributes; - loadFlags |= nsIChannel::LOAD_REPLACE; + nsLoadFlags loadFlags = mLoadFlags; + loadFlags |= nsIRequest::LOAD_REPLACE; rv = NS_OpenURI(getter_AddRefs(channel), newURI, serv, mLoadGroup, mCallbacks, loadFlags); @@ -2327,8 +2323,7 @@ nsresult nsHTTPChannel::Redirect(const char *aNewLocation, return rv; } -nsresult nsHTTPChannel::ResponseCompleted(nsIStreamListener *aListener, - nsresult aStatus, const PRUnichar* aStatusArg) +nsresult nsHTTPChannel::ResponseCompleted(nsIStreamListener *aListener, nsresult aStatus) { nsresult rv = NS_OK; @@ -2415,8 +2410,11 @@ nsresult nsHTTPChannel::ResponseCompleted(nsIStreamListener *aListener, #ifdef MOZ_NEW_CACHE // Mark the cache entry valid before calling our listener - if (mCacheEntry && (mCacheAccess & nsICache::ACCESS_WRITE)) + if (mCacheEntry && (mCacheAccess & nsICache::ACCESS_WRITE)) { + LOG(("Calling MarkValid from ResponseCompleted [this=%x status=%x] (url=%s)\n", + this, aStatus, mRequest->Spec())); mCacheEntry->MarkValid(); + } mCacheReadRequest = 0; mCacheTransport = 0; #endif @@ -2426,7 +2424,7 @@ nsresult nsHTTPChannel::ResponseCompleted(nsIStreamListener *aListener, //---------------------------------------------------------------- mStatus = aStatus; // set the channel's status based on the respone status if (aListener) { - rv = aListener->OnStopRequest(this, mResponseContext, aStatus, aStatusArg); + rv = aListener->OnStopRequest(this, mResponseContext, aStatus); if (NS_FAILED(rv)) LOG(("nsHTTPChannel::OnStopRequest(...) [this=%x] " @@ -2452,7 +2450,7 @@ nsresult nsHTTPChannel::ResponseCompleted(nsIStreamListener *aListener, // if (mLoadGroup) - mLoadGroup->RemoveRequest(this, nsnull, aStatus, aStatusArg); + mLoadGroup->RemoveRequest(this, nsnull, aStatus); // Null out pointers that are no longer needed... @@ -2758,12 +2756,12 @@ nsHTTPChannel::Authenticate(const char *aChallenge, PRBool aProxyAuth) // not cached, except perhaps in the memory cache. // XXX if we had username and passwd in user-auth, and the interaction // XXX was standard, then it's safe to cache, I think (shaver) - mLoadAttributes |= nsIChannel::INHIBIT_PERSISTENT_CACHING; + mLoadFlags |= nsIRequest::INHIBIT_PERSISTENT_CACHING; // This smells like a clone function... maybe there is a // benefit in doing that, think. TODO. rv = NS_OpenURI(&channel, // delibrately... - mURI, serv, mLoadGroup, mCallbacks, mLoadAttributes); + mURI, serv, mLoadGroup, mCallbacks, mLoadFlags); if (NS_FAILED(rv)) return rv; rv = channel->SetOriginalURI(mOriginalURI); if (NS_FAILED(rv)) return rv; @@ -2822,7 +2820,7 @@ nsHTTPChannel::FinishedResponseHeaders(void) // if its a head request dont call processStatusCode but wrap up instead nsCOMPtr method(mRequest->Method()); if (method.get() == nsHTTPAtoms::Head) - return ResponseCompleted(mResponseDataListener, NS_OK, nsnull); + return ResponseCompleted(mResponseDataListener, NS_OK); // // Check the status code to see if any special processing is necessary. @@ -3090,7 +3088,7 @@ nsHTTPChannel::ProcessNotModifiedResponse(nsIStreamListener *aListener) rv = mCacheChannel->AsyncOpen(cacheListener, mResponseContext); #endif if (NS_FAILED(rv)) - ResponseCompleted(cacheListener, rv, nsnull); + ResponseCompleted(cacheListener, rv); NS_RELEASE(cacheListener); return rv; @@ -3492,7 +3490,7 @@ nsHTTPChannel::OnCacheEntryAvailable(nsICacheEntryDescriptor *entry, NS_IMPL_THREADSAFE_ISUPPORTS3(nsSyncHelper, nsIRunnable, nsIStreamListener, - nsIStreamObserver); + nsIRequestObserver); // nsIRunnable implementation NS_IMETHODIMP @@ -3550,7 +3548,7 @@ nsSyncHelper::OnDataAvailable(nsIRequest *request, } -// nsIStreamObserver implementation +// nsIRequestObserver implementation NS_IMETHODIMP nsSyncHelper::OnStartRequest(nsIRequest *request, nsISupports *aContext) { @@ -3559,10 +3557,10 @@ nsSyncHelper::OnStartRequest(nsIRequest *request, nsISupports *aContext) NS_IMETHODIMP nsSyncHelper::OnStopRequest(nsIRequest *request, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { mProcessing = PR_FALSE; - return mListener->OnStopRequest(request, aContext, aStatus, aStatusArg); + return mListener->OnStopRequest(request, aContext, aStatus); } diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.h b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.h index dab4becdb25..47cce095f63 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.h @@ -40,7 +40,6 @@ #include "nsIOutputStream.h" #include "nsHTTPResponseListener.h" #include "nsIStreamListener.h" -#include "nsIStreamObserver.h" #include "nsIProxy.h" #include "nsIPrompt.h" #include "nsIHTTPEventSink.h" @@ -118,8 +117,7 @@ public: nsresult Redirect(const char *aURL, nsIChannel **aResult, PRInt32 aStatusCode); - nsresult ResponseCompleted(nsIStreamListener *aListener, - nsresult aStatus, const PRUnichar* aStatusArg); + nsresult ResponseCompleted(nsIStreamListener *aListener, nsresult aStatus); nsresult SetResponse(nsHTTPResponse* i_pResp); nsresult GetResponseContext(nsISupports** aContext); @@ -190,7 +188,7 @@ protected: nsCOMPtr mRealProgressEventSink; nsCOMPtr mCallbacks; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsCOMPtr mLoadGroup; // nsIPrincipal @@ -276,7 +274,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIRUNNABLE NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER nsSyncHelper(); virtual ~nsSyncHelper() {}; diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp index e5431914581..2dddded54a5 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp @@ -1198,14 +1198,14 @@ nsresult nsHTTPHandler::RequestTransport(nsIURI* i_Uri, if (NS_FAILED(rv)) return rv; - nsLoadFlags loadFlags = nsIChannel::LOAD_NORMAL; - i_Channel->GetLoadAttributes(&loadFlags); + nsLoadFlags loadFlags = nsIRequest::LOAD_NORMAL; + i_Channel->GetLoadFlags(&loadFlags); nsCOMPtr callbacks; callbacks = do_QueryInterface(NS_STATIC_CAST(nsIHTTPChannel*, i_Channel)); trans->SetNotificationCallbacks(callbacks, - (loadFlags & nsIChannel::LOAD_BACKGROUND)); + (loadFlags & nsIRequest::LOAD_BACKGROUND)); socketTrans = do_QueryInterface(trans, &rv); if (NS_SUCCEEDED(rv)) { diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp index 541ac4b5ace..ffa809f2475 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp @@ -17,10 +17,10 @@ * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. * - * Original Author: Gagan Saksena - * * Contributor(s): + * Gagan Saksena (original author) * Adrian Havill + * Darin Fisher */ #include "nspr.h" @@ -181,6 +181,32 @@ nsHTTPRequest::Resume() return rv; } +NS_IMETHODIMP +nsHTTPRequest::GetLoadGroup(nsILoadGroup **loadGroup) +{ + *loadGroup = nsnull; + return NS_OK; +} + +NS_IMETHODIMP +nsHTTPRequest::SetLoadGroup(nsILoadGroup *loadGroup) +{ + return NS_OK; +} + +NS_IMETHODIMP +nsHTTPRequest::GetLoadFlags(nsLoadFlags *loadFlags) +{ + *loadFlags = nsIRequest::LOAD_NORMAL; + return NS_OK; +} + +NS_IMETHODIMP +nsHTTPRequest::SetLoadFlags(nsLoadFlags loadFlags) +{ + return NS_OK; +} + nsresult nsHTTPRequest::Clone(const nsHTTPRequest **aRequest) const { @@ -323,22 +349,22 @@ nsHTTPRequest::formHeaders(PRUint32 capabilities) SetHeader(nsHTTPAtoms::User_Agent, uaString.get()); } - PRUint32 loadAttributes; - mConnection->GetLoadAttributes(&loadAttributes); + PRUint32 loadFlags; + mConnection->GetLoadFlags(&loadFlags); - if (loadAttributes & - (nsIChannel::FORCE_VALIDATION | nsIChannel::FORCE_RELOAD)) { + if (loadFlags & + (nsIRequest::FORCE_VALIDATION | nsIRequest::FORCE_RELOAD)) { // We need to send 'Pragma:no-cache' to inhibit proxy caching even if // no proxy is configured since we might be talking with a transparent // proxy, i.e. one that operates at the network level. See bug #14772 SetHeader(nsHTTPAtoms::Pragma, "no-cache"); } - if (loadAttributes & nsIChannel::FORCE_RELOAD) { + if (loadFlags & nsIRequest::FORCE_RELOAD) { // If doing a reload, force end-to-end SetHeader(nsHTTPAtoms::Cache_Control, "no-cache"); } - else if (loadAttributes & nsIChannel::FORCE_VALIDATION) { + else if (loadFlags & nsIRequest::FORCE_VALIDATION) { // A "max-age=0" cache-control directive forces each cache along the // path to the origin server to revalidate its own entry, if any, with // the next cache or server. @@ -506,7 +532,7 @@ nsHTTPRequest::formBuffer(nsCString * requestBuffer, PRUint32 capabilities) static PRUint32 sPipelinedRequestCreated = 0; static PRUint32 sPipelinedRequestDeleted = 0; -NS_IMPL_THREADSAFE_ISUPPORTS1(nsHTTPPipelinedRequest, nsIStreamObserver) +NS_IMPL_THREADSAFE_ISUPPORTS1(nsHTTPPipelinedRequest, nsIRequestObserver) nsHTTPPipelinedRequest::nsHTTPPipelinedRequest(nsHTTPHandler *aHandler, const char *host, @@ -678,14 +704,14 @@ nsHTTPPipelinedRequest::WriteRequest(nsIInputStream *aRequestStream) // transport... // if (req->mConnection) { - nsLoadFlags loadAttributes = nsIChannel::LOAD_NORMAL; - req->mConnection->GetLoadAttributes(&loadAttributes); + nsLoadFlags loadFlags = nsIRequest::LOAD_NORMAL; + req->mConnection->GetLoadFlags(&loadFlags); nsCOMPtr callbacks; callbacks = do_QueryInterface(NS_STATIC_CAST(nsIHTTPChannel*, req->mConnection)); mTransport->SetNotificationCallbacks(callbacks, - (loadAttributes & nsIChannel::LOAD_BACKGROUND)); + (loadFlags & nsIRequest::LOAD_BACKGROUND)); } mOnStopDone = PR_FALSE; @@ -701,7 +727,7 @@ nsHTTPPipelinedRequest::WriteRequest(nsIInputStream *aRequestStream) } //////////////////////////////////////////////////////////////////////////////// -// nsIStreamObserver methods: +// nsIRequestObserver methods: NS_IMETHODIMP nsHTTPPipelinedRequest::OnStartRequest(nsIRequest *request, nsISupports* aContext) @@ -714,7 +740,7 @@ nsHTTPPipelinedRequest::OnStartRequest(nsIRequest *request, nsISupports* aContex NS_IMETHODIMP nsHTTPPipelinedRequest::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsresult rv; nsCOMPtr trans = do_QueryInterface(mTransport, &rv); @@ -834,7 +860,7 @@ nsHTTPPipelinedRequest::OnStopRequest(nsIRequest *request, nsISupports* aContext while (req) { nsCOMPtr consumer; req->mConnection->GetResponseDataListener(getter_AddRefs(consumer)); - req->mConnection->ResponseCompleted(consumer, rv, nsnull); + req->mConnection->ResponseCompleted(consumer, rv); // Notify the HTTPChannel that the request has finished @@ -1145,14 +1171,14 @@ nsHTTPPipelinedRequest::AdvanceToNextRequest() // on some machines, but not on others. Check for null to avoid // topcrash, although we really shouldn't need this. NS_ASSERTION(mTransport, "mTransport null in AdvanceToNextRequest"); - nsLoadFlags flags = nsIChannel::LOAD_NORMAL; - req->mConnection->GetLoadAttributes(&flags); + nsLoadFlags flags = nsIRequest::LOAD_NORMAL; + req->mConnection->GetLoadFlags(&flags); nsCOMPtr callbacks; callbacks = do_QueryInterface(NS_STATIC_CAST(nsIHTTPChannel*, req->mConnection)); mTransport->SetNotificationCallbacks(callbacks, - (flags & nsIChannel::LOAD_BACKGROUND)); + (flags & nsIRequest::LOAD_BACKGROUND)); NS_RELEASE(req); } diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.h b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.h index 51f7a528715..81b5ecf98d1 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.h @@ -26,7 +26,7 @@ #include "nscore.h" #include "nsCOMPtr.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsIInputStream.h" #include "nsIPipe.h" #include "nsIURL.h" @@ -159,7 +159,7 @@ protected: #define REQUEST_RESTART_NORMAL 0 #define REQUEST_RESTART_SSL 1 -class nsHTTPPipelinedRequest : public nsIStreamObserver +class nsHTTPPipelinedRequest : public nsIRequestObserver { public: @@ -167,7 +167,7 @@ public: nsHTTPPipelinedRequest (nsHTTPHandler* i_Handler, const char *host, PRInt32 port, PRUint32 capabilities); NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER nsresult SetTransport (nsITransport * aTransport); nsresult GetTransport (nsITransport **aTransport); diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp index 448dd3becc5..7e4ad05c411 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp @@ -17,9 +17,8 @@ * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. * - * Original Author: Gagan Saksena - * * Contributor(s): + * Gagan Saksena (original author) * Darin Fisher */ @@ -37,17 +36,15 @@ #include "nsIStreamConverter.h" #include "nsRepository.h" #include "nsIByteArrayInputStream.h" - #include "nsHTTPAtoms.h" #include "nsIHttpNotify.h" #include "nsINetModRegEntry.h" #include "nsIServiceManager.h" #include "nsINetModuleMgr.h" #include "nsIEventQueueService.h" - #include "nsXPIDLString.h" - #include "nsIIOService.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -109,7 +106,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsHTTPResponseListener) NS_IMPL_QUERY_INTERFACE2(nsHTTPResponseListener, nsIStreamListener, - nsIStreamObserver); + nsIRequestObserver); /////////////////////////////////////////////////////////////////////////////// @@ -134,7 +131,7 @@ nsHTTPCacheListener::~nsHTTPCacheListener() } //////////////////////////////////////////////////////////////////////////////// -// nsIStreamObserver methods: +// nsIRequestObserver methods: NS_IMETHODIMP nsHTTPCacheListener::OnStartRequest(nsIRequest *aRequest, @@ -159,7 +156,7 @@ nsHTTPCacheListener::OnStartRequest(nsIRequest *aRequest, NS_IMETHODIMP nsHTTPCacheListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { LOG(("nsHTTPCacheListener::OnStopRequest [this=%x]\n", this)); @@ -168,7 +165,7 @@ nsHTTPCacheListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext, // is no socket transport involved nsnull is passed as the // transport... // - return mChannel->ResponseCompleted(mResponseDataListener, aStatus, aStatusArg); + return mChannel->ResponseCompleted(mResponseDataListener, aStatus); } //////////////////////////////////////////////////////////////////////////////// @@ -590,7 +587,7 @@ nsHTTPServerListener::OnDataAvailable(nsIRequest *request, mResponse->GetStatus(&status); if (status != 304 || !mChannel->HasCachedResponse()) { - mChannel->ResponseCompleted(mResponseDataListener, NS_OK, nsnull); + mChannel->ResponseCompleted(mResponseDataListener, NS_OK); mChannel->SetHTTPServerListener(nsnull); } @@ -650,7 +647,7 @@ nsHTTPServerListener::OnStartRequest(nsIRequest* request, nsISupports* i_pContex NS_IMETHODIMP nsHTTPServerListener::OnStopRequest(nsIRequest* request, nsISupports* i_pContext, - nsresult i_Status, const PRUnichar* aStatusArg) + nsresult i_Status) { nsresult rv = i_Status, channelStatus = NS_OK; @@ -701,7 +698,7 @@ nsHTTPServerListener::OnStopRequest(nsIRequest* request, nsISupports* i_pContext mResponse->GetStatus(&status); if (status != 304 || mChannel->HasCachedResponse()) { - mChannel->ResponseCompleted(mResponseDataListener, i_Status, aStatusArg); + mChannel->ResponseCompleted(mResponseDataListener, i_Status); mChannel->SetHTTPServerListener(nsnull); } @@ -765,7 +762,7 @@ nsHTTPServerListener::OnStopRequest(nsIRequest* request, nsISupports* i_pContext if (mPipelinedRequest) { while (NS_SUCCEEDED(mPipelinedRequest->AdvanceToNextRequest())) { OnStartRequest(nsnull, nsnull); - mChannel->ResponseCompleted(mResponseDataListener, i_Status, aStatusArg); + mChannel->ResponseCompleted(mResponseDataListener, i_Status); mChannel->SetHTTPServerListener(nsnull); } @@ -1044,7 +1041,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsHTTPFinalListener) NS_IMPL_QUERY_INTERFACE2(nsHTTPFinalListener, nsIStreamListener, - nsIStreamObserver); + nsIRequestObserver); static PRUint32 sFinalListenersCreated = 0; static PRUint32 sFinalListenersDeleted = 0; @@ -1080,7 +1077,7 @@ nsHTTPFinalListener::~nsHTTPFinalListener() } //////////////////////////////////////////////////////////////////////////////// -// nsIStreamObserver methods: +// nsIRequestObserver methods: NS_IMETHODIMP nsHTTPFinalListener::OnStartRequest(nsIRequest *aRequest, @@ -1098,7 +1095,7 @@ nsHTTPFinalListener::OnStartRequest(nsIRequest *aRequest, NS_IMETHODIMP nsHTTPFinalListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { LOG(("nsHTTPFinalListener::OnStopRequest [this=%x]" ", mOnStopFired=%u\n", this, mOnStopFired)); @@ -1128,7 +1125,7 @@ nsHTTPFinalListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext, #endif mOnStopFired = PR_TRUE; - nsresult rv = mListener->OnStopRequest(aRequest, aContext, aStatus, aStatusArg); + nsresult rv = mListener->OnStopRequest(aRequest, aContext, aStatus); return rv; } @@ -1166,7 +1163,7 @@ nsHTTPFinalListener::OnDataAvailable(nsIRequest *aRequest, mBusy = PR_FALSE; if (mOnStopPending) - OnStopRequest(mChannel, mContext, NS_OK, nsnull); + OnStopRequest(mChannel, mContext, NS_OK); return rv; } @@ -1181,7 +1178,7 @@ nsHTTPFinalListener::FireNotifications() LOG(("nsHTTPFinalListener::FireNotifications [this=%x]\n", this)); if (!mShutdown) - OnStopRequest(mChannel, mContext, NS_OK, nsnull); + OnStopRequest(mChannel, mContext, NS_OK); } void diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h index 4dcfcbe4e71..3e438025801 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h @@ -86,7 +86,7 @@ protected: class nsHTTPServerListener : public nsHTTPResponseListener { public: - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsHTTPServerListener(nsHTTPChannel *aConnection, @@ -142,7 +142,7 @@ protected: class nsHTTPCacheListener : public nsHTTPResponseListener { public: - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsHTTPCacheListener(nsHTTPChannel *aChannel, @@ -165,7 +165,7 @@ class nsHTTPFinalListener : public nsIStreamListener { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsHTTPFinalListener(nsHTTPChannel* aChannel, diff --git a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp index 6c79adc00b1..5cbcc160ee0 100644 --- a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp +++ b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp @@ -61,7 +61,7 @@ PRLogModuleInfo* gJarProtocolLog = nsnull; #define NS_DEFAULT_JAR_BUFFER_MAX_SIZE (256*1024) nsJARChannel::nsJARChannel() - : mLoadAttributes(LOAD_NORMAL), + : mLoadFlags(LOAD_NORMAL), mContentType(nsnull), mContentLength(-1), mJAREntry(nsnull), @@ -95,7 +95,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS7(nsJARChannel, nsIJARChannel, nsIChannel, nsIRequest, - nsIStreamObserver, + nsIRequestObserver, nsIStreamListener, nsIStreamIO, nsIDownloadObserver) @@ -235,14 +235,6 @@ nsJARChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsJARChannel::SetURI(nsIURI* aURI) -{ - nsresult rv; - mURI = do_QueryInterface(aURI, &rv); - return rv; -} - nsresult nsJARChannel::OpenJARElement() { @@ -284,21 +276,6 @@ nsJARChannel::AsyncOpen(nsIStreamListener* listener, nsISupports* ctxt) mUserListener = listener; if (mLoadGroup) { - if (mUserListener) { - nsCOMPtr factory; - // - // Create a load group "proxy" listener... - // - rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory)); - if (factory) { - nsIStreamListener *newListener; - rv = factory->CreateLoadGroupListener(mUserListener, &newListener); - if (NS_SUCCEEDED(rv)) { - mUserListener = newListener; - NS_RELEASE(newListener); - } - } - } rv = mLoadGroup->AddRequest(this, nsnull); if (NS_FAILED(rv)) return rv; } @@ -331,7 +308,7 @@ nsJARChannel::EnsureJARFileAvailable() rv = NS_NewDownloader(getter_AddRefs(mDownloader), mJARBaseURI, this, nsnull, mSynchronousRead, mLoadGroup, mCallbacks, - mLoadAttributes); + mLoadFlags); // if DownloadComplete() was called early, need to release the reference. if (mSynchronousRead && mSynchronousInputStream) @@ -339,7 +316,7 @@ nsJARChannel::EnsureJARFileAvailable() error: if (NS_FAILED(rv) && mLoadGroup) { - nsresult rv2 = mLoadGroup->RemoveRequest(this, nsnull, NS_OK, nsnull); + nsresult rv2 = mLoadGroup->RemoveRequest(this, nsnull, NS_OK); NS_ASSERTION(NS_SUCCEEDED(rv2), "RemoveChannel failed"); } return rv; @@ -374,23 +351,24 @@ nsJARChannel::AsyncReadJARElement() ("nsJarProtocol: AsyncRead jar entry %s", (const char*)jarURLStr)); #endif - rv = jarTransport->AsyncRead(this, nsnull, 0, -1, 0, getter_AddRefs(mJarExtractionTransport)); + rv = jarTransport->AsyncRead(this, nsnull, 0, PRUint32(-1), 0, + getter_AddRefs(mJarExtractionTransport)); mJarExtractionTransport = 0; jarTransport = 0; return rv; } NS_IMETHODIMP -nsJARChannel::GetLoadAttributes(PRUint32* aLoadFlags) +nsJARChannel::GetLoadFlags(PRUint32* aLoadFlags) { - *aLoadFlags = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsJARChannel::SetLoadAttributes(PRUint32 aLoadFlags) +nsJARChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadFlags; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -578,7 +556,7 @@ nsJARChannel::OnDownloadComplete(nsIDownloader* aDownloader, nsISupports* aClosu } //////////////////////////////////////////////////////////////////////////////// -// nsIStreamObserver methods: +// nsIRequestObserver methods: NS_IMETHODIMP nsJARChannel::OnStartRequest(nsIRequest* jarExtractionTransport, @@ -589,7 +567,7 @@ nsJARChannel::OnStartRequest(nsIRequest* jarExtractionTransport, NS_IMETHODIMP nsJARChannel::OnStopRequest(nsIRequest* jarExtractionTransport, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsresult rv; #ifdef PR_LOGGING @@ -603,11 +581,11 @@ nsJARChannel::OnStopRequest(nsIRequest* jarExtractionTransport, nsISupports* con } #endif - rv = mUserListener->OnStopRequest(this, mUserContext, aStatus, aStatusArg); + rv = mUserListener->OnStopRequest(this, mUserContext, aStatus); NS_ASSERTION(NS_SUCCEEDED(rv), "OnStopRequest failed"); if (mLoadGroup) - mLoadGroup->RemoveRequest(this, context, aStatus, aStatusArg); + mLoadGroup->RemoveRequest(this, context, aStatus); mUserListener = nsnull; mUserContext = nsnull; diff --git a/mozilla/netwerk/protocol/jar/src/nsJARChannel.h b/mozilla/netwerk/protocol/jar/src/nsJARChannel.h index e8d08e93c06..218c32f068a 100644 --- a/mozilla/netwerk/protocol/jar/src/nsJARChannel.h +++ b/mozilla/netwerk/protocol/jar/src/nsJARChannel.h @@ -60,7 +60,7 @@ public: NS_DECL_NSIREQUEST NS_DECL_NSICHANNEL NS_DECL_NSIJARCHANNEL - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSISTREAMIO NS_DECL_NSIDOWNLOADOBSERVER @@ -86,7 +86,7 @@ protected: nsCOMPtr mLoadGroup; nsCOMPtr mCallbacks; nsCOMPtr mOriginalURI; - nsLoadFlags mLoadAttributes; + nsLoadFlags mLoadFlags; nsCOMPtr mOwner; nsCOMPtr mUserContext; diff --git a/mozilla/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp b/mozilla/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp index 1bb22157041..7de4d0488ce 100644 --- a/mozilla/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp @@ -29,6 +29,7 @@ #include "nsIURL.h" #include "nsJARChannel.h" #include "nsXPIDLString.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kJARUriCID, NS_JARURI_CID); diff --git a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp index 72657b7724d..cc2ac2f6ab5 100644 --- a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp @@ -29,6 +29,7 @@ #include "nsEscape.h" #include "nsIPref.h" #include "nsXPIDLString.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/netwerk/protocol/res/src/nsResChannel.cpp b/mozilla/netwerk/protocol/res/src/nsResChannel.cpp index ad114e946e8..8f7925af5e3 100644 --- a/mozilla/netwerk/protocol/res/src/nsResChannel.cpp +++ b/mozilla/netwerk/protocol/res/src/nsResChannel.cpp @@ -57,7 +57,7 @@ PRLogModuleInfo* gResChannelLog = nsnull; //////////////////////////////////////////////////////////////////////////////// nsResChannel::nsResChannel() -: mLoadAttributes(nsIResChannel::LOAD_NORMAL), +: mLoadFlags(nsIResChannel::LOAD_NORMAL), mState(QUIESCENT), mStatus(NS_OK) #ifdef DEBUG @@ -96,7 +96,7 @@ NS_INTERFACE_MAP_BEGIN(nsResChannel) NS_INTERFACE_MAP_ENTRY(nsIResChannel) NS_INTERFACE_MAP_ENTRY(nsIFileChannel) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIResChannel) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIRequest, nsIResChannel) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIChannel, nsIResChannel) @@ -270,12 +270,6 @@ nsResChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsResChannel::SetURI(nsIURI* aURI) -{ - return NS_ERROR_FAILURE; -} - nsresult nsResChannel::EnsureNextResolvedChannel() { @@ -303,8 +297,8 @@ nsResChannel::EnsureNextResolvedChannel() rv = mResolvedChannel->SetLoadGroup(mLoadGroup); if (NS_FAILED(rv)) goto done; } - if (mLoadAttributes != nsIResChannel::LOAD_NORMAL) { - rv = mResolvedChannel->SetLoadAttributes(mLoadAttributes); + if (mLoadFlags != nsIResChannel::LOAD_NORMAL) { + rv = mResolvedChannel->SetLoadFlags(mLoadFlags); if (NS_FAILED(rv)) goto done; } if (mCallbacks) { @@ -417,22 +411,22 @@ nsResChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) } while (NS_FAILED(rv)); if (NS_FAILED(rv)) - (void)EndRequest(rv, nsnull); + (void)EndRequest(rv); return rv; } NS_IMETHODIMP -nsResChannel::GetLoadAttributes(PRUint32 *aLoadAttributes) +nsResChannel::GetLoadFlags(PRUint32 *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsResChannel::SetLoadAttributes(PRUint32 aLoadAttributes) +nsResChannel::SetLoadFlags(PRUint32 aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -542,7 +536,7 @@ nsResChannel::OnStartRequest(nsIRequest* request, nsISupports* context) NS_IMETHODIMP nsResChannel::OnStopRequest(nsIRequest* request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { #ifdef DEBUG NS_ASSERTION(mInitiator == PR_CurrentThread(), @@ -559,15 +553,15 @@ nsResChannel::OnStopRequest(nsIRequest* request, nsISupports* context, break; } } - return EndRequest(aStatus, aStatusArg); + return EndRequest(aStatus); } nsresult -nsResChannel::EndRequest(nsresult aStatus, const PRUnichar* aStatusArg) +nsResChannel::EndRequest(nsresult aStatus) { nsresult rv; rv = mUserObserver->OnStopRequest(NS_STATIC_CAST(nsIResChannel*, this), - mUserContext, aStatus, aStatusArg); + mUserContext, aStatus); #if 0 // we don't add the resource channel to the group (although maybe we should) if (mLoadGroup) { if (NS_SUCCEEDED(rv)) { diff --git a/mozilla/netwerk/protocol/res/src/nsResChannel.h b/mozilla/netwerk/protocol/res/src/nsResChannel.h index 3908442d44c..ebc953fa47f 100644 --- a/mozilla/netwerk/protocol/res/src/nsResChannel.h +++ b/mozilla/netwerk/protocol/res/src/nsResChannel.h @@ -49,7 +49,7 @@ public: NS_DECL_NSICHANNEL NS_DECL_NSIFILECHANNEL NS_DECL_NSIRESCHANNEL - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsResChannel(); @@ -89,7 +89,7 @@ protected: // this method doesn't addref the listener NS_ASSERTION(mState == ASYNC_READ, "wrong state"); // this cast is safe because we set mUserObserver in AsyncRead - nsIStreamObserver* obs = mUserObserver; + nsIRequestObserver* obs = mUserObserver; nsIStreamListener* listener = NS_STATIC_CAST(nsIStreamListener*, obs); return listener; } @@ -98,19 +98,19 @@ protected: // this method doesn't addref the provider NS_ASSERTION(mState == ASYNC_WRITE, "wrong state"); // this cast is safe because we set mUserObserver in AsyncWrite - nsIStreamObserver* obs = mUserObserver; + nsIRequestObserver* obs = mUserObserver; nsIStreamProvider* provider = NS_STATIC_CAST(nsIStreamProvider*, obs); return provider; } nsresult EnsureNextResolvedChannel(); - nsresult EndRequest(nsresult aStatus, const PRUnichar* aStatusArg); + nsresult EndRequest(nsresult aStatus); protected: nsCOMPtr mOriginalURI; nsCOMPtr mResourceURI; nsCOMPtr mCallbacks; - PRUint32 mLoadAttributes; + PRUint32 mLoadFlags; nsCOMPtr mLoadGroup; nsCOMPtr mOwner; @@ -118,7 +118,7 @@ protected: nsCOMPtr mResolvedChannel; State mState; Substitutions mSubstitutions; - nsCOMPtr mUserObserver; + nsCOMPtr mUserObserver; nsCOMPtr mUserContext; nsresult mStatus; #ifdef DEBUG diff --git a/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp b/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp index e86b10f2b86..5f9e17bc889 100644 --- a/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp @@ -47,6 +47,7 @@ #include "nsXPIDLString.h" #include "nsIFile.h" #include "nsDirectoryServiceDefs.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp index 95fb35f7abc..29bfefde112 100644 --- a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp +++ b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp @@ -35,6 +35,7 @@ #include "mozTXTToHTMLConv.h" #include "nsIServiceManager.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -1105,7 +1106,7 @@ mozTXTToHTMLConv::OnStartRequest(nsIRequest* request, nsISupports *ctxt) NS_IMETHODIMP mozTXTToHTMLConv::OnStopRequest(nsIRequest* request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.h b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.h index 272f63c736a..ff0487a5be9 100644 --- a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.h +++ b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.h @@ -63,7 +63,7 @@ public: { static nsIID iid = MOZITXTTOHTMLCONV_IID; return iid; } NS_DECL_MOZITXTTOHTMLCONV - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSISTREAMCONVERTER diff --git a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index 405a7389edd..db35f9233e5 100644 --- a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -65,7 +65,7 @@ PRLogModuleInfo* gFTPDirListConvLog = nsnull; NS_IMPL_THREADSAFE_ISUPPORTS3(nsFTPDirListingConv, nsIStreamConverter, nsIStreamListener, - nsIStreamObserver); + nsIRequestObserver); // nsIStreamConverter implementation @@ -354,7 +354,7 @@ nsFTPDirListingConv::OnDataAvailable(nsIRequest* request, nsISupports *ctxt, } -// nsIStreamObserver implementation +// nsIRequestObserver implementation NS_IMETHODIMP nsFTPDirListingConv::OnStartRequest(nsIRequest* request, nsISupports *ctxt) { // we don't care about start. move along... but start masqeurading @@ -364,7 +364,7 @@ nsFTPDirListingConv::OnStartRequest(nsIRequest* request, nsISupports *ctxt) { NS_IMETHODIMP nsFTPDirListingConv::OnStopRequest(nsIRequest* request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { // we don't care about stop. move along... nsresult rv; @@ -378,9 +378,9 @@ nsFTPDirListingConv::OnStopRequest(nsIRequest* request, nsISupports *ctxt, if (NS_FAILED(rv)) return rv; if (loadgroup) - (void)loadgroup->RemoveRequest(mPartChannel, nsnull, aStatus, aStatusArg); + (void)loadgroup->RemoveRequest(mPartChannel, nsnull, aStatus); - return mFinalListener->OnStopRequest(mPartChannel, ctxt, aStatus, aStatusArg); + return mFinalListener->OnStopRequest(mPartChannel, ctxt, aStatus); } diff --git a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.h b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.h index 41b1ca48ab8..8eee08fa713 100644 --- a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.h +++ b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.h @@ -105,8 +105,8 @@ public: // nsIStreamListener methods NS_DECL_NSISTREAMLISTENER - // nsIStreamObserver methods - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods + NS_DECL_NSIREQUESTOBSERVER // nsFTPDirListingConv methods nsFTPDirListingConv(); diff --git a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp index 15158f4f5fa..b8d7f76c479 100644 --- a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp @@ -34,7 +34,7 @@ #include "nsIStreamListener.h" #include "nsIStreamConverter.h" #include "nsIStringStream.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsNetUtil.h" #include "nsMimeTypes.h" @@ -44,7 +44,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsGopherDirListingConv, nsIStreamConverter, nsIStreamListener, - nsIStreamObserver); + nsIRequestObserver); // nsIStreamConverter implementation @@ -232,7 +232,7 @@ nsGopherDirListingConv::OnDataAvailable(nsIRequest *request, return NS_OK; } -// nsIStreamObserver implementation +// nsIRequestObserver implementation NS_IMETHODIMP nsGopherDirListingConv::OnStartRequest(nsIRequest *request, nsISupports *ctxt) { // we don't care about start. move along... but start masqeurading @@ -242,18 +242,15 @@ nsGopherDirListingConv::OnStartRequest(nsIRequest *request, nsISupports *ctxt) { NS_IMETHODIMP nsGopherDirListingConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult aStatus, - const PRUnichar* aStatusArg) { + nsresult aStatus) { // we don't care about stop. move along... nsCOMPtr loadgroup; nsresult rv = mPartChannel->GetLoadGroup(getter_AddRefs(loadgroup)); if (NS_FAILED(rv)) return rv; if (loadgroup) - (void)loadgroup->RemoveRequest(mPartChannel, nsnull, - aStatus, aStatusArg); + (void)loadgroup->RemoveRequest(mPartChannel, nsnull, aStatus); - return mFinalListener->OnStopRequest(mPartChannel, ctxt, - aStatus, aStatusArg); + return mFinalListener->OnStopRequest(mPartChannel, ctxt, aStatus); } // nsGopherDirListingConv methods diff --git a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.h b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.h index fc97fa913a3..624d650e310 100644 --- a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.h +++ b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.h @@ -59,8 +59,8 @@ public: // nsIStreamListener methods NS_DECL_NSISTREAMLISTENER - // nsIStreamObserver methods - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods + NS_DECL_NSIREQUESTOBSERVER nsGopherDirListingConv(); virtual ~nsGopherDirListingConv(); diff --git a/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.cpp b/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.cpp index 7a25acb1743..4bd4918e7ed 100644 --- a/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.cpp @@ -103,9 +103,9 @@ nsHTTPChunkConv::OnStartRequest (nsIRequest* request, nsISupports *aContext) NS_IMETHODIMP nsHTTPChunkConv::OnStopRequest(nsIRequest* request, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { - return mListener->OnStopRequest(request, aContext, aStatus, aStatusArg); + return mListener->OnStopRequest(request, aContext, aStatus); } NS_IMETHODIMP diff --git a/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.h b/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.h index 7755f1eb575..4b643067e1f 100644 --- a/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.h +++ b/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.h @@ -74,7 +74,7 @@ public: // nsISupports methods NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER // nsIStreamConverter methods diff --git a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp index c5ea3c46f6f..a16a1fb0394 100644 --- a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp @@ -102,9 +102,9 @@ nsHTTPCompressConv::OnStartRequest (nsIRequest* request, nsISupports *aContext) NS_IMETHODIMP nsHTTPCompressConv::OnStopRequest(nsIRequest* request, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { - return mListener->OnStopRequest(request, aContext, aStatus, aStatusArg); + return mListener->OnStopRequest(request, aContext, aStatus); } NS_IMETHODIMP diff --git a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.h b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.h index 201bcddf2f2..64406f4f10c 100644 --- a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.h +++ b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.h @@ -60,7 +60,7 @@ public: // nsISupports methods NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER // nsIStreamConverter methods diff --git a/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp b/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp index d6ae527b1a8..0b5a7ca8c86 100644 --- a/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp +++ b/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp @@ -27,7 +27,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsIndexedToHTML, nsIStreamConverter, - nsIStreamObserver, + nsIRequestObserver, nsIStreamListener); @@ -100,7 +100,7 @@ nsIndexedToHTML::OnStartRequest(nsIRequest* request, nsISupports *aContext) NS_IMETHODIMP nsIndexedToHTML::OnStopRequest(nsIRequest* request, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { nsresult rv = NS_OK; nsString buffer; buffer.AssignWithConversion("
\n"); @@ -117,7 +117,7 @@ nsIndexedToHTML::OnStopRequest(nsIRequest* request, nsISupports *aContext, inputData, 0, buffer.Length()); if (NS_FAILED(rv)) return rv; - return mListener->OnStopRequest(request, aContext, aStatus, aStatusArg); + return mListener->OnStopRequest(request, aContext, aStatus); } nsresult diff --git a/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.h b/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.h index ac03f6c0b09..56b0111f409 100644 --- a/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.h +++ b/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.h @@ -39,7 +39,7 @@ class nsIndexedToHTML : public nsIStreamConverter public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMCONVERTER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsIndexedToHTML(); diff --git a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp index 41293de1c7c..449fee9ad94 100644 --- a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp @@ -34,7 +34,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsMultiMixedConv, nsIStreamConverter, nsIStreamListener, - nsIStreamObserver); + nsIRequestObserver); // nsIStreamConverter implementation @@ -160,7 +160,7 @@ nsMultiMixedConv::OnDataAvailable(nsIRequest *request, nsISupports *context, if (NS_FAILED(rv)) return rv; buffer = nsnull; bufLen = 0; - return SendStop(NS_OK, nsnull); + return SendStop(NS_OK); } if (!mNewPart && token > cursor) { @@ -192,7 +192,7 @@ nsMultiMixedConv::OnDataAvailable(nsIRequest *request, nsISupports *context, } } else { mNewPart = PR_TRUE; - rv = SendStop(NS_OK, nsnull); + rv = SendStop(NS_OK); if (NS_FAILED(rv)) ERR_OUT // reset to the token to front. // this allows us to treat the token @@ -239,7 +239,7 @@ nsMultiMixedConv::OnDataAvailable(nsIRequest *request, nsISupports *context, } -// nsIStreamObserver implementation +// nsIRequestObserver implementation NS_IMETHODIMP nsMultiMixedConv::OnStartRequest(nsIRequest *request, nsISupports *ctxt) { // we're assuming the content-type is available at this stage @@ -292,7 +292,7 @@ nsMultiMixedConv::OnStartRequest(nsIRequest *request, nsISupports *ctxt) { NS_IMETHODIMP nsMultiMixedConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { if (mPartChannel) { // we've already called SendStart() (which sets up the mPartChannel, // and fires an OnStart()) send any data left over, and then fire the stop. @@ -304,13 +304,13 @@ nsMultiMixedConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt, mBuffer = nsnull; mBufLen = 0; } - (void) SendStop(aStatus, aStatusArg); + (void) SendStop(aStatus); } else if (NS_FAILED(aStatus)) { // underlying data production problem. we should not be in // the middle of sending data. if we were, mPartChannel, // above, would have been true. (void) mFinalListener->OnStartRequest(request, ctxt); - (void) mFinalListener->OnStopRequest(request, ctxt, aStatus, aStatusArg); + (void) mFinalListener->OnStopRequest(request, ctxt, aStatus); } return NS_OK; @@ -370,9 +370,9 @@ nsMultiMixedConv::SendStart(nsIChannel *aChannel) { if (NS_FAILED(rv)) return rv; nsLoadFlags loadFlags = 0; - mPartChannel->GetLoadAttributes(&loadFlags); - loadFlags |= nsIChannel::LOAD_REPLACE; - mPartChannel->SetLoadAttributes(loadFlags); + mPartChannel->GetLoadFlags(&loadFlags); + loadFlags |= nsIRequest::LOAD_REPLACE; + mPartChannel->SetLoadFlags(loadFlags); nsCOMPtr loadGroup; (void)aChannel->GetLoadGroup(getter_AddRefs(loadGroup)); @@ -391,11 +391,11 @@ nsMultiMixedConv::SendStart(nsIChannel *aChannel) { nsresult -nsMultiMixedConv::SendStop(nsresult aStatus, const PRUnichar* aStatusArg) { +nsMultiMixedConv::SendStop(nsresult aStatus) { nsresult rv = NS_OK; if (mPartChannel) { - rv = mFinalListener->OnStopRequest(mPartChannel, mContext, aStatus, aStatusArg); + rv = mFinalListener->OnStopRequest(mPartChannel, mContext, aStatus); // don't check for failure here, we need to remove the channel from // the loadgroup. @@ -403,7 +403,7 @@ nsMultiMixedConv::SendStop(nsresult aStatus, const PRUnichar* aStatusArg) { nsCOMPtr loadGroup; (void) mPartChannel->GetLoadGroup(getter_AddRefs(loadGroup)); if (loadGroup) - (void) loadGroup->RemoveRequest(mPartChannel, mContext, aStatus, aStatusArg); + (void) loadGroup->RemoveRequest(mPartChannel, mContext, aStatus); } mPartChannel = 0; diff --git a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.h b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.h index 3b3ae9d8fd5..d105534f568 100644 --- a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.h +++ b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.h @@ -80,14 +80,14 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMCONVERTER NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER nsMultiMixedConv(); virtual ~nsMultiMixedConv(); protected: nsresult SendStart(nsIChannel *aChannel); - nsresult SendStop(nsresult aStatus, const PRUnichar *aStatusMsg); + nsresult SendStop(nsresult aStatus); nsresult SendData(char *aBuffer, PRUint32 aLen); nsresult ParseHeaders(nsIChannel *aChannel, char *&aPtr, PRUint32 &aLen, PRBool *_retval); diff --git a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp index 44a86833b14..c4d5510a2b4 100644 --- a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp @@ -30,7 +30,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsTXTToHTMLConv, nsIStreamConverter, nsITXTToHTMLConv, - nsIStreamObserver, + nsIRequestObserver, nsIStreamListener); @@ -53,7 +53,7 @@ nsTXTToHTMLConv::AsyncConvertData(const PRUnichar *aFromType, } -// nsIStreamObserver methods +// nsIRequestObserver methods NS_IMETHODIMP nsTXTToHTMLConv::OnStartRequest(nsIRequest* request, nsISupports *aContext) { mBuffer.AssignWithConversion("\n"); @@ -84,7 +84,7 @@ nsTXTToHTMLConv::OnStartRequest(nsIRequest* request, nsISupports *aContext) { NS_IMETHODIMP nsTXTToHTMLConv::OnStopRequest(nsIRequest* request, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { nsresult rv = NS_OK; if (mToken) { // we still have an outstanding token @@ -109,7 +109,7 @@ nsTXTToHTMLConv::OnStopRequest(nsIRequest* request, nsISupports *aContext, inputData, 0, mBuffer.Length()); if (NS_FAILED(rv)) return rv; - return mListener->OnStopRequest(request, aContext, aStatus, aStatusArg); + return mListener->OnStopRequest(request, aContext, aStatus); } // nsITXTToHTMLConv methods diff --git a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.h b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.h index 124d69641b5..ec04a71f1cb 100644 --- a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.h +++ b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.h @@ -49,7 +49,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMCONVERTER NS_DECL_NSITXTTOHTMLCONV - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER nsTXTToHTMLConv(); diff --git a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp index 1a6cb182870..5e0ba752879 100644 --- a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp +++ b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp @@ -75,7 +75,7 @@ NS_IMPL_RELEASE(nsUnknownDecoder); NS_INTERFACE_MAP_BEGIN(nsUnknownDecoder) NS_INTERFACE_MAP_ENTRY(nsIStreamConverter) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END @@ -181,7 +181,7 @@ nsUnknownDecoder::OnDataAvailable(nsIRequest* request, // ---- // -// nsIStreamObserver methods... +// nsIRequestObserver methods... // // ---- @@ -207,7 +207,7 @@ nsUnknownDecoder::OnStartRequest(nsIRequest* request, nsISupports *aCtxt) NS_IMETHODIMP nsUnknownDecoder::OnStopRequest(nsIRequest* request, nsISupports *aCtxt, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { nsresult rv = NS_OK; @@ -229,7 +229,7 @@ nsUnknownDecoder::OnStopRequest(nsIRequest* request, nsISupports *aCtxt, } } - rv = mNextListener->OnStopRequest(request, aCtxt, aStatus, aStatusArg); + rv = mNextListener->OnStopRequest(request, aCtxt, aStatus); mNextListener = 0; return rv; diff --git a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.h b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.h index 78d037aab7d..572cc9078ee 100644 --- a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.h +++ b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.h @@ -50,8 +50,8 @@ public: // nsIStreamListener methods NS_DECL_NSISTREAMLISTENER - // nsIStreamObserver methods - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods + NS_DECL_NSIREQUESTOBSERVER nsUnknownDecoder(); diff --git a/mozilla/netwerk/streamconv/test/Converters.cpp b/mozilla/netwerk/streamconv/test/Converters.cpp index edc4e037101..c831a44df1c 100644 --- a/mozilla/netwerk/streamconv/test/Converters.cpp +++ b/mozilla/netwerk/streamconv/test/Converters.cpp @@ -102,7 +102,7 @@ TestConverter::OnDataAvailable(nsIRequest* request, return mListener->OnDataAvailable(request, ctxt, convertedStream, sourceOffset, len); }; -// nsIStreamObserver methods +// nsIRequestObserver methods /* These methods just pass through directly to the mListener */ NS_IMETHODIMP TestConverter::OnStartRequest(nsIRequest* request, nsISupports *ctxt) { @@ -111,8 +111,8 @@ TestConverter::OnStartRequest(nsIRequest* request, nsISupports *ctxt) { NS_IMETHODIMP TestConverter::OnStopRequest(nsIRequest* request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) { - return mListener->OnStopRequest(request, ctxt, aStatus, aStatusArg); + nsresult aStatus) { + return mListener->OnStopRequest(request, ctxt, aStatus); }; diff --git a/mozilla/netwerk/streamconv/test/Converters.h b/mozilla/netwerk/streamconv/test/Converters.h index 82c71b63734..dc3fb58531a 100644 --- a/mozilla/netwerk/streamconv/test/Converters.h +++ b/mozilla/netwerk/streamconv/test/Converters.h @@ -22,7 +22,7 @@ static NS_DEFINE_CID(kTestConverterCID, NS_TESTCONVERTER_CID); class TestConverter : public nsIStreamConverter { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER TestConverter(); diff --git a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp index f2f1b516e53..5a33d75f985 100644 --- a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp +++ b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp @@ -96,11 +96,11 @@ public: return NS_OK; } - // nsIStreamObserver methods + // nsIRequestObserver methods NS_IMETHOD OnStartRequest(nsIRequest* request, nsISupports *ctxt) { return NS_OK; } NS_IMETHOD OnStopRequest(nsIRequest* request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) { return NS_OK; } + nsresult aStatus) { return NS_OK; } }; NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener); @@ -249,7 +249,7 @@ main(int argc, char* argv[]) if (NS_FAILED(rv)) return rv; // Finish the request. - rv = converterListener->OnStopRequest(request, nsnull, rv, nsnull); + rv = converterListener->OnStopRequest(request, nsnull, rv); if (NS_FAILED(rv)) return rv; NS_RELEASE(converterListener); diff --git a/mozilla/netwerk/test/TestCacheMgr.cpp b/mozilla/netwerk/test/TestCacheMgr.cpp index fd56cf15be6..016bead349e 100644 --- a/mozilla/netwerk/test/TestCacheMgr.cpp +++ b/mozilla/netwerk/test/TestCacheMgr.cpp @@ -17,7 +17,7 @@ */ #include "nsIStreamListener.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsIServiceManager.h" #include "nsIInputStream.h" #include "nsIOutputStream.h" @@ -245,7 +245,7 @@ protected: PRUint32 mExpectedStreamLength; }; -NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver) +NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIRequestObserver) static nsIEventQueue* eventQueue; diff --git a/mozilla/netwerk/test/TestCallbacks.cpp b/mozilla/netwerk/test/TestCallbacks.cpp index b61f5ca92bc..67d024cba20 100644 --- a/mozilla/netwerk/test/TestCallbacks.cpp +++ b/mozilla/netwerk/test/TestCallbacks.cpp @@ -77,7 +77,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(ConsumerContext, nsIEquals); class Consumer : public nsIStreamListener { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER Consumer(); @@ -95,10 +95,10 @@ public: }; // nsISupports implementation -NS_IMPL_THREADSAFE_ISUPPORTS2(Consumer, nsIStreamListener, nsIStreamObserver); +NS_IMPL_THREADSAFE_ISUPPORTS2(Consumer, nsIStreamListener, nsIRequestObserver); -// nsIStreamObserver implementation +// nsIRequestObserver implementation NS_IMETHODIMP Consumer::OnStartRequest(nsIRequest *request, nsISupports* aContext) { fprintf(stderr, "Consumer::OnStart() -> in\n\n"); @@ -117,7 +117,7 @@ Consumer::OnStartRequest(nsIRequest *request, nsISupports* aContext) { NS_IMETHODIMP Consumer::OnStopRequest(nsIRequest *request, nsISupports *aContext, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { fprintf(stderr, "Consumer::OnStop() -> in\n\n"); if (!mOnStart) { diff --git a/mozilla/netwerk/test/TestFileInput.cpp b/mozilla/netwerk/test/TestFileInput.cpp index 1221ce872bd..fe65148686c 100644 --- a/mozilla/netwerk/test/TestFileInput.cpp +++ b/mozilla/netwerk/test/TestFileInput.cpp @@ -141,7 +141,7 @@ public: } NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { nsresult rv; PR_EnterMonitor(mMonitor); PRIntervalTime endTime = PR_IntervalNow(); @@ -242,7 +242,7 @@ Simulated_nsFileTransport_Run(nsReader* reader, const char* path) done: NS_IF_RELEASE(bufStr); - rv = reader->OnStopRequest(nsnull, nsnull, rv, nsnull); + rv = reader->OnStopRequest(nsnull, nsnull, rv); return rv; } diff --git a/mozilla/netwerk/test/TestFileTransport.cpp b/mozilla/netwerk/test/TestFileTransport.cpp index b1cd9ad5cbc..154f5068af7 100644 --- a/mozilla/netwerk/test/TestFileTransport.cpp +++ b/mozilla/netwerk/test/TestFileTransport.cpp @@ -101,7 +101,7 @@ public: } NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { PRINTF(("ending status=%0x total=%d\n", aStatus, mTotal)); if (--mStopCount == 0) gDone = PR_TRUE; @@ -168,7 +168,7 @@ protected: PRUint32 mStopCount; }; -NS_IMPL_THREADSAFE_ISUPPORTS2(MyListener, nsIStreamListener, nsIStreamObserver); +NS_IMPL_THREADSAFE_ISUPPORTS2(MyListener, nsIStreamListener, nsIRequestObserver); //////////////////////////////////////////////////////////////////////////////// @@ -286,7 +286,7 @@ TestAsyncWrite(const char* fileName, PRUint32 offset, PRInt32 length) //////////////////////////////////////////////////////////////////////////////// #if 0 -class MyOpenObserver : public nsIStreamObserver +class MyOpenObserver : public nsIRequestObserver { public: NS_DECL_ISUPPORTS @@ -307,7 +307,7 @@ public: } NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { PRINTF(("stream closed: status %x\n", aStatus)); return NS_OK; } @@ -316,7 +316,7 @@ public: virtual ~MyOpenObserver() {} }; -NS_IMPL_ISUPPORTS1(MyOpenObserver, nsIStreamObserver); +NS_IMPL_ISUPPORTS1(MyOpenObserver, nsIRequestObserver); #endif //////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/test/TestMCTransport.cpp b/mozilla/netwerk/test/TestMCTransport.cpp index a0cce1bd2d0..02f85af4dd6 100644 --- a/mozilla/netwerk/test/TestMCTransport.cpp +++ b/mozilla/netwerk/test/TestMCTransport.cpp @@ -62,7 +62,7 @@ class TestListener : public nsIStreamListener public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER TestListener(char *); virtual ~TestListener(); @@ -74,7 +74,7 @@ private: NS_IMPL_ISUPPORTS2(TestListener, nsIStreamListener, - nsIStreamObserver) + nsIRequestObserver) TestListener::TestListener(char *filename) : mFilename(filename) @@ -100,7 +100,7 @@ TestListener::OnStartRequest(nsIRequest *req, nsISupports *ctx) } NS_IMETHODIMP -TestListener::OnStopRequest(nsIRequest *req, nsISupports *ctx, nsresult status, const PRUnichar *msg) +TestListener::OnStopRequest(nsIRequest *req, nsISupports *ctx, nsresult status) { printf("OnStopRequest: status=%x\n", status); diff --git a/mozilla/netwerk/test/TestOverlappedIO.cpp b/mozilla/netwerk/test/TestOverlappedIO.cpp index 568b0ca3633..b2ac136d001 100644 --- a/mozilla/netwerk/test/TestOverlappedIO.cpp +++ b/mozilla/netwerk/test/TestOverlappedIO.cpp @@ -73,12 +73,12 @@ public: virtual ~TestListener() {} NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER }; NS_IMPL_ISUPPORTS2(TestListener, - nsIStreamObserver, + nsIRequestObserver, nsIStreamListener); NS_IMETHODIMP @@ -112,7 +112,7 @@ TestListener::OnDataAvailable(nsIRequest* request, NS_IMETHODIMP TestListener::OnStopRequest(nsIRequest* request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { LOG(("TestListener::OnStopRequest [aStatus=%x]\n", aStatus)); //gKeepRunning = 0; @@ -132,7 +132,7 @@ public: virtual ~TestProvider(); NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMPROVIDER protected: @@ -144,7 +144,7 @@ protected: NS_IMPL_ISUPPORTS2(TestProvider, nsIStreamProvider, - nsIStreamObserver) + nsIRequestObserver) TestProvider::TestProvider(char *data) { @@ -170,7 +170,7 @@ TestProvider::OnStartRequest(nsIRequest* request, nsISupports* context) NS_IMETHODIMP TestProvider::OnStopRequest(nsIRequest* request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { LOG(("TestProvider::OnStopRequest [status=%x]\n", aStatus)); return NS_OK; diff --git a/mozilla/netwerk/test/TestProtocols.cpp b/mozilla/netwerk/test/TestProtocols.cpp index 43435f63600..df3bd6fc11f 100644 --- a/mozilla/netwerk/test/TestProtocols.cpp +++ b/mozilla/netwerk/test/TestProtocols.cpp @@ -239,17 +239,17 @@ public: virtual ~InputTestConsumer(); NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER }; //////////////////////////////////////////////////////////////////////////////// -class OpenObserver : public nsIStreamObserver +class OpenObserver : public nsIRequestObserver { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER OpenObserver(InputTestConsumer* cons) : mInputConsumer(cons) { @@ -261,7 +261,7 @@ protected: InputTestConsumer* mInputConsumer; }; -NS_IMPL_ISUPPORTS1(OpenObserver, nsIStreamObserver); +NS_IMPL_ISUPPORTS1(OpenObserver, nsIRequestObserver); NS_IMETHODIMP OpenObserver::OnStartRequest(nsIRequest *request, nsISupports* context) @@ -284,7 +284,7 @@ OpenObserver::OnStartRequest(nsIRequest *request, nsISupports* context) NS_IMETHODIMP OpenObserver::OnStopRequest(nsIRequest *request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { printf("\n+++ OpenObserver::OnStopRequest (status = %x) +++." "\tContext = %p\n", @@ -395,7 +395,7 @@ void FireDecrement() NS_IMETHODIMP InputTestConsumer::OnStopRequest(nsIRequest *request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { URLLoadInfo* info = (URLLoadInfo*)context; diff --git a/mozilla/netwerk/test/TestRawCache.cpp b/mozilla/netwerk/test/TestRawCache.cpp index 06bfe0b483d..e0e239f3e85 100644 --- a/mozilla/netwerk/test/TestRawCache.cpp +++ b/mozilla/netwerk/test/TestRawCache.cpp @@ -17,7 +17,6 @@ */ #include "nsIStreamListener.h" -#include "nsIStreamObserver.h" #include "nsIServiceManager.h" #include "nsIInputStream.h" #include "nsIOutputStream.h" @@ -256,7 +255,7 @@ protected: PRUint32 mExpectedStreamLength; }; -NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver) +NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIRequestObserver) static nsIEventQueue* eventQueue; diff --git a/mozilla/netwerk/test/TestRes.cpp b/mozilla/netwerk/test/TestRes.cpp index 32690c6f22e..a93103cdf1b 100644 --- a/mozilla/netwerk/test/TestRes.cpp +++ b/mozilla/netwerk/test/TestRes.cpp @@ -29,6 +29,7 @@ #include "nsIEventQueueService.h" #include "nsIURI.h" #include "nsCRT.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); @@ -145,7 +146,7 @@ public: } NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult aStatus, const PRUnichar* aStatusArg) { + nsresult aStatus) { nsresult rv; nsCOMPtr<nsIURI> uri; nsCOMPtr<nsIChannel> channel = do_QueryInterface(request); @@ -181,7 +182,7 @@ public: } }; -NS_IMPL_ISUPPORTS2(Listener, nsIStreamListener, nsIStreamObserver) +NS_IMPL_ISUPPORTS2(Listener, nsIStreamListener, nsIRequestObserver) nsresult TestAsyncRead(const char* url) diff --git a/mozilla/netwerk/test/TestSocketIO.cpp b/mozilla/netwerk/test/TestSocketIO.cpp index 772bd351936..509725b6dfa 100644 --- a/mozilla/netwerk/test/TestSocketIO.cpp +++ b/mozilla/netwerk/test/TestSocketIO.cpp @@ -73,12 +73,12 @@ public: virtual ~TestListener() {} NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER }; NS_IMPL_ISUPPORTS2(TestListener, - nsIStreamObserver, + nsIRequestObserver, nsIStreamListener); NS_IMETHODIMP @@ -111,7 +111,7 @@ TestListener::OnDataAvailable(nsIRequest* request, NS_IMETHODIMP TestListener::OnStopRequest(nsIRequest* request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { LOG(("TestListener::OnStopRequest [aStatus=%x]\n", aStatus)); gKeepRunning = 0; @@ -131,7 +131,7 @@ public: virtual ~TestProvider(); NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMPROVIDER protected: @@ -140,7 +140,7 @@ protected: NS_IMPL_ISUPPORTS2(TestProvider, nsIStreamProvider, - nsIStreamObserver) + nsIRequestObserver) TestProvider::TestProvider(char *data) { @@ -163,7 +163,7 @@ TestProvider::OnStartRequest(nsIRequest* request, nsISupports* context) NS_IMETHODIMP TestProvider::OnStopRequest(nsIRequest* request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { LOG(("TestProvider::OnStopRequest [status=%x]\n", aStatus)); diff --git a/mozilla/netwerk/test/TestSocketInput.cpp b/mozilla/netwerk/test/TestSocketInput.cpp index a08e1117975..99de484ad94 100644 --- a/mozilla/netwerk/test/TestSocketInput.cpp +++ b/mozilla/netwerk/test/TestSocketInput.cpp @@ -62,7 +62,7 @@ public: PRUint32 aLength); NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg); + nsresult aStatus); }; @@ -112,7 +112,7 @@ InputTestConsumer::OnDataAvailable(nsIRequest *request, NS_IMETHODIMP InputTestConsumer::OnStopRequest(nsIRequest *request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { gKeepRunning = 0; printf("+++ OnStopRequest status %x +++\n", aStatus); diff --git a/mozilla/netwerk/test/TestSocketTransport.cpp b/mozilla/netwerk/test/TestSocketTransport.cpp index 74f3a300285..1ada9ce0e99 100644 --- a/mozilla/netwerk/test/TestSocketTransport.cpp +++ b/mozilla/netwerk/test/TestSocketTransport.cpp @@ -39,7 +39,7 @@ #include "nsISocketTransportService.h" #include "nsIEventQueueService.h" #include "nsIServiceManager.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsIStreamListener.h" #include "nsIPipe.h" #include "nsIInputStream.h" @@ -128,7 +128,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIRUNNABLE - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER // TestConnection methods... @@ -182,11 +182,11 @@ protected: //////////////////////////////////////////////////////////////////////////////// -class TestConnectionOpenObserver : public nsIStreamObserver +class TestConnectionOpenObserver : public nsIRequestObserver { public: NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER TestConnectionOpenObserver(TestConnection* test) : mTestConnection(test) { @@ -199,7 +199,7 @@ protected: }; -NS_IMPL_ISUPPORTS1(TestConnectionOpenObserver, nsIStreamObserver); +NS_IMPL_ISUPPORTS1(TestConnectionOpenObserver, nsIRequestObserver); NS_IMETHODIMP TestConnectionOpenObserver::OnStartRequest(nsIRequest *request, nsISupports* context) @@ -212,7 +212,7 @@ TestConnectionOpenObserver::OnStartRequest(nsIRequest *request, nsISupports* con NS_IMETHODIMP TestConnectionOpenObserver::OnStopRequest(nsIRequest *request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { if (gVerbose || NS_FAILED(aStatus)) printf("\n+++ TestConnectionOpenObserver::OnStopRequest (status = %x) +++." @@ -270,7 +270,7 @@ TestConnection::OnDataAvailable(nsIRequest *request, nsISupports* context, NS_IMETHODIMP TestConnection::OnStopRequest(nsIRequest *request, nsISupports* context, - nsresult aStatus, const PRUnichar* aStatusArg) + nsresult aStatus) { if (gVerbose || NS_FAILED(aStatus)) printf("\n+++ TestConnection::OnStopRequest (status = %x) +++." @@ -343,7 +343,7 @@ TestConnection::~TestConnection() NS_IMPL_THREADSAFE_ISUPPORTS5(TestConnection, nsIRunnable, nsIStreamListener, - nsIStreamObserver, + nsIRequestObserver, nsIInterfaceRequestor, nsIProgressEventSink); diff --git a/mozilla/netwerk/test/TestThreadedIO.cpp b/mozilla/netwerk/test/TestThreadedIO.cpp index 4133d80e500..81729fd8b0b 100644 --- a/mozilla/netwerk/test/TestThreadedIO.cpp +++ b/mozilla/netwerk/test/TestThreadedIO.cpp @@ -119,7 +119,7 @@ TestListener::~TestListener() { printf( "TestListener dtor called on thread %d\n", mThreadNo ); } -NS_IMPL_ISUPPORTS2( TestListener, nsIStreamListener, nsIStreamObserver ); +NS_IMPL_ISUPPORTS2( TestListener, nsIStreamListener, nsIRequestObserver ); NS_IMETHODIMP TestListener::OnStartRequest( nsIChannel *aChannel, nsISupports *aContext ) { diff --git a/mozilla/netwerk/test/urltest.cpp b/mozilla/netwerk/test/urltest.cpp index 45c842de400..5a9f4381b43 100644 --- a/mozilla/netwerk/test/urltest.cpp +++ b/mozilla/netwerk/test/urltest.cpp @@ -38,6 +38,7 @@ #include "iostream.h" #include "nsXPIDLString.h" #include "nsString.h" +#include "nsNetCID.h" // Define CIDs... static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp index 6c010d06ba8..648b849f29d 100644 --- a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp @@ -34,10 +34,11 @@ #include "nsIServiceManager.h" #include "nsIURL.h" #include "nsIIOService.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); +#include "nsNetCID.h" #include "nsIComponentManager.h" #include "nsParserCIID.h" +static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_IID(kIRobotSinkObserverIID, NS_IROBOTSINKOBSERVER_IID); class RobotSinkObserver : public nsIRobotSinkObserver { diff --git a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp b/mozilla/parser/htmlparser/robot/nsRobotSink.cpp index 1b0d6ebd512..8e7587ae4e3 100644 --- a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp +++ b/mozilla/parser/htmlparser/robot/nsRobotSink.cpp @@ -29,7 +29,7 @@ #include "nsIURL.h" #include "nsIServiceManager.h" #include "nsIIOService.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); +#include "nsNetCID.h" #include "nsCRT.h" #include "nsVoidArray.h" class nsIDocument; @@ -42,6 +42,7 @@ class nsIDocument; // - IMG SRC // - LAYER SRC +static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); static NS_DEFINE_IID(kIRobotSinkIID, NS_IROBOTSINK_IID); diff --git a/mozilla/parser/htmlparser/src/CParserContext.cpp b/mozilla/parser/htmlparser/src/CParserContext.cpp index 4bafaaf0a63..a64d0b0b275 100644 --- a/mozilla/parser/htmlparser/src/CParserContext.cpp +++ b/mozilla/parser/htmlparser/src/CParserContext.cpp @@ -38,7 +38,7 @@ MOZ_DECL_CTOR_COUNTER(CParserContext) CParserContext::CParserContext(nsScanner* aScanner, void *aKey, eParserCommands aCommand, - nsIStreamObserver* aListener, + nsIRequestObserver* aListener, nsIDTD *aDTD, eAutoDetectResult aStatus, PRBool aCopyUnused) diff --git a/mozilla/parser/htmlparser/src/CParserContext.h b/mozilla/parser/htmlparser/src/CParserContext.h index e9ac2471984..a4ccff1a85d 100644 --- a/mozilla/parser/htmlparser/src/CParserContext.h +++ b/mozilla/parser/htmlparser/src/CParserContext.h @@ -52,7 +52,7 @@ public: CParserContext( nsScanner* aScanner, void* aKey=0, eParserCommands aCommand=eViewNormal, - nsIStreamObserver* aListener=0, + nsIRequestObserver* aListener=0, nsIDTD *aDTD=0, eAutoDetectResult aStatus=eUnknownDetect, PRBool aCopyUnused=PR_FALSE); @@ -79,7 +79,7 @@ public: nsIDTD* mValidator; char* mTransferBuffer; - nsIStreamObserver* mListener; + nsIRequestObserver* mListener; void* mKey; PRUint32 mTransferBufferSize; diff --git a/mozilla/parser/htmlparser/src/nsIParser.h b/mozilla/parser/htmlparser/src/nsIParser.h index 410987698e1..e212aa6be2f 100644 --- a/mozilla/parser/htmlparser/src/nsIParser.h +++ b/mozilla/parser/htmlparser/src/nsIParser.h @@ -54,7 +54,7 @@ { 0x41421c60, 0x310a, 0x11d4, { 0x81, 0x6f, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }; class nsIContentSink; -class nsIStreamObserver; +class nsIRequestObserver; class nsIParserFilter; class nsString; class nsIURI; @@ -234,7 +234,7 @@ class nsIParser : public nsISupports { virtual PRBool IsParserEnabled() =0; - virtual nsresult Parse(nsIURI* aURL,nsIStreamObserver* aListener = nsnull,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0; + virtual nsresult Parse(nsIURI* aURL,nsIRequestObserver* aListener = nsnull,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0; virtual nsresult Parse(nsIInputStream& aStream, const nsString& aMimeType,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0; virtual nsresult Parse(const nsAReadableString& aSourceBuffer,void* aKey,const nsString& aContentType,PRBool aEnableVerify,PRBool aLastCall,nsDTDMode aMode=eDTDMode_autodetect) = 0; diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index 94aef72a4ac..850ed1574b5 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -311,8 +311,8 @@ nsresult nsParser::QueryInterface(const nsIID& aIID, void** aInstancePtr) else if(aIID.Equals(NS_GET_IID(nsIProgressEventSink))) { *aInstancePtr = (nsIStreamListener*)(this); } - else if(aIID.Equals(NS_GET_IID(nsIStreamObserver))) { - *aInstancePtr = (nsIStreamObserver*)(this); + else if(aIID.Equals(NS_GET_IID(nsIRequestObserver))) { + *aInstancePtr = (nsIRequestObserver*)(this); } else if(aIID.Equals(NS_GET_IID(nsIStreamListener))) { *aInstancePtr = (nsIStreamListener*)(this); @@ -1575,7 +1575,7 @@ PRBool nsParser::IsParserEnabled() { * @param aFilename -- const char* containing file to be parsed. * @return error code -- 0 if ok, non-zero if error. */ -nsresult nsParser::Parse(nsIURI* aURL,nsIStreamObserver* aListener,PRBool aVerifyEnabled, void* aKey,nsDTDMode aMode) { +nsresult nsParser::Parse(nsIURI* aURL,nsIRequestObserver* aListener,PRBool aVerifyEnabled, void* aKey,nsDTDMode aMode) { NS_PRECONDITION(0!=aURL,kNullURL); @@ -2369,7 +2369,7 @@ NS_PRECONDITION(((eOnStart==mParserContext->mStreamListenerState)||(eOnDataAvail * @return */ nsresult nsParser::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult status, const PRUnichar* aMsg) + nsresult status) { nsresult result=NS_OK; @@ -2400,7 +2400,7 @@ nsresult nsParser::OnStopRequest(nsIRequest *request, nsISupports* aContext, // XXX Should we wait to notify our observers as well if the // parser isn't yet enabled? if (nsnull != mObserver) { - mObserver->OnStopRequest(request, aContext, status, aMsg); + mObserver->OnStopRequest(request, aContext, status); } #ifdef rickgdebug diff --git a/mozilla/parser/htmlparser/src/nsParser.h b/mozilla/parser/htmlparser/src/nsParser.h index af7e665e7d3..3129cfc7e36 100644 --- a/mozilla/parser/htmlparser/src/nsParser.h +++ b/mozilla/parser/htmlparser/src/nsParser.h @@ -182,7 +182,7 @@ class nsParser : public nsIParser, * @param aListener is a listener to forward notifications to * @return TRUE if all went well -- FALSE otherwise */ - virtual nsresult Parse(nsIURI* aURL,nsIStreamObserver* aListener,PRBool aEnableVerify=PR_FALSE,void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect); + virtual nsresult Parse(nsIURI* aURL,nsIRequestObserver* aListener,PRBool aEnableVerify=PR_FALSE,void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect); /** * Cause parser to parse input from given stream @@ -253,8 +253,8 @@ class nsParser : public nsIParser, //********************************************* NS_DECL_NSIPROGRESSEVENTSINK - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener methods: NS_DECL_NSISTREAMLISTENER @@ -394,7 +394,7 @@ protected: PRInt32 mMajorIteration; PRInt32 mMinorIteration; - nsIStreamObserver* mObserver; + nsIRequestObserver* mObserver; nsIProgressEventSink* mProgressEventSink; nsIContentSink* mSink; nsIParserFilter* mParserFilter; diff --git a/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp b/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp index e19b930bebe..ba803a3f4d1 100644 --- a/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp +++ b/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp @@ -389,8 +389,8 @@ public: // nsIRDFXMLSource interface NS_DECL_NSIRDFXMLSOURCE - // nsIStreamObserver - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener NS_DECL_NSISTREAMLISTENER @@ -597,7 +597,7 @@ NS_IMPL_ISUPPORTS6(RDFXMLDataSourceImpl, nsIRDFRemoteDataSource, nsIRDFXMLSink, nsIRDFXMLSource, - nsIStreamObserver, + nsIRequestObserver, nsIStreamListener); @@ -661,7 +661,7 @@ RDFXMLDataSourceImpl::BlockingParse(nsIURI* aURL, nsIStreamListener* aConsumer) break; } - aConsumer->OnStopRequest(channel, nsnull, rv, nsnull); + aConsumer->OnStopRequest(channel, nsnull, rv); // Notify load observers for (i = mObservers.Count() - 1; i >= 0; --i) { @@ -1121,7 +1121,7 @@ RDFXMLDataSourceImpl::RemoveXMLSinkObserver(nsIRDFXMLSinkObserver* aObserver) //---------------------------------------------------------------------- // -// nsIStreamObserver +// nsIRequestObserver // NS_IMETHODIMP @@ -1133,20 +1133,19 @@ RDFXMLDataSourceImpl::OnStartRequest(nsIRequest *request, nsISupports *ctxt) NS_IMETHODIMP RDFXMLDataSourceImpl::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult status, - const PRUnichar *errorMsg) + nsresult status) { if (NS_FAILED(status)) { for (PRInt32 i = mObservers.Count() - 1; i >= 0; --i) { nsIRDFXMLSinkObserver* obs = NS_STATIC_CAST(nsIRDFXMLSinkObserver*, mObservers[i]); - (void) obs->OnError(this, status, errorMsg); + (void) obs->OnError(this, status, nsnull); } } nsresult rv; - rv = mParser->OnStopRequest(request, ctxt, status, errorMsg); + rv = mParser->OnStopRequest(request, ctxt, status); mParser = nsnull; // release the parser diff --git a/mozilla/rdf/base/src/rdfutil.cpp b/mozilla/rdf/base/src/rdfutil.cpp index dc5f956b42e..7911ebbcbee 100644 --- a/mozilla/rdf/base/src/rdfutil.cpp +++ b/mozilla/rdf/base/src/rdfutil.cpp @@ -44,13 +44,12 @@ #include "nsIURL.h" #include "nsIIOService.h" #include "nsIURL.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); +#include "nsNetUtil.h" #include "nsRDFCID.h" #include "nsString.h" #include "nsXPIDLString.h" #include "prtime.h" #include "rdfutil.h" -#include "nsNetUtil.h" //////////////////////////////////////////////////////////////////////// diff --git a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp index 36ee9e0f481..9276a257706 100644 --- a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp @@ -47,6 +47,7 @@ #include "nsIXULPrototypeDocument.h" #include "nsContentCID.h" #include "nsXPIDLString.h" +#include "nsNetCID.h" #include "prlog.h" //---------------------------------------------------------------------- @@ -90,7 +91,7 @@ protected: nsCOMPtr<nsILoadGroup> mLoadGroup; nsCOMPtr<nsIStreamListener> mListener; nsCOMPtr<nsISupports> mContext; - nsLoadFlags mLoadAttributes; + nsLoadFlags mLoadFlags; nsCOMPtr<nsISupports> mOwner; nsresult mStatus; @@ -123,6 +124,10 @@ public: NS_IMETHOD Cancel(nsresult status) { mStatus = status; return NS_OK; } NS_IMETHOD Suspend(void) { return NS_OK; } NS_IMETHOD Resume(void) { return NS_OK; } + NS_IMETHOD GetLoadGroup(nsILoadGroup **); + NS_IMETHOD SetLoadGroup(nsILoadGroup *); + NS_IMETHOD GetLoadFlags(nsLoadFlags *); + NS_IMETHOD SetLoadFlags(nsLoadFlags); // nsIChannel NS_DECL_NSICHANNEL @@ -155,7 +160,7 @@ nsCachedChromeChannel::Create(nsIURI* aURI, nsIChannel** aResult) nsCachedChromeChannel::nsCachedChromeChannel(nsIURI* aURI) - : mURI(aURI), mLoadGroup(nsnull), mLoadAttributes (nsIChannel::LOAD_NORMAL), mStatus(NS_OK) + : mURI(aURI), mLoadGroup(nsnull), mLoadFlags (nsIRequest::LOAD_NORMAL), mStatus(NS_OK) { NS_INIT_REFCNT(); @@ -202,13 +207,6 @@ nsCachedChromeChannel::GetURI(nsIURI* *aURI) return NS_OK; } -NS_IMETHODIMP -nsCachedChromeChannel::SetURI(nsIURI* aURI) -{ - mURI = aURI; - return NS_OK; -} - NS_IMETHODIMP nsCachedChromeChannel::Open(nsIInputStream **_retval) { @@ -248,7 +246,7 @@ nsCachedChromeChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) ("nsCachedChromeChannel[%p]: removing self from load group %p", this, mLoadGroup.get())); - (void) mLoadGroup->RemoveRequest(this, nsnull, nsnull, nsnull); + (void) mLoadGroup->RemoveRequest(this, nsnull, NS_OK); } return rv; @@ -268,16 +266,16 @@ nsCachedChromeChannel::GetSecurityInfo(nsISupports * *aSecurityInfo) } NS_IMETHODIMP -nsCachedChromeChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +nsCachedChromeChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { - *aLoadAttributes = mLoadAttributes; + *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP -nsCachedChromeChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) +nsCachedChromeChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { - mLoadAttributes = aLoadAttributes; + mLoadFlags = aLoadFlags; return NS_OK; } @@ -436,14 +434,14 @@ nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent) channel, channel->mListener.get())); (void) channel->mListener->OnStopRequest(request, channel->mContext, - channel->mStatus, nsnull); + channel->mStatus); if (channel->mLoadGroup) { PR_LOG(gLog, PR_LOG_DEBUG, ("nsCachedChromeChannel[%p]: removing self from load group %p", channel, channel->mLoadGroup.get())); - (void) channel->mLoadGroup->RemoveRequest(request, nsnull, nsnull, nsnull); + (void) channel->mLoadGroup->RemoveRequest(request, nsnull, NS_OK); } channel->mListener = nsnull; diff --git a/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp b/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp index 3be16be759f..17d6b1db6c5 100644 --- a/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp +++ b/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp @@ -57,6 +57,7 @@ #include "plstr.h" #include "nsParserCIID.h" #include "nsString.h" +#include "nsNetCID.h" #if defined(XP_PC) #define DOM_DLL "jsdom.dll" diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index bdb9ec111a8..9685a49cc17 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -195,8 +195,8 @@ NS_IMPL_THREADSAFE_ADDREF(nsDocLoaderImpl) NS_IMPL_THREADSAFE_RELEASE(nsDocLoaderImpl) NS_INTERFACE_MAP_BEGIN(nsDocLoaderImpl) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStreamObserver) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRequestObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIDocumentLoader) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsIWebProgress) @@ -455,9 +455,9 @@ nsDocLoaderImpl::OnStartRequest(nsIRequest *request, nsISupports *aCtxt) nsCOMPtr<nsIChannel> aChannel = do_QueryInterface(request); if (!mIsLoadingDocument) { - PRUint32 loadAttribs = 0; - aChannel->GetLoadAttributes(&loadAttribs); - if (loadAttribs & nsIChannel::LOAD_DOCUMENT_URI) { + PRUint32 loadFlags = 0; + aChannel->GetLoadFlags(&loadFlags); + if (loadFlags & nsIRequest::LOAD_DOCUMENT_URI) { mIsLoadingDocument = PR_TRUE; ClearInternalProgress(); // only clear our progress if we are starting a new load.... } @@ -507,8 +507,7 @@ nsDocLoaderImpl::OnStartRequest(nsIRequest *request, nsISupports *aCtxt) NS_IMETHODIMP nsDocLoaderImpl::OnStopRequest(nsIRequest *aRequest, nsISupports *aCtxt, - nsresult aStatus, - const PRUnichar *aMsg) + nsresult aStatus) { nsresult rv = NS_OK; @@ -1374,8 +1373,6 @@ nsDocLoaderImpl::FireOnStatusChange(nsIWebProgress* aWebProgress, nsresult nsDocLoaderImpl::AddRequestInfo(nsIRequest *aRequest) { nsresult rv; - PRUint32 loadAttribs=nsIChannel::LOAD_NORMAL; - nsRequestInfo *info; info = new nsRequestInfo(aRequest); diff --git a/mozilla/uriloader/base/nsDocLoader.h b/mozilla/uriloader/base/nsDocLoader.h index 30c5d9706f2..e59730ae43d 100644 --- a/mozilla/uriloader/base/nsDocLoader.h +++ b/mozilla/uriloader/base/nsDocLoader.h @@ -29,7 +29,7 @@ #include "nsIDocumentLoader.h" #include "nsIWebProgress.h" #include "nsIWebProgressListener.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsWeakReference.h" #include "nsILoadGroup.h" #include "nsISupportsArray.h" @@ -49,7 +49,7 @@ struct nsRequestInfo; ****************************************************************************/ class nsDocLoaderImpl : public nsIDocumentLoader, - public nsIStreamObserver, + public nsIRequestObserver, public nsSupportsWeakReference, public nsIProgressEventSink, public nsIWebProgress, @@ -74,8 +74,8 @@ public: NS_DECL_NSISECURITYEVENTSINK - // nsIStreamObserver methods: (for observing the load group) - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: (for observing the load group) + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIWEBPROGRESS NS_DECL_NSIINTERFACEREQUESTOR diff --git a/mozilla/uriloader/base/nsURILoader.cpp b/mozilla/uriloader/base/nsURILoader.cpp index 710d0a41027..1a1c0fb1ddd 100644 --- a/mozilla/uriloader/base/nsURILoader.cpp +++ b/mozilla/uriloader/base/nsURILoader.cpp @@ -90,8 +90,8 @@ public: nsresult RetargetOutput(nsIRequest *request, const char * aSrcContentType, const char * aOutContentType, nsIStreamListener * aStreamListener); - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener methods: NS_DECL_NSISTREAMLISTENER @@ -117,8 +117,8 @@ NS_IMPL_THREADSAFE_ADDREF(nsDocumentOpenInfo); NS_IMPL_THREADSAFE_RELEASE(nsDocumentOpenInfo); NS_INTERFACE_MAP_BEGIN(nsDocumentOpenInfo) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStreamObserver) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRequestObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_END_THREADSAFE @@ -261,7 +261,7 @@ NS_IMETHODIMP nsDocumentOpenInfo::OnDataAvailable(nsIRequest *request, nsISuppor } NS_IMETHODIMP nsDocumentOpenInfo::OnStopRequest(nsIRequest *request, nsISupports *aCtxt, - nsresult aStatus, const PRUnichar * errorMsg) + nsresult aStatus) { nsresult rv = NS_OK; @@ -271,7 +271,7 @@ NS_IMETHODIMP nsDocumentOpenInfo::OnStopRequest(nsIRequest *request, nsISupports if (!mOnStopFired && m_targetStreamListener) { mOnStopFired = PR_TRUE; - m_targetStreamListener->OnStopRequest(request, aCtxt, aStatus, errorMsg); + m_targetStreamListener->OnStopRequest(request, aCtxt, aStatus); } m_targetStreamListener = 0; @@ -286,8 +286,10 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports * nsCOMPtr<nsISupports> originalWindowContext = m_originalContext; // local variable to keep track of this. nsCOMPtr<nsIStreamListener> contentStreamListener; nsCOMPtr<nsIChannel> aChannel = do_QueryInterface(request); - if (!aChannel) + if (!aChannel) { + printf(">>> QI for channel from request failed!!\n"); return NS_ERROR_FAILURE; + } rv = aChannel->GetContentType(getter_Copies(contentType)); if (NS_FAILED(rv)) return rv; @@ -359,10 +361,10 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports * if (contentListener.get() != m_contentListener.get()) { // we must be retargeting...so set an appropriate flag on the channel - nsLoadFlags loadAttribs = 0; - aChannel->GetLoadAttributes(&loadAttribs); - loadAttribs |= nsIChannel::LOAD_RETARGETED_DOCUMENT_URI; - aChannel->SetLoadAttributes(loadAttribs); + nsLoadFlags loadFlags = 0; + aChannel->GetLoadFlags(&loadFlags); + loadFlags |= nsIRequest::LOAD_RETARGETED_DOCUMENT_URI; + aChannel->SetLoadFlags(loadFlags); } rv = contentListener->DoContent(contentTypeToUse, mCommand, m_windowTarget, diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp index 4c88aaae0bc..82c6a5150c7 100644 --- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -500,7 +500,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsExternalAppHandler) NS_INTERFACE_MAP_BEGIN(nsExternalAppHandler) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIHelperAppLauncher) NS_INTERFACE_MAP_ENTRY(nsIURIContentListener) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) @@ -677,7 +677,7 @@ nsresult nsExternalAppHandler::RetargetLoadNotifications(nsIRequest *request) origContextLoader->GetDocumentChannel(getter_AddRefs(mOriginalChannel)); if(oldLoadGroup) - oldLoadGroup->RemoveRequest(request, nsnull, NS_OK, nsnull); + oldLoadGroup->RemoveRequest(request, nsnull, NS_OK); aChannel->SetLoadGroup(newLoadGroup); nsCOMPtr<nsIInterfaceRequestor> req (do_QueryInterface(mLoadCookie)); @@ -866,7 +866,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnDataAvailable(nsIRequest *request, nsISupp } NS_IMETHODIMP nsExternalAppHandler::OnStopRequest(nsIRequest *request, nsISupports *aCtxt, - nsresult aStatus, const PRUnichar * errorMsg) + nsresult aStatus) { mStopRequestIssued = PR_TRUE; diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.h b/mozilla/uriloader/exthandler/nsExternalHelperAppService.h index f126f1ca16b..7b7961fee07 100644 --- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.h +++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.h @@ -137,7 +137,7 @@ class nsExternalAppHandler : public nsIStreamListener, public nsIHelperAppLaunch public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMLISTENER - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIHELPERAPPLAUNCHER NS_DECL_NSIURICONTENTLISTENER NS_DECL_NSIINTERFACEREQUESTOR diff --git a/mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp b/mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp index 46097106ba3..156338a8b4c 100644 --- a/mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp +++ b/mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp @@ -26,6 +26,7 @@ #include "nsXPIDLString.h" #include "nsCOMPtr.h" #include "nsIServiceManager.h" +#include "nsNetCID.h" // used to dispatch urls to default protocol handlers #include "nsCExternalHandlerService.h" @@ -50,6 +51,8 @@ public: nsExtProtocolChannel(); virtual ~nsExtProtocolChannel(); + nsresult SetURI(nsIURI*); + protected: nsCOMPtr<nsIURI> mUrl; nsresult mStatus; @@ -156,13 +159,13 @@ NS_IMETHODIMP nsExtProtocolChannel::AsyncOpen(nsIStreamListener *listener, nsISu return NS_ERROR_FAILURE; // force caller to abort. } -NS_IMETHODIMP nsExtProtocolChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes) +NS_IMETHODIMP nsExtProtocolChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { - *aLoadAttributes = 0; + *aLoadFlags = 0; return NS_OK; } -NS_IMETHODIMP nsExtProtocolChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes) +NS_IMETHODIMP nsExtProtocolChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { return NS_OK; } @@ -323,7 +326,7 @@ NS_IMETHODIMP nsExternalProtocolHandler::NewChannel(nsIURI *aURI, nsIChannel **_ NS_NEWXPCOM(channel, nsExtProtocolChannel); if (!channel) return NS_ERROR_OUT_OF_MEMORY; - channel->SetURI(aURI); + ((nsExtProtocolChannel*) channel.get())->SetURI(aURI); if (_retval) { diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index 8e44f2d9f84..15192feec23 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -46,6 +46,7 @@ #include "nsITimer.h" #include "nsIDOMDocument.h" #include "nsIURL.h" +#include "nsIChannel.h" #include "nsIFileWidget.h" #include "nsILookAndFeel.h" #include "nsIComponentManager.h" @@ -116,6 +117,7 @@ #endif #include "nsIIOService.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #if defined(ClientWallet) || defined(SingleSignon) diff --git a/mozilla/xpcom/tests/PropertiesTest.cpp b/mozilla/xpcom/tests/PropertiesTest.cpp index ae35b483d89..532c7cb3448 100644 --- a/mozilla/xpcom/tests/PropertiesTest.cpp +++ b/mozilla/xpcom/tests/PropertiesTest.cpp @@ -29,8 +29,8 @@ #include "nsIServiceManager.h" #include "nsIURL.h" #include "nsIIOService.h" +#include "nsNetCID.h" #include "nsIChannel.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsIComponentManager.h" #include "nsIEnumerator.h" #include <iostream.h> //BAD DOG -- no biscuit! @@ -59,6 +59,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #endif #endif +static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); diff --git a/mozilla/xpfe/appshell/src/nsAbout.cpp b/mozilla/xpfe/appshell/src/nsAbout.cpp index 3c9a0ffbf8a..c3480d635ef 100644 --- a/mozilla/xpfe/appshell/src/nsAbout.cpp +++ b/mozilla/xpfe/appshell/src/nsAbout.cpp @@ -25,6 +25,7 @@ #include "nsIServiceManager.h" #include "nsCOMPtr.h" #include "nsIURI.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index 633e254778f..61442bd2701 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -53,7 +53,7 @@ #endif #include "nsWidgetsCID.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsMetaCharsetCID.h" #include "nsIMetaCharsetService.h" diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index 8d70af492ac..bb477d040df 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -34,8 +34,8 @@ #include "nsIURL.h" #include "nsIIOService.h" #include "nsIURL.h" +#include "nsNetCID.h" #include "nsIStringBundle.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsIPref.h" #include "nsINameSpaceManager.h" diff --git a/mozilla/xpfe/appshell/src/nsXULWindow.cpp b/mozilla/xpfe/appshell/src/nsXULWindow.cpp index e2dc16f5d2a..fd5f23a27ad 100644 --- a/mozilla/xpfe/appshell/src/nsXULWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsXULWindow.cpp @@ -44,6 +44,7 @@ #include "nsIDOMXULDocument.h" #include "nsIInterfaceRequestor.h" #include "nsIIOService.h" +#include "nsNetCID.h" #include "nsIJSContextStack.h" #include "nsIMarkupDocumentViewer.h" #include "nsIObserverService.h" diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.h b/mozilla/xpfe/browser/src/nsBrowserInstance.h index 13e1c290e28..fc859261a57 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.h +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.h @@ -36,7 +36,7 @@ #include "nsString.h" #include "nsISupports.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsIInputStream.h" #include "nsIObserver.h" #include "nsICmdLineHandler.h" diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index e0b8ee0a50a..4dbbeb8881b 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -1987,7 +1987,7 @@ nsBookmarksService::FireTimer(nsITimer* aTimer, void* aClosure) nsCOMPtr<nsIChannel> channel; if (NS_SUCCEEDED(rv = NS_OpenURI(getter_AddRefs(channel), uri, nsnull))) { - channel->SetLoadAttributes(nsIChannel::FORCE_VALIDATION | nsIChannel::VALIDATE_ALWAYS); + channel->SetLoadFlags(nsIRequest::FORCE_VALIDATION | nsIRequest::VALIDATE_ALWAYS); nsCOMPtr<nsIHTTPChannel> httpChannel = do_QueryInterface(channel); if (httpChannel) { @@ -2054,7 +2054,7 @@ nsBookmarksService::OnDataAvailable(nsIRequest* request, nsISupports *ctxt, nsII NS_IMETHODIMP nsBookmarksService::OnStopRequest(nsIRequest* request, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg) + nsresult status) { nsresult rv; @@ -2542,7 +2542,7 @@ NS_IMPL_QUERY_INTERFACE8(nsBookmarksService, nsIRDFRemoteDataSource, nsIRDFObserver, nsIStreamListener, - nsIStreamObserver, + nsIRequestObserver, nsIObserver, nsISupportsWeakReference) diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h index d4f85d802b5..d8603ef0cf8 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h @@ -99,7 +99,7 @@ nsresult GetBookmarkToPing(nsIRDFResource **theBookmark); nsresult getLocaleString(const char *key, nsString &str); // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener methods: NS_DECL_NSISTREAMLISTENER diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp index a6e1db9846f..635fce210e9 100644 --- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp @@ -155,7 +155,7 @@ public: nsIStreamListener** aResult); NS_DECL_ISUPPORTS - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER }; @@ -340,7 +340,7 @@ nsHTTPIndexParser::Create(nsHTTPIndex* aHTTPIndex, NS_IMPL_THREADSAFE_ISUPPORTS2(nsHTTPIndexParser, nsIStreamListener, - nsIStreamObserver); + nsIRequestObserver); NS_IMETHODIMP @@ -422,8 +422,7 @@ nsHTTPIndexParser::OnStartRequest(nsIRequest *request, nsISupports* aContext) NS_IMETHODIMP nsHTTPIndexParser::OnStopRequest(nsIRequest *request, nsISupports* aContext, - nsresult aStatus, - const PRUnichar* aErrorMsg) + nsresult aStatus) { // If mDirectory isn't set, then we should just bail. Either an // error occurred and OnStartRequest() never got called, or diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp index b54f9131069..11dac95a193 100644 --- a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp @@ -54,6 +54,7 @@ #include "rdf.h" #include "nsIURL.h" +#include "nsNetCID.h" #include "nsInt64.h" #include "nsMorkCID.h" diff --git a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp index 88094d9c69b..0faeda3fe44 100644 --- a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -109,8 +109,8 @@ public: NS_METHOD Init(); nsresult Unescape(nsString &text); - // nsIStreamObserver - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener NS_DECL_NSISTREAMLISTENER @@ -256,7 +256,7 @@ RelatedLinksStreamListener::OnStartRequest(nsIRequest *request, nsISupports *ctx NS_IMETHODIMP RelatedLinksStreamListener::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg) + nsresult status) { nsAutoString trueStr; trueStr.AssignWithConversion("true"); nsIRDFLiteral *literal = nsnull; diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp index 59cb7af24dc..3c8b6c88553 100755 --- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp @@ -626,7 +626,7 @@ InternetSearchDataSource::FireTimer(nsITimer* aTimer, void* aClosure) nsCOMPtr<nsIChannel> channel; if (NS_FAILED(rv = NS_OpenURI(getter_AddRefs(channel), uri, nsnull))) return; - channel->SetLoadAttributes(nsIChannel::FORCE_VALIDATION | nsIChannel::VALIDATE_ALWAYS); + channel->SetLoadFlags(nsIRequest::FORCE_VALIDATION | nsIRequest::VALIDATE_ALWAYS); nsCOMPtr<nsIHTTPChannel> httpChannel (do_QueryInterface(channel)); if (!httpChannel) return; @@ -829,7 +829,7 @@ NS_IMPL_RELEASE(InternetSearchDataSource); NS_INTERFACE_MAP_BEGIN(InternetSearchDataSource) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIInternetSearchService) - NS_INTERFACE_MAP_ENTRY(nsIStreamObserver) + NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIInternetSearchService) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) @@ -3562,7 +3562,7 @@ InternetSearchDataSource::DoSearch(nsIRDFResource *source, nsIRDFResource *engin } // get it just from the cache if we can (do not validate) - channel->SetLoadAttributes(nsIChannel::VALIDATE_NEVER); + channel->SetLoadFlags(nsIRequest::VALIDATE_NEVER); if (methodStr.EqualsIgnoreCase("post")) { @@ -4423,7 +4423,7 @@ InternetSearchDataSource::OnDataAvailable(nsIRequest *request, nsISupports *ctxt NS_IMETHODIMP InternetSearchDataSource::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg) + nsresult status) { if (!mInner) return(NS_OK); diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.h b/mozilla/xpfe/components/search/src/nsInternetSearchService.h index e5753e0fecd..8bc86ae2257 100644 --- a/mozilla/xpfe/components/search/src/nsInternetSearchService.h +++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.h @@ -157,7 +157,7 @@ static void FireTimer(nsITimer* aTimer, void* aClosure); public: NS_DECL_ISUPPORTS NS_DECL_NSIINTERNETSEARCHSERVICE - NS_DECL_NSISTREAMOBSERVER + NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER NS_DECL_NSIRDFDATASOURCE NS_DECL_NSIOBSERVER diff --git a/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp b/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp index cbb72e772be..f3b0cebdcb4 100644 --- a/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp +++ b/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp @@ -30,7 +30,7 @@ #include "nsIScriptGlobalObject.h" #include "nsIChannel.h" #include "nsIURI.h" -#include "nsIStreamObserver.h" +#include "nsIRequestObserver.h" #include "nsIHTTPChannel.h" #include "nsXPIDLString.h" #include "nsIInterfaceRequestor.h" diff --git a/mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp b/mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp index c098969ce1b..c4d31095884 100644 --- a/mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp +++ b/mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp @@ -37,6 +37,7 @@ #include "nsIRDFContainer.h" #include "nsIRDFContainerUtils.h" #include "nsIURL.h" +#include "nsNetCID.h" static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); diff --git a/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp b/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp index 672d4b69d51..9bf2c6682f4 100644 --- a/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp +++ b/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp @@ -190,7 +190,7 @@ nsStreamTransfer::SelectFileAndTransferLocationSpec( char const *aURL, if ( NS_SUCCEEDED( rv ) && channel ) { // See if VALIDATE_NEVER is called for. if ( doNotValidate ) { - channel->SetLoadAttributes( nsIChannel::VALIDATE_NEVER ); + channel->SetLoadFlags( nsIRequest::VALIDATE_NEVER ); } // Post data provided? if ( postData ) { diff --git a/mozilla/xpfe/components/xfer/src/nsStreamXferOp.cpp b/mozilla/xpfe/components/xfer/src/nsStreamXferOp.cpp index ded9c360b8a..3373ae9f7b5 100644 --- a/mozilla/xpfe/components/xfer/src/nsStreamXferOp.cpp +++ b/mozilla/xpfe/components/xfer/src/nsStreamXferOp.cpp @@ -52,9 +52,9 @@ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); #endif #ifdef USE_ASYNC_READ -NS_IMPL_ISUPPORTS5(nsStreamXferOp, nsIStreamListener, nsIStreamObserver, nsIStreamTransferOperation, nsIProgressEventSink, nsIInterfaceRequestor); +NS_IMPL_ISUPPORTS5(nsStreamXferOp, nsIStreamListener, nsIRequestObserver, nsIStreamTransferOperation, nsIProgressEventSink, nsIInterfaceRequestor); #else -NS_IMPL_ISUPPORTS4(nsStreamXferOp, nsIStreamObserver, nsIStreamTransferOperation, nsIProgressEventSink, nsIInterfaceRequestor); +NS_IMPL_ISUPPORTS4(nsStreamXferOp, nsIRequestObserver, nsIStreamTransferOperation, nsIProgressEventSink, nsIInterfaceRequestor); #endif // ctor - save arguments in data members. @@ -210,7 +210,7 @@ nsStreamXferOp::Start( void ) { nsCOMPtr<nsIRequest> dummyRequest; rv = NS_AsyncWriteFromStream(getter_AddRefs(dummyRequest), mOutputTransport, inStream, 0, -1, 0, - NS_STATIC_CAST(nsIStreamObserver*, this)); + NS_STATIC_CAST(nsIRequestObserver*, this)); if ( NS_FAILED( rv ) ) { this->OnError( kOpAsyncWrite, rv ); } @@ -456,14 +456,12 @@ nsStreamXferOp::OnStatus( nsIRequest *request, NS_IMETHODIMP nsStreamXferOp::OnStopRequest( nsIRequest *request, nsISupports *aContext, - nsresult aStatus, - const PRUnichar *aMsg ) { + nsresult aStatus) { nsresult rv = NS_OK; // If an error occurred, shut down. if ( NS_FAILED( aStatus ) ) { this->Stop(); - // XXX need to use aMsg when it is provided this->OnError( kOpAsyncRead, aStatus ); } @@ -481,10 +479,9 @@ nsStreamXferOp::OnStopRequest( nsIRequest *request, // Notify observer that the download is complete. if ( !mError && mObserver ) { - nsString msg(aMsg); rv = mObserver->Observe( (nsIStreamTransferOperation*)this, NS_ConvertASCIItoUCS2( NS_ISTREAMTRANSFER_CONTRACTID ";onCompletion" ).GetUnicode(), - msg.GetUnicode() ); + nsnull ); if ( NS_FAILED( rv ) ) { DEBUG_PRINTF( PR_STDOUT, "%s %d: Observe failed, rv=0x%08X\n", (char*)__FILE__, (int)__LINE__, (int)rv ); diff --git a/mozilla/xpfe/components/xfer/src/nsStreamXferOp.h b/mozilla/xpfe/components/xfer/src/nsStreamXferOp.h index 5f93815573a..5ed107266c4 100644 --- a/mozilla/xpfe/components/xfer/src/nsStreamXferOp.h +++ b/mozilla/xpfe/components/xfer/src/nsStreamXferOp.h @@ -78,8 +78,8 @@ public: NS_DECL_NSISTREAMLISTENER #endif - // nsIStreamObserver methods: - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver methods: + NS_DECL_NSIREQUESTOBSERVER private: nsCOMPtr<nsIChannel> mInputChannel; diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp index 1f21afc76e5..bb24045766c 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.cpp +++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp @@ -732,7 +732,7 @@ nsXPInstallManager::OnStartRequest(nsIRequest* request, nsISupports *ctxt) NS_IMETHODIMP nsXPInstallManager::OnStopRequest(nsIRequest *request, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg) + nsresult status) { nsresult rv; diff --git a/mozilla/xpinstall/src/nsXPInstallManager.h b/mozilla/xpinstall/src/nsXPInstallManager.h index cf6cefe1f5c..9ee5764b02a 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.h +++ b/mozilla/xpinstall/src/nsXPInstallManager.h @@ -65,8 +65,8 @@ class nsXPInstallManager : public nsIXPIListener, NS_IMETHOD InitManager(nsIScriptGlobalObject* aGlobalObject, nsXPITriggerInfo* aTrigger, PRUint32 aChromeType ); - // nsIStreamObserver - NS_DECL_NSISTREAMOBSERVER + // nsIRequestObserver + NS_DECL_NSIREQUESTOBSERVER // nsIStreamListener NS_DECL_NSISTREAMLISTENER