From 894be4eb22a1e36ba20a47da1e7b90442d562a5c Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Fri, 13 Aug 1999 00:43:48 +0000 Subject: [PATCH] Fix for bug 7682: StringBundle can't load URLs from imap thread. git-svn-id: svn://10.0.0.236/trunk@43270 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/chrome/src/nsChromeProtocolHandler.cpp | 1 - mozilla/chrome/src/nsChromeProtocolHandler.h | 1 - mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp | 15 ++++----------- mozilla/dom/src/jsurl/nsJSProtocolHandler.h | 1 - mozilla/mailnews/compose/src/nsSmtpService.cpp | 2 +- mozilla/mailnews/compose/src/nsSmtpService.h | 2 +- mozilla/mailnews/imap/src/nsImapService.cpp | 2 +- mozilla/mailnews/imap/src/nsImapService.h | 2 +- mozilla/mailnews/local/src/nsMailboxService.cpp | 2 +- mozilla/mailnews/local/src/nsMailboxService.h | 2 +- mozilla/mailnews/local/src/nsPop3Service.cpp | 2 +- mozilla/mailnews/local/src/nsPop3Service.h | 2 +- mozilla/mailnews/news/src/nsNntpService.cpp | 2 +- mozilla/mailnews/news/src/nsNntpService.h | 2 +- mozilla/netwerk/base/public/makefile.win | 6 ------ .../netwerk/base/public/nsIProtocolHandler.idl | 4 +--- mozilla/netwerk/base/src/nsIOService.cpp | 10 +--------- .../protocol/about/public/nsIAboutModule.idl | 3 +-- .../netwerk/protocol/about/src/nsAboutBlank.cpp | 1 - mozilla/netwerk/protocol/about/src/nsAboutBlank.h | 1 - .../protocol/about/src/nsAboutProtocolHandler.cpp | 4 +--- .../protocol/about/src/nsAboutProtocolHandler.h | 1 - .../netwerk/protocol/file/src/nsFileChannel.cpp | 6 +----- mozilla/netwerk/protocol/file/src/nsFileChannel.h | 3 +-- .../protocol/file/src/nsFileProtocolHandler.cpp | 4 +--- .../protocol/file/src/nsFileProtocolHandler.h | 1 - mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp | 10 ++-------- mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h | 3 +-- .../protocol/ftp/src/nsFtpProtocolHandler.cpp | 3 +-- .../protocol/ftp/src/nsFtpProtocolHandler.h | 1 - .../netwerk/protocol/http/src/nsHTTPHandler.cpp | 1 - mozilla/netwerk/protocol/http/src/nsHTTPHandler.h | 1 - .../resource/src/nsResourceProtocolHandler.cpp | 1 - .../resource/src/nsResourceProtocolHandler.h | 1 - .../rdf/chrome/src/nsChromeProtocolHandler.cpp | 1 - mozilla/rdf/chrome/src/nsChromeProtocolHandler.h | 1 - 36 files changed, 25 insertions(+), 80 deletions(-) diff --git a/mozilla/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/chrome/src/nsChromeProtocolHandler.cpp index d883a55ed3f..033bec62eaf 100644 --- a/mozilla/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/chrome/src/nsChromeProtocolHandler.cpp @@ -141,7 +141,6 @@ nsChromeProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, NS_IMETHODIMP nsChromeProtocolHandler::NewChannel(const char* verb, nsIURI* uri, nsIEventSinkGetter* eventSinkGetter, - nsIEventQueue* eventQueue, nsIChannel* *result) { nsresult rv; diff --git a/mozilla/chrome/src/nsChromeProtocolHandler.h b/mozilla/chrome/src/nsChromeProtocolHandler.h index 33dc98e704f..e79061a89f4 100644 --- a/mozilla/chrome/src/nsChromeProtocolHandler.h +++ b/mozilla/chrome/src/nsChromeProtocolHandler.h @@ -43,7 +43,6 @@ public: nsIURI **_retval); NS_IMETHOD NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **_retval); // nsChromeProtocolHandler methods: diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp index 29328670a7c..3799a451bc3 100644 --- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -42,7 +42,7 @@ public: nsJSInputStream() : mVerb(nsnull), mURI(nsnull), mEventSinkGetter(nsnull), - mEventQueue(nsnull), mResult(nsnull), mLength(0), mReadCursor(0) { + mResult(nsnull), mLength(0), mReadCursor(0) { NS_INIT_REFCNT(); } @@ -50,21 +50,17 @@ public: if (mVerb) nsCRT::free(mVerb); NS_IF_RELEASE(mURI); NS_IF_RELEASE(mEventSinkGetter); - NS_IF_RELEASE(mEventQueue); if (mResult) nsCRT::free(mResult); } nsresult Init(const char* verb, nsIURI* uri, - nsIEventSinkGetter* eventSinkGetter, - nsIEventQueue* eventQueue) { + nsIEventSinkGetter* eventSinkGetter) { mVerb = nsCRT::strdup(verb); // XXX do we need this? if (mVerb == nsnull) return NS_ERROR_OUT_OF_MEMORY; mURI = uri; NS_ADDREF(mURI); mEventSinkGetter = eventSinkGetter; NS_ADDREF(mEventSinkGetter); - mEventQueue = eventQueue; - NS_ADDREF(mEventQueue); return NS_OK; } @@ -136,7 +132,6 @@ protected: char* mVerb; nsIURI* mURI; nsIEventSinkGetter* mEventSinkGetter; - nsIEventQueue* mEventQueue; char* mResult; PRUint32 mLength; PRUint32 mReadCursor; @@ -147,7 +142,6 @@ NS_IMPL_ISUPPORTS(nsJSInputStream, nsIInputStream::GetIID()); nsresult NS_NewJSInputStream(const char* verb, nsIURI* uri, nsIEventSinkGetter* eventSinkGetter, - nsIEventQueue* eventQueue, nsIInputStream* *result) { nsJSInputStream* js = new nsJSInputStream(); @@ -155,7 +149,7 @@ NS_NewJSInputStream(const char* verb, nsIURI* uri, return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(js); - nsresult rv = js->Init(verb, uri, eventSinkGetter, eventQueue); + nsresult rv = js->Init(verb, uri, eventSinkGetter); if (NS_FAILED(rv)) { NS_RELEASE(js); return rv; @@ -267,7 +261,6 @@ nsJSProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, NS_IMETHODIMP nsJSProtocolHandler::NewChannel(const char* verb, nsIURI* uri, nsIEventSinkGetter* eventSinkGetter, - nsIEventQueue* eventQueue, nsIChannel* *result) { // Strategy: Let's use an "input stream channel" here with a special @@ -279,7 +272,7 @@ nsJSProtocolHandler::NewChannel(const char* verb, nsIURI* uri, if (NS_FAILED(rv)) return rv; nsIInputStream* in; - rv = NS_NewJSInputStream(verb, uri, eventSinkGetter, eventQueue, &in); + rv = NS_NewJSInputStream(verb, uri, eventSinkGetter, &in); if (NS_FAILED(rv)) return rv; rv = serv->NewInputStreamChannel(uri, "text/html", in, &channel); diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.h b/mozilla/dom/src/jsurl/nsJSProtocolHandler.h index e14c448e22f..f914378dd52 100644 --- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.h +++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.h @@ -43,7 +43,6 @@ public: nsIURI **_retval); NS_IMETHOD NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **_retval); // nsJSProtocolHandler methods: diff --git a/mozilla/mailnews/compose/src/nsSmtpService.cpp b/mozilla/mailnews/compose/src/nsSmtpService.cpp index ce103c4bd34..913dbfdec53 100644 --- a/mozilla/mailnews/compose/src/nsSmtpService.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpService.cpp @@ -223,7 +223,7 @@ NS_IMETHODIMP nsSmtpService::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI return NS_OK; } -NS_IMETHODIMP nsSmtpService::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval) +NS_IMETHODIMP nsSmtpService::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval) { // mscott - right now, I don't like the idea of returning channels to the caller. They just want us // to run the url, they don't want a channel back...I'm going to be addressing this issue with diff --git a/mozilla/mailnews/compose/src/nsSmtpService.h b/mozilla/mailnews/compose/src/nsSmtpService.h index aacafcc5ae5..30a35ba7b37 100644 --- a/mozilla/mailnews/compose/src/nsSmtpService.h +++ b/mozilla/mailnews/compose/src/nsSmtpService.h @@ -65,7 +65,7 @@ public: NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval); + NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); //////////////////////////////////////////////////////////////////////////////////////// // End support of nsIProtocolHandler interface diff --git a/mozilla/mailnews/imap/src/nsImapService.cpp b/mozilla/mailnews/imap/src/nsImapService.cpp index aaf2cd50a49..5696006d7b0 100644 --- a/mozilla/mailnews/imap/src/nsImapService.cpp +++ b/mozilla/mailnews/imap/src/nsImapService.cpp @@ -2102,7 +2102,7 @@ NS_IMETHODIMP nsImapService::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI return NS_OK; } -NS_IMETHODIMP nsImapService::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval) +NS_IMETHODIMP nsImapService::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval) { // mscott - right now, I don't like the idea of returning channels to the caller. They just want us // to run the url, they don't want a channel back...I'm going to be addressing this issue with diff --git a/mozilla/mailnews/imap/src/nsImapService.h b/mozilla/mailnews/imap/src/nsImapService.h index 8a141e4386f..7be5b031911 100644 --- a/mozilla/mailnews/imap/src/nsImapService.h +++ b/mozilla/mailnews/imap/src/nsImapService.h @@ -186,7 +186,7 @@ public: NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval); + NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); //////////////////////////////////////////////////////////////////////////////////////// // End support of nsIProtocolHandler interface diff --git a/mozilla/mailnews/local/src/nsMailboxService.cpp b/mozilla/mailnews/local/src/nsMailboxService.cpp index fe84f1485d1..998b494ce85 100644 --- a/mozilla/mailnews/local/src/nsMailboxService.cpp +++ b/mozilla/mailnews/local/src/nsMailboxService.cpp @@ -312,7 +312,7 @@ NS_IMETHODIMP nsMailboxService::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIU return NS_OK; } -NS_IMETHODIMP nsMailboxService::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval) +NS_IMETHODIMP nsMailboxService::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval) { // mscott - right now, I don't like the idea of returning channels to the caller. They just want us // to run the url, they don't want a channel back...I'm going to be addressing this issue with diff --git a/mozilla/mailnews/local/src/nsMailboxService.h b/mozilla/mailnews/local/src/nsMailboxService.h index 4ca8f085c09..fb1ea69164b 100644 --- a/mozilla/mailnews/local/src/nsMailboxService.h +++ b/mozilla/mailnews/local/src/nsMailboxService.h @@ -78,7 +78,7 @@ public: NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval); + NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); //////////////////////////////////////////////////////////////////////////////////////// // End support of nsIProtocolHandler interface diff --git a/mozilla/mailnews/local/src/nsPop3Service.cpp b/mozilla/mailnews/local/src/nsPop3Service.cpp index 57a926e1b75..cbb5166ad90 100644 --- a/mozilla/mailnews/local/src/nsPop3Service.cpp +++ b/mozilla/mailnews/local/src/nsPop3Service.cpp @@ -253,7 +253,7 @@ NS_IMETHODIMP nsPop3Service::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI return NS_OK; } -NS_IMETHODIMP nsPop3Service::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval) +NS_IMETHODIMP nsPop3Service::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval) { // mscott - right now, I don't like the idea of returning channels to the caller. They just want us // to run the url, they don't want a channel back...I'm going to be addressing this issue with diff --git a/mozilla/mailnews/local/src/nsPop3Service.h b/mozilla/mailnews/local/src/nsPop3Service.h index 4adaf0a2052..fbd075e318d 100644 --- a/mozilla/mailnews/local/src/nsPop3Service.h +++ b/mozilla/mailnews/local/src/nsPop3Service.h @@ -61,7 +61,7 @@ public: NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval); + NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); //////////////////////////////////////////////////////////////////////////////////////// // End support of nsIProtocolHandler interface diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp index ecc7c4c6f06..9bf5d07ae47 100644 --- a/mozilla/mailnews/news/src/nsNntpService.cpp +++ b/mozilla/mailnews/news/src/nsNntpService.cpp @@ -854,7 +854,7 @@ NS_IMETHODIMP nsNntpService::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI return NS_ERROR_FAILURE; } -NS_IMETHODIMP nsNntpService::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval) +NS_IMETHODIMP nsNntpService::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval) { *_retval = nsnull; // mscott - right now, I don't like the idea of returning channels to the caller. They just want us diff --git a/mozilla/mailnews/news/src/nsNntpService.h b/mozilla/mailnews/news/src/nsNntpService.h index 321fb2e1434..3fffa787f6b 100644 --- a/mozilla/mailnews/news/src/nsNntpService.h +++ b/mozilla/mailnews/news/src/nsNntpService.h @@ -65,7 +65,7 @@ public: NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIEventQueue *eventQueue, nsIChannel **_retval); + NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); // nsNntpService nsNntpService(); diff --git a/mozilla/netwerk/base/public/makefile.win b/mozilla/netwerk/base/public/makefile.win index 74a61012335..74e77ea7f92 100644 --- a/mozilla/netwerk/base/public/makefile.win +++ b/mozilla/netwerk/base/public/makefile.win @@ -20,12 +20,6 @@ MODULE = necko DEPTH = ..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - EXPORTS = \ netCore.h \ nsIFileTransportService.h \ diff --git a/mozilla/netwerk/base/public/nsIProtocolHandler.idl b/mozilla/netwerk/base/public/nsIProtocolHandler.idl index 4441c2274fc..550c6cdd533 100644 --- a/mozilla/netwerk/base/public/nsIProtocolHandler.idl +++ b/mozilla/netwerk/base/public/nsIProtocolHandler.idl @@ -21,7 +21,6 @@ interface nsIURI; interface nsIEventSinkGetter; interface nsIChannel; -interface nsIEventQueue; [scriptable, uuid(8984a6f0-1893-11d3-9337-00104ba0fd40)] interface nsIProtocolHandler : nsISupports @@ -42,8 +41,7 @@ interface nsIProtocolHandler : nsISupports nsIChannel NewChannel(in string verb, in nsIURI aURI, - in nsIEventSinkGetter eventSinkGetter, - in nsIEventQueue eventQueue); + in nsIEventSinkGetter eventSinkGetter); }; %{C++ diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp index 0356cca1a6a..bc3afb47e15 100644 --- a/mozilla/netwerk/base/src/nsIOService.cpp +++ b/mozilla/netwerk/base/src/nsIOService.cpp @@ -223,16 +223,8 @@ nsIOService::NewChannelFromURI(const char* verb, nsIURI *aURI, rv = GetProtocolHandler((const char*)scheme, getter_AddRefs(handler)); if (NS_FAILED(rv)) return rv; - nsCOMPtr eventQ; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); - if (NS_FAILED(rv)) return rv; - rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), - getter_AddRefs(eventQ)); - if (NS_FAILED(rv)) return rv; - nsIChannel* channel; - rv = handler->NewChannel(verb, aURI, eventSinkGetter, eventQ, - &channel); + rv = handler->NewChannel(verb, aURI, eventSinkGetter, &channel); if (NS_FAILED(rv)) return rv; *result = channel; diff --git a/mozilla/netwerk/protocol/about/public/nsIAboutModule.idl b/mozilla/netwerk/protocol/about/public/nsIAboutModule.idl index 95c7cbd6102..6e688686447 100644 --- a/mozilla/netwerk/protocol/about/public/nsIAboutModule.idl +++ b/mozilla/netwerk/protocol/about/public/nsIAboutModule.idl @@ -28,8 +28,7 @@ interface nsIAboutModule : nsISupports { nsIChannel NewChannel(in string verb, in nsIURI aURI, - in nsIEventSinkGetter eventSinkGetter, - in nsIEventQueue eventQueue); + in nsIEventSinkGetter eventSinkGetter); }; %{C++ diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp index 6fb44869b50..e3ea0d974f5 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp @@ -31,7 +31,6 @@ NS_IMETHODIMP nsAboutBlank::NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **result) { nsresult rv; diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBlank.h b/mozilla/netwerk/protocol/about/src/nsAboutBlank.h index 4d68d018554..aa8cb53b6fd 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutBlank.h +++ b/mozilla/netwerk/protocol/about/src/nsAboutBlank.h @@ -29,7 +29,6 @@ public: NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **result); nsAboutBlank() { NS_INIT_REFCNT(); } diff --git a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp index bdc721cdefd..5a96fa74844 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp @@ -131,7 +131,6 @@ nsAboutProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, NS_IMETHODIMP nsAboutProtocolHandler::NewChannel(const char* verb, nsIURI* uri, nsIEventSinkGetter* eventSinkGetter, - nsIEventQueue* eventQueue, nsIChannel* *result) { // about:what you ask? @@ -156,8 +155,7 @@ nsAboutProtocolHandler::NewChannel(const char* verb, nsIURI* uri, nsCRT::free(progIDStr); if (NS_SUCCEEDED(rv)) { // The standard return case: - return aboutMod->NewChannel(verb, uri, eventSinkGetter, - eventQueue, result); + return aboutMod->NewChannel(verb, uri, eventSinkGetter, result); } // mumble... diff --git a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.h b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.h index 09bcbf43cee..72cde99bb38 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.h +++ b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.h @@ -43,7 +43,6 @@ public: nsIURI **_retval); NS_IMETHOD NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **_retval); // nsAboutProtocolHandler methods: diff --git a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp index 9e0610bddb9..30eb663559d 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp +++ b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp @@ -92,8 +92,7 @@ nsFileChannel::nsFileChannel() nsresult nsFileChannel::Init(nsFileProtocolHandler* handler, - const char* verb, nsIURI* uri, nsIEventSinkGetter* getter, - nsIEventQueue* queue) + const char* verb, nsIURI* uri, nsIEventSinkGetter* getter) { nsresult rv; @@ -155,9 +154,6 @@ nsFileChannel::Init(nsFileProtocolHandler* handler, mSpec = fileURL; } - mEventQueue = queue; - NS_IF_ADDREF(mEventQueue); - return NS_OK; } diff --git a/mozilla/netwerk/protocol/file/src/nsFileChannel.h b/mozilla/netwerk/protocol/file/src/nsFileChannel.h index 22504036799..90cd80e7ea6 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileChannel.h +++ b/mozilla/netwerk/protocol/file/src/nsFileChannel.h @@ -181,8 +181,7 @@ public: Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult); nsresult Init(nsFileProtocolHandler* handler, - const char* verb, nsIURI* uri, nsIEventSinkGetter* getter, - nsIEventQueue* queue); + const char* verb, nsIURI* uri, nsIEventSinkGetter* getter); void Process(void); diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp index d3aa08f6df1..f44725da47e 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp @@ -150,7 +150,6 @@ nsFileProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, NS_IMETHODIMP nsFileProtocolHandler::NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter* eventSinkGetter, - nsIEventQueue* eventQueue, nsIChannel* *result) { nsresult rv; @@ -159,7 +158,7 @@ nsFileProtocolHandler::NewChannel(const char* verb, nsIURI* url, rv = nsFileChannel::Create(nsnull, nsCOMTypeInfo::GetIID(), (void**)&channel); if (NS_FAILED(rv)) return rv; - rv = channel->Init(this, verb, url, eventSinkGetter, eventQueue); + rv = channel->Init(this, verb, url, eventSinkGetter); if (NS_FAILED(rv)) { NS_RELEASE(channel); return rv; @@ -187,7 +186,6 @@ nsFileProtocolHandler::NewChannelFromNativePath(const char* nativePath, rv = NewChannel("load", // XXX what should this be? uri, nsnull, // XXX bogus getter - nsnull, // XXX bogus (nsIChannel**)result); NS_RELEASE(uri); return rv; diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.h b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.h index ac6890865db..368c01df8b2 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.h +++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.h @@ -51,7 +51,6 @@ public: nsIURI **_retval); NS_IMETHOD NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **_retval); // nsIFileProtocolHandler methods: diff --git a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp index ea910a592bf..17ba4b05a00 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp @@ -50,7 +50,7 @@ static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID); nsFTPChannel::nsFTPChannel() : mUrl(nsnull), mConnected(PR_FALSE), mListener(nsnull), - mLoadAttributes(LOAD_NORMAL), mLoadGroup(nsnull), mContext(nsnull) + mLoadAttributes(LOAD_NORMAL), mLoadGroup(nsnull), mContext(nsnull), mEventQueue(nsnull) { nsresult rv; @@ -61,8 +61,6 @@ nsFTPChannel::nsFTPChannel() if (NS_SUCCEEDED(rv)) { rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &mEventQueue); } - if (NS_FAILED(rv)) - mEventQueue = nsnull; } nsFTPChannel::~nsFTPChannel() { @@ -96,8 +94,7 @@ nsFTPChannel::QueryInterface(const nsIID& aIID, void** aInstancePtr) { } nsresult -nsFTPChannel::Init(const char* verb, nsIURI* uri, nsIEventSinkGetter* getter, - nsIEventQueue* queue) +nsFTPChannel::Init(const char* verb, nsIURI* uri, nsIEventSinkGetter* getter) { nsresult rv; @@ -107,9 +104,6 @@ nsFTPChannel::Init(const char* verb, nsIURI* uri, nsIEventSinkGetter* getter, mUrl = uri; NS_ADDREF(mUrl); - mEventQueue = queue; - NS_ADDREF(mEventQueue); - if (getter) { nsIProgressEventSink* eventSink; rv = getter->GetEventSink(verb, nsCOMTypeInfo::GetIID(), diff --git a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h index 4740815d390..31185c11323 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h +++ b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h @@ -92,8 +92,7 @@ public: static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult); - nsresult Init(const char* verb, nsIURI* uri, nsIEventSinkGetter* getter, - nsIEventQueue* queue); + nsresult Init(const char* verb, nsIURI* uri, nsIEventSinkGetter* getter); protected: nsIURI* mUrl; diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp index 87efa777161..e2cdb6059c8 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp @@ -128,7 +128,6 @@ nsFtpProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, NS_IMETHODIMP nsFtpProtocolHandler::NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter* eventSinkGetter, - nsIEventQueue* eventQueue, nsIChannel* *result) { nsresult rv; @@ -137,7 +136,7 @@ nsFtpProtocolHandler::NewChannel(const char* verb, nsIURI* url, rv = nsFTPChannel::Create(nsnull, nsCOMTypeInfo::GetIID(), (void**)&channel); if (NS_FAILED(rv)) return rv; - rv = channel->Init(verb, url, eventSinkGetter, eventQueue); + rv = channel->Init(verb, url, eventSinkGetter); if (NS_FAILED(rv)) { NS_RELEASE(channel); return rv; diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.h b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.h index c74720c931a..eae3c0a48d7 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.h +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.h @@ -39,7 +39,6 @@ public: nsIURI **_retval); NS_IMETHOD NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **_retval); // nsFtpProtocolHandler methods: diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp index e5ef45fecb8..e8577bcf355 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp @@ -121,7 +121,6 @@ NS_IMPL_ADDREF(nsHTTPHandler); NS_METHOD nsHTTPHandler::NewChannel(const char* verb, nsIURI* i_URL, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *i_eventQueue, nsIChannel **o_Instance) { nsresult rv; diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.h b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.h index 1f697d16a11..b10f479b704 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.h @@ -83,7 +83,6 @@ public: NS_IMETHOD NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **_retval); NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, diff --git a/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.cpp b/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.cpp index ffb4fa9aa4e..c939c5bb265 100644 --- a/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.cpp @@ -294,7 +294,6 @@ MangleResourceIntoFileURL(const char* aResourceFileName) NS_IMETHODIMP nsResourceProtocolHandler::NewChannel(const char* verb, nsIURI* uri, nsIEventSinkGetter* eventSinkGetter, - nsIEventQueue* eventQueue, nsIChannel* *result) { nsresult rv; diff --git a/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.h b/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.h index 446efd3d95d..850504f9490 100644 --- a/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.h +++ b/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.h @@ -43,7 +43,6 @@ public: nsIURI **_retval); NS_IMETHOD NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **_retval); // nsResourceProtocolHandler methods: diff --git a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp index d883a55ed3f..033bec62eaf 100644 --- a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp @@ -141,7 +141,6 @@ nsChromeProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, NS_IMETHODIMP nsChromeProtocolHandler::NewChannel(const char* verb, nsIURI* uri, nsIEventSinkGetter* eventSinkGetter, - nsIEventQueue* eventQueue, nsIChannel* *result) { nsresult rv; diff --git a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.h b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.h index 33dc98e704f..e79061a89f4 100644 --- a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.h +++ b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.h @@ -43,7 +43,6 @@ public: nsIURI **_retval); NS_IMETHOD NewChannel(const char* verb, nsIURI* url, nsIEventSinkGetter *eventSinkGetter, - nsIEventQueue *eventQueue, nsIChannel **_retval); // nsChromeProtocolHandler methods: