wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 884061 - Part 3q: Use NS_DECL_THREADSAFE_ISUPPORTS in netwerk/, r=macmanus

Browse Source 
--HG--
extra : rebase_source : d029f73a1f27896c142f76dce263dd3542763b18
This commit is contained in:
Joshua Cranmer 2013-07-18 21:24:13 -05:00
parent abccf4f45f
commit 35b47f34ec
138 changed files with 383 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netwerk/base/public/nsAsyncRedirectVerifyHelper.h
View File

@ -26,7 +26,7 @@ class nsIChannel;
class nsAsyncRedirectVerifyHelper MOZ_FINAL : public nsIRunnable,
public nsIAsyncVerifyRedirectCallback
{
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK

22
netwerk/base/src/BackgroundFileSaver.cpp
View File

@ -708,11 +708,11 @@ BackgroundFileSaver::NotifySaveComplete()
////////////////////////////////////////////////////////////////////////////////
//// BackgroundFileSaverOutputStream
NS_IMPL_THREADSAFE_ISUPPORTS4(BackgroundFileSaverOutputStream,
nsIBackgroundFileSaver,
nsIOutputStream,
nsIAsyncOutputStream,
nsIOutputStreamCallback)
NS_IMPL_ISUPPORTS4(BackgroundFileSaverOutputStream,
nsIBackgroundFileSaver,
nsIOutputStream,
nsIAsyncOutputStream,
nsIOutputStreamCallback)
BackgroundFileSaverOutputStream::BackgroundFileSaverOutputStream()
: BackgroundFileSaver()
@ -811,10 +811,10 @@ BackgroundFileSaverOutputStream::OnOutputStreamReady(
////////////////////////////////////////////////////////////////////////////////
//// BackgroundFileSaverStreamListener
NS_IMPL_THREADSAFE_ISUPPORTS3(BackgroundFileSaverStreamListener,
nsIBackgroundFileSaver,
nsIRequestObserver,
nsIStreamListener)
NS_IMPL_ISUPPORTS3(BackgroundFileSaverStreamListener,
nsIBackgroundFileSaver,
nsIRequestObserver,
nsIStreamListener)
BackgroundFileSaverStreamListener::BackgroundFileSaverStreamListener()
: BackgroundFileSaver()
@ -975,8 +975,8 @@ BackgroundFileSaverStreamListener::NotifySuspendOrResume()
////////////////////////////////////////////////////////////////////////////////
//// DigestOutputStream
NS_IMPL_THREADSAFE_ISUPPORTS1(DigestOutputStream,
nsIOutputStream)
NS_IMPL_ISUPPORTS1(DigestOutputStream,
nsIOutputStream)
DigestOutputStream::DigestOutputStream(nsIOutputStream* aStream,
PK11Context* aContext) :

6
netwerk/base/src/BackgroundFileSaver.h
View File

@ -271,7 +271,7 @@ class BackgroundFileSaverOutputStream : public BackgroundFileSaver
, public nsIOutputStreamCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOUTPUTSTREAM
NS_DECL_NSIASYNCOUTPUTSTREAM
NS_DECL_NSIOUTPUTSTREAMCALLBACK
@ -299,7 +299,7 @@ class BackgroundFileSaverStreamListener : public BackgroundFileSaver
, public nsIStreamListener
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIREQUESTOBSERVER
NS_DECL_NSISTREAMLISTENER
@ -351,7 +351,7 @@ class DigestOutputStream : public nsNSSShutDownObject,
public nsIOutputStream
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOUTPUTSTREAM
// Constructor. Neither parameter may be null. The caller owns both.
DigestOutputStream(nsIOutputStream* outputStream, PK11Context* aContext);

2
netwerk/base/src/Dashboard.cpp
View File

@ -13,7 +13,7 @@ using mozilla::AutoSafeJSContext;
namespace mozilla {
namespace net {
NS_IMPL_THREADSAFE_ISUPPORTS2(Dashboard, nsIDashboard, nsIDashboardEventNotifier)
NS_IMPL_ISUPPORTS2(Dashboard, nsIDashboard, nsIDashboardEventNotifier)
using mozilla::dom::Sequence;
Dashboard::Dashboard()

2
netwerk/base/src/Dashboard.h
View File

@ -24,7 +24,7 @@ class Dashboard:
public nsIDashboardEventNotifier
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIDASHBOARD
NS_DECL_NSIDASHBOARDEVENTNOTIFIER

6
netwerk/base/src/EventTokenBucket.cpp
View File

@ -26,7 +26,7 @@ namespace net {
class TokenBucketCancelable : public nsICancelable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICANCELABLE
TokenBucketCancelable(class ATokenBucketEvent *event);
@ -38,7 +38,7 @@ private:
ATokenBucketEvent *mEvent;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(TokenBucketCancelable, nsICancelable)
NS_IMPL_ISUPPORTS1(TokenBucketCancelable, nsICancelable)
TokenBucketCancelable::TokenBucketCancelable(ATokenBucketEvent *event)
: mEvent(event)
@ -68,7 +68,7 @@ TokenBucketCancelable::Fire()
// EventTokenBucket
////////////////////////////////////////////
NS_IMPL_THREADSAFE_ISUPPORTS1(EventTokenBucket, nsITimerCallback)
NS_IMPL_ISUPPORTS1(EventTokenBucket, nsITimerCallback)
// by default 1hz with no burst
EventTokenBucket::EventTokenBucket(uint32_t eventsPerSecond,

2
netwerk/base/src/EventTokenBucket.h
View File

@ -69,7 +69,7 @@ class TokenBucketCancelable;
class EventTokenBucket : public nsITimerCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITIMERCALLBACK
// This should be constructed on the main thread

4
netwerk/base/src/ProxyAutoConfig.cpp
View File

@ -249,7 +249,7 @@ class PACResolver MOZ_FINAL : public nsIDNSListener
, public nsITimerCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
PACResolver()
: mStatus(NS_ERROR_FAILURE)
@ -286,7 +286,7 @@ public:
nsCOMPtr<nsIDNSRecord> mResponse;
nsCOMPtr<nsITimer> mTimer;
};
NS_IMPL_THREADSAFE_ISUPPORTS2(PACResolver, nsIDNSListener, nsITimerCallback)
NS_IMPL_ISUPPORTS2(PACResolver, nsIDNSListener, nsITimerCallback)
static
void PACLogToConsole(nsString &aMessage)

8
netwerk/base/src/Tickler.cpp
View File

@ -17,7 +17,7 @@
namespace mozilla {
namespace net {
NS_IMPL_THREADSAFE_ISUPPORTS1(Tickler, nsISupportsWeakReference)
NS_IMPL_ISUPPORTS1(Tickler, nsISupportsWeakReference)
Tickler::Tickler()
: mLock("Tickler::mLock")
@ -190,7 +190,7 @@ void Tickler::StopTickler()
class TicklerTimer MOZ_FINAL : public nsITimerCallback
{
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITIMERCALLBACK
TicklerTimer(Tickler *aTickler)
@ -229,7 +229,7 @@ void Tickler::SetIPV4Port(uint16_t port)
mAddr.inet.port = port;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(TicklerTimer, nsITimerCallback)
NS_IMPL_ISUPPORTS1(TicklerTimer, nsITimerCallback)
NS_IMETHODIMP TicklerTimer::Notify(nsITimer *timer)
{
@ -263,7 +263,7 @@ NS_IMETHODIMP TicklerTimer::Notify(nsITimer *timer)
namespace mozilla {
namespace net {
NS_IMPL_THREADSAFE_ISUPPORTS0(Tickler)
NS_IMPL_ISUPPORTS0(Tickler)
} // namespace mozilla::net
} // namespace mozilla

4
netwerk/base/src/Tickler.h
View File

@ -50,7 +50,7 @@ namespace net {
class Tickler MOZ_FINAL : public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
// These methods are main thread only
Tickler();
@ -97,7 +97,7 @@ private:
class Tickler MOZ_FINAL : public nsISupports
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
Tickler() { }
~Tickler() { }

6
netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp
View File

@ -31,9 +31,9 @@ GetRedirectLog()
#define LOG(args)
#endif
NS_IMPL_THREADSAFE_ISUPPORTS2(nsAsyncRedirectVerifyHelper,
nsIAsyncVerifyRedirectCallback,
nsIRunnable)
NS_IMPL_ISUPPORTS2(nsAsyncRedirectVerifyHelper,
nsIAsyncVerifyRedirectCallback,
nsIRunnable)
class nsAsyncVerifyRedirectCallbackEvent : public nsRunnable {
public:

2
netwerk/base/src/nsAsyncStreamCopier.cpp
View File

@ -88,7 +88,7 @@ nsAsyncStreamCopier::OnAsyncCopyComplete(void *closure, nsresult status)
//-----------------------------------------------------------------------------
// nsISupports
NS_IMPL_THREADSAFE_ISUPPORTS2(nsAsyncStreamCopier,
NS_IMPL_ISUPPORTS2(nsAsyncStreamCopier,
nsIRequest,
nsIAsyncStreamCopier)

2
netwerk/base/src/nsAsyncStreamCopier.h
View File

@ -18,7 +18,7 @@
class nsAsyncStreamCopier : public nsIAsyncStreamCopier
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIREQUEST
NS_DECL_NSIASYNCSTREAMCOPIER

4
netwerk/base/src/nsBaseContentStream.cpp
View File

@ -32,8 +32,8 @@ nsBaseContentStream::DispatchCallback(bool async)
//-----------------------------------------------------------------------------
// nsBaseContentStream::nsISupports
NS_IMPL_THREADSAFE_ADDREF(nsBaseContentStream)
NS_IMPL_THREADSAFE_RELEASE(nsBaseContentStream)
NS_IMPL_ADDREF(nsBaseContentStream)
NS_IMPL_RELEASE(nsBaseContentStream)
// We only support nsIAsyncInputStream when we are in non-blocking mode.
NS_INTERFACE_MAP_BEGIN(nsBaseContentStream)

2
netwerk/base/src/nsBaseContentStream.h
View File

@ -36,7 +36,7 @@
class nsBaseContentStream : public nsIAsyncInputStream
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIINPUTSTREAM
NS_DECL_NSIASYNCINPUTSTREAM

2
netwerk/base/src/nsBufferedStreams.cpp
View File

@ -61,7 +61,7 @@ nsBufferedStream::~nsBufferedStream()
Close();
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsBufferedStream, nsISeekableStream)
NS_IMPL_ISUPPORTS1(nsBufferedStream, nsISeekableStream)
nsresult
nsBufferedStream::Init(nsISupports* stream, uint32_t bufferSize)

2
netwerk/base/src/nsBufferedStreams.h
View File

@ -20,7 +20,7 @@
class nsBufferedStream : public nsISeekableStream
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISEEKABLESTREAM
nsBufferedStream();

2
netwerk/base/src/nsDNSPrefetch.cpp
View File

@ -79,7 +79,7 @@ nsDNSPrefetch::PrefetchHigh()
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDNSPrefetch, nsIDNSListener)
NS_IMPL_ISUPPORTS1(nsDNSPrefetch, nsIDNSListener)
NS_IMETHODIMP
nsDNSPrefetch::OnLookupComplete(nsICancelable *request,

2
netwerk/base/src/nsDNSPrefetch.h
View File

@ -19,7 +19,7 @@ class nsIDNSService;
class nsDNSPrefetch MOZ_FINAL : public nsIDNSListener
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIDNSLISTENER
nsDNSPrefetch(nsIURI *aURI, bool storeTiming);

2
netwerk/base/src/nsDirectoryIndexStream.cpp
View File

@ -188,7 +188,7 @@ nsDirectoryIndexStream::Create(nsIFile* aDir, nsIInputStream** aResult)
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDirectoryIndexStream, nsIInputStream)
NS_IMPL_ISUPPORTS1(nsDirectoryIndexStream, nsIInputStream)
// The below routines are proxied to the UI thread!
NS_IMETHODIMP

2
netwerk/base/src/nsDirectoryIndexStream.h
View File

@ -40,7 +40,7 @@ public:
Create(nsIFile* aDir, nsIInputStream** aStreamResult);
// nsISupportsInterface
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
// nsIInputStream interface
NS_DECL_NSIINPUTSTREAM

6
netwerk/base/src/nsFileStreams.cpp
View File

@ -51,9 +51,9 @@ nsFileStreamBase::~nsFileStreamBase()
Close();
}
NS_IMPL_THREADSAFE_ISUPPORTS2(nsFileStreamBase,
nsISeekableStream,
nsIFileMetadata)
NS_IMPL_ISUPPORTS2(nsFileStreamBase,
nsISeekableStream,
nsIFileMetadata)
NS_IMETHODIMP
nsFileStreamBase::Seek(int32_t whence, int64_t offset)

2
netwerk/base/src/nsFileStreams.h
View File

@ -29,7 +29,7 @@ class nsFileStreamBase : public nsISeekableStream,
public nsIFileMetadata
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISEEKABLESTREAM
NS_DECL_NSIFILEMETADATA

14
netwerk/base/src/nsIOService.cpp
View File

@ -301,13 +301,13 @@ nsIOService::GetInstance() {
return gIOService;
}
NS_IMPL_THREADSAFE_ISUPPORTS6(nsIOService,
nsIIOService,
nsIIOService2,
nsINetUtil,
nsISpeculativeConnect,
nsIObserver,
nsISupportsWeakReference)
NS_IMPL_ISUPPORTS6(nsIOService,
nsIIOService,
nsIIOService2,
nsINetUtil,
nsISpeculativeConnect,
nsIObserver,
nsISupportsWeakReference)
////////////////////////////////////////////////////////////////////////////////

2
netwerk/base/src/nsIOService.h
View File

@ -48,7 +48,7 @@ class nsIOService MOZ_FINAL : public nsIIOService2
, public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIIOSERVICE
NS_DECL_NSIIOSERVICE2
NS_DECL_NSIOBSERVER

4
netwerk/base/src/nsIOThreadPool.cpp
View File

@ -43,7 +43,7 @@ class nsIOThreadPool : public nsIEventTarget
, public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIEVENTTARGET
NS_DECL_NSIOBSERVER
@ -66,7 +66,7 @@ private:
nsThreadPoolNaming mNaming; // thread name numbering
};
NS_IMPL_THREADSAFE_ISUPPORTS2(nsIOThreadPool, nsIEventTarget, nsIObserver)
NS_IMPL_ISUPPORTS2(nsIOThreadPool, nsIEventTarget, nsIObserver)
nsresult
nsIOThreadPool::Init()

10
netwerk/base/src/nsInputStreamPump.cpp
View File

@ -155,11 +155,11 @@ nsInputStreamPump::EnsureWaiting()
// although this class can only be accessed from one thread at a time, we do
// allow its ownership to move from thread to thread, assuming the consumer
// understands the limitations of this.
NS_IMPL_THREADSAFE_ISUPPORTS4(nsInputStreamPump,
nsIRequest,
nsIThreadRetargetableRequest,
nsIInputStreamCallback,
nsIInputStreamPump)
NS_IMPL_ISUPPORTS4(nsInputStreamPump,
nsIRequest,
nsIThreadRetargetableRequest,
nsIInputStreamCallback,
nsIInputStreamPump)
//-----------------------------------------------------------------------------
// nsInputStreamPump::nsIRequest

2
netwerk/base/src/nsInputStreamPump.h
View File

@ -24,7 +24,7 @@ class nsInputStreamPump MOZ_FINAL : public nsIInputStreamPump
, public nsIThreadRetargetableRequest
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIREQUEST
NS_DECL_NSIINPUTSTREAMPUMP
NS_DECL_NSIINPUTSTREAMCALLBACK

4
netwerk/base/src/nsLoadGroup.cpp
View File

@ -1048,7 +1048,7 @@ nsresult nsLoadGroup::MergeLoadFlags(nsIRequest *aRequest, nsLoadFlags& outFlags
class nsLoadGroupConnectionInfo MOZ_FINAL : public nsILoadGroupConnectionInfo
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSILOADGROUPCONNECTIONINFO
nsLoadGroupConnectionInfo();
@ -1057,7 +1057,7 @@ private:
nsAutoPtr<mozilla::net::SpdyPushCache3> mSpdyCache3;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsLoadGroupConnectionInfo, nsILoadGroupConnectionInfo)
NS_IMPL_ISUPPORTS1(nsLoadGroupConnectionInfo, nsILoadGroupConnectionInfo)
nsLoadGroupConnectionInfo::nsLoadGroupConnectionInfo()
: mBlockingTransactionCount(0)

6
netwerk/base/src/nsMIMEInputStream.cpp
View File

@ -32,7 +32,7 @@ public:
nsMIMEInputStream();
virtual ~nsMIMEInputStream();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIINPUTSTREAM
NS_DECL_NSIMIMEINPUTSTREAM
NS_DECL_NSISEEKABLESTREAM
@ -65,8 +65,8 @@ private:
bool mStartedReading;
};
NS_IMPL_THREADSAFE_ADDREF(nsMIMEInputStream)
NS_IMPL_THREADSAFE_RELEASE(nsMIMEInputStream)
NS_IMPL_ADDREF(nsMIMEInputStream)
NS_IMPL_RELEASE(nsMIMEInputStream)
NS_IMPL_CLASSINFO(nsMIMEInputStream, NULL, nsIClassInfo::THREADSAFE,
NS_MIMEINPUTSTREAM_CID)

4
netwerk/base/src/nsPACMan.cpp
View File

@ -562,8 +562,8 @@ nsPACMan::ProcessPending()
return true;
}
NS_IMPL_THREADSAFE_ISUPPORTS3(nsPACMan, nsIStreamLoaderObserver,
nsIInterfaceRequestor, nsIChannelEventSink)
NS_IMPL_ISUPPORTS3(nsPACMan, nsIStreamLoaderObserver,
nsIInterfaceRequestor, nsIChannelEventSink)
NS_IMETHODIMP
nsPACMan::OnStreamComplete(nsIStreamLoader *loader,

2
netwerk/base/src/nsPACMan.h
View File

@ -83,7 +83,7 @@ class nsPACMan MOZ_FINAL : public nsIStreamLoaderObserver
, public nsIChannelEventSink
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
nsPACMan();

6
netwerk/base/src/nsPreloadedStream.cpp
View File

@ -13,9 +13,9 @@
namespace mozilla {
namespace net {
NS_IMPL_THREADSAFE_ISUPPORTS2(nsPreloadedStream,
nsIInputStream,
nsIAsyncInputStream)
NS_IMPL_ISUPPORTS2(nsPreloadedStream,
nsIInputStream,
nsIAsyncInputStream)
nsPreloadedStream::nsPreloadedStream(nsIAsyncInputStream *aStream,
const char *data, uint32_t datalen)

2
netwerk/base/src/nsPreloadedStream.h
View File

@ -30,7 +30,7 @@ namespace net {
class nsPreloadedStream MOZ_FINAL : public nsIAsyncInputStream
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIINPUTSTREAM
NS_DECL_NSIASYNCINPUTSTREAM

8
netwerk/base/src/nsProtocolProxyService.cpp
View File

@ -76,7 +76,7 @@ class nsAsyncResolveRequest MOZ_FINAL : public nsIRunnable
, public nsICancelable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
nsAsyncResolveRequest(nsProtocolProxyService *pps, nsIURI *uri,
uint32_t aResolveFlags,
@ -273,7 +273,7 @@ private:
nsCOMPtr<nsIProxyInfo> mProxyInfo;
};
NS_IMPL_THREADSAFE_ISUPPORTS2(nsAsyncResolveRequest, nsICancelable, nsIRunnable)
NS_IMPL_ISUPPORTS2(nsAsyncResolveRequest, nsICancelable, nsIRunnable)
//----------------------------------------------------------------------------
@ -972,7 +972,7 @@ nsProtocolProxyService::ReloadPAC()
// a false mainThreadResponse parameter.
class nsAsyncBridgeRequest MOZ_FINAL : public nsPACManCallback
{
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
nsAsyncBridgeRequest()
: mMutex("nsDeprecatedCallback")
@ -1012,7 +1012,7 @@ private:
nsCString mPACURL;
bool mCompleted;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsAsyncBridgeRequest, nsPACManCallback)
NS_IMPL_ISUPPORTS1(nsAsyncBridgeRequest, nsPACManCallback)
// nsIProtocolProxyService2
NS_IMETHODIMP

2
netwerk/base/src/nsProxyInfo.cpp
View File

@ -8,7 +8,7 @@
#include "nsCOMPtr.h"
// Yes, we support QI to nsProxyInfo
NS_IMPL_THREADSAFE_ISUPPORTS2(nsProxyInfo, nsProxyInfo, nsIProxyInfo)
NS_IMPL_ISUPPORTS2(nsProxyInfo, nsProxyInfo, nsIProxyInfo)
using namespace mozilla;

2
netwerk/base/src/nsProxyInfo.h
View File

@ -27,7 +27,7 @@ class nsProxyInfo MOZ_FINAL : public nsIProxyInfo
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_PROXYINFO_IID)
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIPROXYINFO
// Cheap accessors for use within Necko

6
netwerk/base/src/nsRequestObserverProxy.cpp
View File

@ -115,9 +115,9 @@ public:
// nsRequestObserverProxy::nsISupports implementation...
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS2(nsRequestObserverProxy,
nsIRequestObserver,
nsIRequestObserverProxy)
NS_IMPL_ISUPPORTS2(nsRequestObserverProxy,
nsIRequestObserver,
nsIRequestObserverProxy)
//-----------------------------------------------------------------------------
// nsRequestObserverProxy::nsIRequestObserver implementation...

2
netwerk/base/src/nsRequestObserverProxy.h
View File

@ -18,7 +18,7 @@ class nsARequestObserverEvent;
class nsRequestObserverProxy MOZ_FINAL : public nsIRequestObserverProxy
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIREQUESTOBSERVER
NS_DECL_NSIREQUESTOBSERVERPROXY

8
netwerk/base/src/nsServerSocket.cpp
View File

@ -244,7 +244,7 @@ nsServerSocket::KeepWhenOffline(bool *aKeepWhenOffline)
// nsServerSocket::nsISupports
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS1(nsServerSocket, nsIServerSocket)
NS_IMPL_ISUPPORTS1(nsServerSocket, nsIServerSocket)
//-----------------------------------------------------------------------------
@ -364,7 +364,7 @@ public:
, mTargetThread(do_GetCurrentThread())
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISERVERSOCKETLISTENER
class OnSocketAcceptedRunnable : public nsRunnable
@ -410,8 +410,8 @@ private:
nsCOMPtr<nsIEventTarget> mTargetThread;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(ServerSocketListenerProxy,
nsIServerSocketListener)
NS_IMPL_ISUPPORTS1(ServerSocketListenerProxy,
nsIServerSocketListener)
NS_IMETHODIMP
ServerSocketListenerProxy::OnSocketAccepted(nsIServerSocket* aServ,

2
netwerk/base/src/nsServerSocket.h
View File

@ -16,7 +16,7 @@ class nsServerSocket : public nsASocketHandler
, public nsIServerSocket
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISERVERSOCKET
// nsASocketHandler methods:

18
netwerk/base/src/nsSocketTransport2.cpp
View File

@ -235,14 +235,14 @@ NS_IMPL_QUERY_INTERFACE2(nsSocketInputStream,
NS_IMETHODIMP_(nsrefcnt)
nsSocketInputStream::AddRef()
{
NS_AtomicIncrementRefcnt(mReaderRefCnt);
++mReaderRefCnt;
return mTransport->AddRef();
}
NS_IMETHODIMP_(nsrefcnt)
nsSocketInputStream::Release()
{
if (NS_AtomicDecrementRefcnt(mReaderRefCnt) == 0)
if (--mReaderRefCnt == 0)
Close();
return mTransport->Release();
}
@ -498,14 +498,14 @@ NS_IMPL_QUERY_INTERFACE2(nsSocketOutputStream,
NS_IMETHODIMP_(nsrefcnt)
nsSocketOutputStream::AddRef()
{
NS_AtomicIncrementRefcnt(mWriterRefCnt);
++mWriterRefCnt;
return mTransport->AddRef();
}
NS_IMETHODIMP_(nsrefcnt)
nsSocketOutputStream::Release()
{
if (NS_AtomicDecrementRefcnt(mWriterRefCnt) == 0)
if (--mWriterRefCnt == 0)
Close();
return mTransport->Release();
}
@ -1732,11 +1732,11 @@ nsSocketTransport::IsLocal(bool *aIsLocal)
//-----------------------------------------------------------------------------
// xpcom api
NS_IMPL_THREADSAFE_ISUPPORTS4(nsSocketTransport,
nsISocketTransport,
nsITransport,
nsIDNSListener,
nsIClassInfo)
NS_IMPL_ISUPPORTS4(nsSocketTransport,
nsISocketTransport,
nsITransport,
nsIDNSListener,
nsIClassInfo)
NS_IMPL_CI_INTERFACE_GETTER3(nsSocketTransport,
nsISocketTransport,
nsITransport,

6
netwerk/base/src/nsSocketTransport2.h
View File

@ -57,7 +57,7 @@ public:
private:
nsSocketTransport *mTransport;
nsrefcnt mReaderRefCnt;
mozilla::ThreadSafeAutoRefCnt mReaderRefCnt;
// access to these is protected by mTransport->mLock
nsresult mCondition;
@ -91,7 +91,7 @@ private:
uint32_t count, uint32_t *countRead);
nsSocketTransport *mTransport;
nsrefcnt mWriterRefCnt;
mozilla::ThreadSafeAutoRefCnt mWriterRefCnt;
// access to these is protected by mTransport->mLock
nsresult mCondition;
@ -110,7 +110,7 @@ class nsSocketTransport : public nsASocketHandler
typedef mozilla::Mutex Mutex;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITRANSPORT
NS_DECL_NSISOCKETTRANSPORT
NS_DECL_NSIDNSLISTENER

14
netwerk/base/src/nsSocketTransportService2.cpp
View File

@ -401,13 +401,13 @@ nsSocketTransportService::Poll(bool wait, uint32_t *interval)
//-----------------------------------------------------------------------------
// xpcom api
NS_IMPL_THREADSAFE_ISUPPORTS6(nsSocketTransportService,
nsISocketTransportService,
nsIEventTarget,
nsIThreadObserver,
nsIRunnable,
nsPISocketTransportService,
nsIObserver)
NS_IMPL_ISUPPORTS6(nsSocketTransportService,
nsISocketTransportService,
nsIEventTarget,
nsIThreadObserver,
nsIRunnable,
nsPISocketTransportService,
nsIObserver)
// called from main thread only
NS_IMETHODIMP

2
netwerk/base/src/nsSocketTransportService2.h
View File

@ -47,7 +47,7 @@ class nsSocketTransportService : public nsPISocketTransportService
typedef mozilla::Mutex Mutex;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSPISOCKETTRANSPORTSERVICE
NS_DECL_NSISOCKETTRANSPORTSERVICE
NS_DECL_NSIEVENTTARGET

10
netwerk/base/src/nsStreamListenerTee.cpp
View File

@ -5,11 +5,11 @@
#include "nsStreamListenerTee.h"
#include "nsProxyRelease.h"
NS_IMPL_THREADSAFE_ISUPPORTS4(nsStreamListenerTee,
nsIStreamListener,
nsIRequestObserver,
nsIStreamListenerTee,
nsIThreadRetargetableStreamListener)
NS_IMPL_ISUPPORTS4(nsStreamListenerTee,
nsIStreamListener,
nsIRequestObserver,
nsIStreamListenerTee,
nsIThreadRetargetableStreamListener)
NS_IMETHODIMP
nsStreamListenerTee::OnStartRequest(nsIRequest *request,

2
netwerk/base/src/nsStreamListenerTee.h
View File

@ -16,7 +16,7 @@ class nsStreamListenerTee : public nsIStreamListenerTee
, public nsIThreadRetargetableStreamListener
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIREQUESTOBSERVER
NS_DECL_NSISTREAMLISTENER
NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER

24
netwerk/base/src/nsStreamTransportService.cpp
View File

@ -32,7 +32,7 @@ class nsInputStreamTransport : public nsITransport
, public nsIInputStream
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITRANSPORT
NS_DECL_NSIINPUTSTREAM
@ -70,9 +70,9 @@ private:
bool mInProgress;
};
NS_IMPL_THREADSAFE_ISUPPORTS2(nsInputStreamTransport,
nsITransport,
nsIInputStream)
NS_IMPL_ISUPPORTS2(nsInputStreamTransport,
nsITransport,
nsIInputStream)
/** nsITransport **/
@ -232,7 +232,7 @@ class nsOutputStreamTransport : public nsITransport
, public nsIOutputStream
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITRANSPORT
NS_DECL_NSIOUTPUTSTREAM
@ -270,9 +270,9 @@ private:
bool mInProgress;
};
NS_IMPL_THREADSAFE_ISUPPORTS2(nsOutputStreamTransport,
nsITransport,
nsIOutputStream)
NS_IMPL_ISUPPORTS2(nsOutputStreamTransport,
nsITransport,
nsIOutputStream)
/** nsITransport **/
@ -454,10 +454,10 @@ nsStreamTransportService::Init()
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS3(nsStreamTransportService,
nsIStreamTransportService,
nsIEventTarget,
nsIObserver)
NS_IMPL_ISUPPORTS3(nsStreamTransportService,
nsIStreamTransportService,
nsIEventTarget,
nsIObserver)
NS_IMETHODIMP
nsStreamTransportService::Dispatch(nsIRunnable *task, uint32_t flags)

2
netwerk/base/src/nsStreamTransportService.h
View File

@ -14,7 +14,7 @@ class nsStreamTransportService MOZ_FINAL : public nsIStreamTransportService
, public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISTREAMTRANSPORTSERVICE
NS_DECL_NSIEVENTTARGET
NS_DECL_NSIOBSERVER

2
netwerk/base/src/nsTemporaryFileInputStream.cpp
View File

@ -6,7 +6,7 @@
#include "nsTemporaryFileInputStream.h"
#include "nsStreamUtils.h"
NS_IMPL_THREADSAFE_ISUPPORTS1(nsTemporaryFileInputStream, nsIInputStream)
NS_IMPL_ISUPPORTS1(nsTemporaryFileInputStream, nsIInputStream)
nsTemporaryFileInputStream::nsTemporaryFileInputStream(FileDescOwner* aFileDescOwner, uint64_t aStartPos, uint64_t aEndPos)
: mFileDescOwner(aFileDescOwner),

2
netwerk/base/src/nsTemporaryFileInputStream.h
View File

@ -39,7 +39,7 @@ public:
virtual ~nsTemporaryFileInputStream() { }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIINPUTSTREAM
private:

4
netwerk/base/src/nsTransportUtils.cpp
View File

@ -19,7 +19,7 @@ class nsTransportStatusEvent;
class nsTransportEventSinkProxy : public nsITransportEventSink
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITRANSPORTEVENTSINK
nsTransportEventSinkProxy(nsITransportEventSink *sink,
@ -89,7 +89,7 @@ public:
uint64_t mProgressMax;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsTransportEventSinkProxy, nsITransportEventSink)
NS_IMPL_ISUPPORTS1(nsTransportEventSinkProxy, nsITransportEventSink)
NS_IMETHODIMP
nsTransportEventSinkProxy::OnTransportStatus(nsITransport *transport,

12
netwerk/base/src/nsUDPServerSocket.cpp
View File

@ -43,7 +43,7 @@ PostEvent(nsUDPServerSocket *s, nsUDPServerSocketFunc func)
//-----------------------------------------------------------------------------
// nsUPDOutputStream impl
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS1(nsUDPOutputStream, nsIOutputStream)
NS_IMPL_ISUPPORTS1(nsUDPOutputStream, nsIOutputStream)
nsUDPOutputStream::nsUDPOutputStream(nsUDPServerSocket* aServer,
PRFileDesc* aFD,
@ -117,7 +117,7 @@ NS_IMETHODIMP nsUDPOutputStream::IsNonBlocking(bool *_retval)
//-----------------------------------------------------------------------------
// nsUPDMessage impl
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS1(nsUDPMessage, nsIUDPMessage)
NS_IMPL_ISUPPORTS1(nsUDPMessage, nsIUDPMessage)
nsUDPMessage::nsUDPMessage(PRNetAddr* aAddr,
nsIOutputStream* aOutputStream,
@ -383,7 +383,7 @@ nsUDPServerSocket::IsLocal(bool *aIsLocal)
// nsServerSocket::nsISupports
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS1(nsUDPServerSocket, nsIUDPServerSocket)
NS_IMPL_ISUPPORTS1(nsUDPServerSocket, nsIUDPServerSocket)
//-----------------------------------------------------------------------------
@ -517,7 +517,7 @@ public:
, mTargetThread(do_GetCurrentThread())
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIUDPSERVERSOCKETLISTENER
class OnPacketReceivedRunnable : public nsRunnable
@ -563,8 +563,8 @@ private:
nsCOMPtr<nsIEventTarget> mTargetThread;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(ServerSocketListenerProxy,
nsIUDPServerSocketListener)
NS_IMPL_ISUPPORTS1(ServerSocketListenerProxy,
nsIUDPServerSocketListener)
NS_IMETHODIMP
ServerSocketListenerProxy::OnPacketReceived(nsIUDPServerSocket* aServ,

6
netwerk/base/src/nsUDPServerSocket.h
View File

@ -17,7 +17,7 @@ class nsUDPServerSocket : public nsASocketHandler
, public nsIUDPServerSocket
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIUDPSERVERSOCKET
// nsASocketHandler methods:
@ -61,7 +61,7 @@ private:
class nsUDPMessage : public nsIUDPMessage
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIUDPMESSAGE
nsUDPMessage(PRNetAddr* aAddr,
@ -82,7 +82,7 @@ private:
class nsUDPOutputStream : public nsIOutputStream
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOUTPUTSTREAM
nsUDPOutputStream(nsUDPServerSocket* aServer,

7
netwerk/base/src/nsURLParsers.cpp
View File

@ -32,11 +32,8 @@ CountConsecutiveSlashes(const char *str, int32_t len)
// nsBaseURLParser implementation
//----------------------------------------------------------------------------
// The URL parser service does not have any internal state; however, it can
// be called from multiple threads, so we must use a threadsafe AddRef and
// Release implementation.
NS_IMPL_THREADSAFE_ISUPPORTS1(nsAuthURLParser, nsIURLParser)
NS_IMPL_THREADSAFE_ISUPPORTS1(nsNoAuthURLParser, nsIURLParser)
NS_IMPL_ISUPPORTS1(nsAuthURLParser, nsIURLParser)
NS_IMPL_ISUPPORTS1(nsNoAuthURLParser, nsIURLParser)
#define SET_RESULT(component, pos, len) \
PR_BEGIN_MACRO \

4
netwerk/base/src/nsURLParsers.h
View File

@ -43,7 +43,7 @@ protected:
class nsNoAuthURLParser MOZ_FINAL : public nsBaseURLParser
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
#if defined(XP_WIN) || defined(XP_OS2)
NS_IMETHOD ParseFilePath(const char *, int32_t,
@ -75,7 +75,7 @@ public:
class nsAuthURLParser : public nsBaseURLParser
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
virtual ~nsAuthURLParser() {}

22
netwerk/cache/nsCacheEntryDescriptor.cpp vendored
View File

@ -70,9 +70,9 @@ private:
};
NS_IMPL_THREADSAFE_ISUPPORTS2(nsCacheEntryDescriptor,
nsICacheEntryDescriptor,
nsICacheEntryInfo)
NS_IMPL_ISUPPORTS2(nsCacheEntryDescriptor,
nsICacheEntryDescriptor,
nsICacheEntryInfo)
nsCacheEntryDescriptor::nsCacheEntryDescriptor(nsCacheEntry * entry,
nsCacheAccessMode accessGranted)
@ -654,7 +654,7 @@ nsCacheEntryDescriptor::VisitMetaData(nsICacheMetaDataVisitor * visitor)
* open while referenced.
******************************************************************************/
NS_IMPL_THREADSAFE_ADDREF(nsCacheEntryDescriptor::nsInputStreamWrapper)
NS_IMPL_ADDREF(nsCacheEntryDescriptor::nsInputStreamWrapper)
NS_IMETHODIMP_(nsrefcnt)
nsCacheEntryDescriptor::nsInputStreamWrapper::Release()
{
@ -672,7 +672,7 @@ nsCacheEntryDescriptor::nsInputStreamWrapper::Release()
nsrefcnt count;
NS_PRECONDITION(0 != mRefCnt, "dup release");
count = NS_AtomicDecrementRefcnt(mRefCnt);
count = --mRefCnt;
NS_LOG_RELEASE(this, count, "nsCacheEntryDescriptor::nsInputStreamWrapper");
if (0 == count) {
@ -846,7 +846,7 @@ nsInputStreamWrapper::IsNonBlocking(bool *result)
* nsDecompressInputStreamWrapper - an input stream wrapper that decompresses
******************************************************************************/
NS_IMPL_THREADSAFE_ADDREF(nsCacheEntryDescriptor::nsDecompressInputStreamWrapper)
NS_IMPL_ADDREF(nsCacheEntryDescriptor::nsDecompressInputStreamWrapper)
NS_IMETHODIMP_(nsrefcnt)
nsCacheEntryDescriptor::nsDecompressInputStreamWrapper::Release()
{
@ -865,7 +865,7 @@ nsCacheEntryDescriptor::nsDecompressInputStreamWrapper::Release()
nsrefcnt count;
NS_PRECONDITION(0 != mRefCnt, "dup release");
count = NS_AtomicDecrementRefcnt(mRefCnt);
count = --mRefCnt;
NS_LOG_RELEASE(this, count,
"nsCacheEntryDescriptor::nsDecompressInputStreamWrapper");
@ -1036,7 +1036,7 @@ nsDecompressInputStreamWrapper::EndZstream()
* - also keeps the cache entry open while referenced.
******************************************************************************/
NS_IMPL_THREADSAFE_ADDREF(nsCacheEntryDescriptor::nsOutputStreamWrapper)
NS_IMPL_ADDREF(nsCacheEntryDescriptor::nsOutputStreamWrapper)
NS_IMETHODIMP_(nsrefcnt)
nsCacheEntryDescriptor::nsOutputStreamWrapper::Release()
{
@ -1054,7 +1054,7 @@ nsCacheEntryDescriptor::nsOutputStreamWrapper::Release()
nsrefcnt count;
NS_PRECONDITION(0 != mRefCnt, "dup release");
count = NS_AtomicDecrementRefcnt(mRefCnt);
count = --mRefCnt;
NS_LOG_RELEASE(this, count,
"nsCacheEntryDescriptor::nsOutputStreamWrapper");
@ -1266,7 +1266,7 @@ nsOutputStreamWrapper::IsNonBlocking(bool *result)
* data before it is written
******************************************************************************/
NS_IMPL_THREADSAFE_ADDREF(nsCacheEntryDescriptor::nsCompressOutputStreamWrapper)
NS_IMPL_ADDREF(nsCacheEntryDescriptor::nsCompressOutputStreamWrapper)
NS_IMETHODIMP_(nsrefcnt)
nsCacheEntryDescriptor::nsCompressOutputStreamWrapper::Release()
{
@ -1284,7 +1284,7 @@ nsCacheEntryDescriptor::nsCompressOutputStreamWrapper::Release()
nsrefcnt count;
NS_PRECONDITION(0 != mRefCnt, "dup release");
count = NS_AtomicDecrementRefcnt(mRefCnt);
count = --mRefCnt;
NS_LOG_RELEASE(this, count,
"nsCacheEntryDescriptor::nsCompressOutputStreamWrapper");

10
netwerk/cache/nsCacheEntryDescriptor.h vendored
View File

@ -25,7 +25,7 @@ class nsCacheEntryDescriptor :
public nsICacheEntryDescriptor
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICACHEENTRYDESCRIPTOR
NS_DECL_NSICACHEENTRYINFO
@ -82,7 +82,7 @@ private:
bool mInitialized;
mozilla::Mutex mLock;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIINPUTSTREAM
nsInputStreamWrapper(nsCacheEntryDescriptor * desc, uint32_t off)
@ -115,7 +115,7 @@ private:
bool mStreamInitialized;
bool mStreamEnded;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
nsDecompressInputStreamWrapper(nsCacheEntryDescriptor * desc,
uint32_t off)
@ -154,7 +154,7 @@ private:
bool mInitialized;
mozilla::Mutex mLock;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOUTPUTSTREAM
nsOutputStreamWrapper(nsCacheEntryDescriptor * desc, uint32_t off)
@ -194,7 +194,7 @@ private:
bool mStreamEnded;
uint32_t mUncompressedCount;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
nsCompressOutputStreamWrapper(nsCacheEntryDescriptor * desc,
uint32_t off)

10
netwerk/cache/nsCacheService.cpp vendored
View File

@ -121,7 +121,7 @@ const int32_t PRE_GECKO_2_0_DEFAULT_CACHE_SIZE = 50 * 1024;
class nsCacheProfilePrefObserver : public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOBSERVER
nsCacheProfilePrefObserver()
@ -201,12 +201,12 @@ private:
bool mClearCacheOnShutdown;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsCacheProfilePrefObserver, nsIObserver)
NS_IMPL_ISUPPORTS1(nsCacheProfilePrefObserver, nsIObserver)
class nsSetDiskSmartSizeCallback MOZ_FINAL : public nsITimerCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_IMETHOD Notify(nsITimer* aTimer) {
if (nsCacheService::gService) {
@ -218,7 +218,7 @@ public:
}
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSetDiskSmartSizeCallback, nsITimerCallback)
NS_IMPL_ISUPPORTS1(nsSetDiskSmartSizeCallback, nsITimerCallback)
// Runnable sent to main thread after the cache IO thread calculates available
// disk space, so that there is no race in setting mDiskCacheCapacity.
@ -1072,7 +1072,7 @@ private:
*****************************************************************************/
nsCacheService * nsCacheService::gService = nullptr;
NS_IMPL_THREADSAFE_ISUPPORTS2(nsCacheService, nsICacheService, nsICacheServiceInternal)
NS_IMPL_ISUPPORTS2(nsCacheService, nsICacheService, nsICacheServiceInternal)
nsCacheService::nsCacheService()
: mObserver(nullptr),

2
netwerk/cache/nsCacheService.h vendored
View File

@ -64,7 +64,7 @@ private:
class nsCacheService : public nsICacheServiceInternal
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICACHESERVICE
NS_DECL_NSICACHESERVICEINTERNAL

2
netwerk/cache/nsDiskCacheBinding.cpp vendored
View File

@ -70,7 +70,7 @@ GetCacheEntryBinding(nsCacheEntry * entry)
* nsDiskCacheBinding
*****************************************************************************/
NS_IMPL_THREADSAFE_ISUPPORTS0(nsDiskCacheBinding)
NS_IMPL_ISUPPORTS0(nsDiskCacheBinding)
nsDiskCacheBinding::nsDiskCacheBinding(nsCacheEntry* entry, nsDiskCacheRecord * record)
: mCacheEntry(entry)

2
netwerk/cache/nsDiskCacheBinding.h vendored
View File

@ -32,7 +32,7 @@ class nsDiskCacheDeviceDeactivateEntryEvent;
class nsDiskCacheBinding : public nsISupports, public PRCList {
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
nsDiskCacheBinding(nsCacheEntry* entry, nsDiskCacheRecord * record);
virtual ~nsDiskCacheBinding();

8
netwerk/cache/nsDiskCacheDeviceSQL.cpp vendored
View File

@ -150,7 +150,7 @@ DCacheHash(const char * key)
* nsOfflineCacheEvictionFunction
*/
NS_IMPL_THREADSAFE_ISUPPORTS1(nsOfflineCacheEvictionFunction, mozIStorageFunction)
NS_IMPL_ISUPPORTS1(nsOfflineCacheEvictionFunction, mozIStorageFunction)
// helper function for directly exposing the same data file binding
// path algorithm used in nsOfflineCacheBinding::Create
@ -347,7 +347,7 @@ nsOfflineCacheDeviceInfo::GetMaximumSize(uint32_t *aMaximumSize)
class nsOfflineCacheBinding MOZ_FINAL : public nsISupports
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
static nsOfflineCacheBinding *
Create(nsIFile *cacheDir, const nsCString *key, int generation);
@ -363,7 +363,7 @@ public:
void ClearNewEntry() { mFlags &= ~FLAG_NEW_ENTRY; }
};
NS_IMPL_THREADSAFE_ISUPPORTS0(nsOfflineCacheBinding)
NS_IMPL_ISUPPORTS0(nsOfflineCacheBinding)
nsOfflineCacheBinding *
nsOfflineCacheBinding::Create(nsIFile *cacheDir,
@ -875,7 +875,7 @@ private:
* nsOfflineCacheDevice
*/
NS_IMPL_THREADSAFE_ISUPPORTS0(nsOfflineCacheDevice)
NS_IMPL_ISUPPORTS0(nsOfflineCacheDevice)
nsOfflineCacheDevice::nsOfflineCacheDevice()
: mDB(nullptr)

4
netwerk/cache/nsDiskCacheDeviceSQL.h vendored
View File

@ -41,7 +41,7 @@ private:
class nsOfflineCacheEvictionFunction MOZ_FINAL : public mozIStorageFunction {
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_MOZISTORAGEFUNCTION
nsOfflineCacheEvictionFunction(nsOfflineCacheDevice *device)
@ -63,7 +63,7 @@ class nsOfflineCacheDevice : public nsCacheDevice
public:
nsOfflineCacheDevice();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
/**
* nsCacheDevice methods

6
netwerk/cache/nsDiskCacheStreams.cpp vendored
View File

@ -44,7 +44,7 @@ public:
virtual ~nsDiskCacheInputStream();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIINPUTSTREAM
private:
@ -57,7 +57,7 @@ private:
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDiskCacheInputStream, nsIInputStream)
NS_IMPL_ISUPPORTS1(nsDiskCacheInputStream, nsIInputStream)
nsDiskCacheInputStream::nsDiskCacheInputStream( nsDiskCacheStreamIO * parent,
@ -190,7 +190,7 @@ nsDiskCacheInputStream::IsNonBlocking(bool * nonBlocking)
/******************************************************************************
* nsDiskCacheStreamIO
*****************************************************************************/
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDiskCacheStreamIO, nsIOutputStream)
NS_IMPL_ISUPPORTS1(nsDiskCacheStreamIO, nsIOutputStream)
nsDiskCacheStreamIO::nsDiskCacheStreamIO(nsDiskCacheBinding * binding)
: mBinding(binding)

2
netwerk/cache/nsDiskCacheStreams.h vendored
View File

@ -26,7 +26,7 @@ public:
nsDiskCacheStreamIO(nsDiskCacheBinding * binding);
virtual ~nsDiskCacheStreamIO();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOUTPUTSTREAM
nsresult GetInputStream(uint32_t offset, nsIInputStream ** inputStream);

14
netwerk/dns/nsDNSService2.cpp
View File

@ -49,7 +49,7 @@ static const char kPrefDnsLocalDomains[] = "network.dns.localDomains";
class nsDNSRecord : public nsIDNSRecord
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIDNSRECORD
nsDNSRecord(nsHostRecord *hostRecord)
@ -69,7 +69,7 @@ private:
bool mDone;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDNSRecord, nsIDNSRecord)
NS_IMPL_ISUPPORTS1(nsDNSRecord, nsIDNSRecord)
NS_IMETHODIMP
nsDNSRecord::GetCanonicalName(nsACString &result)
@ -246,7 +246,7 @@ class nsDNSAsyncRequest MOZ_FINAL : public nsResolveHostCallback
, public nsICancelable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICANCELABLE
nsDNSAsyncRequest(nsHostResolver *res,
@ -306,7 +306,7 @@ nsDNSAsyncRequest::EqualsAsyncListener(nsIDNSListener *aListener)
return (aListener == mListener);
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDNSAsyncRequest, nsICancelable)
NS_IMPL_ISUPPORTS1(nsDNSAsyncRequest, nsICancelable)
NS_IMETHODIMP
nsDNSAsyncRequest::Cancel(nsresult reason)
@ -372,7 +372,7 @@ nsDNSService::~nsDNSService()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS3(nsDNSService, nsIDNSService, nsPIDNSService,
NS_IMPL_ISUPPORTS3(nsDNSService, nsIDNSService, nsPIDNSService,
nsIObserver)
NS_IMETHODIMP
@ -532,7 +532,7 @@ public:
, mTargetThread(aTargetThread)
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIDNSLISTENER
class OnLookupCompleteRunnable : public nsRunnable
@ -562,7 +562,7 @@ private:
nsCOMPtr<nsIEventTarget> mTargetThread;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(DNSListenerProxy, nsIDNSListener)
NS_IMPL_ISUPPORTS1(DNSListenerProxy, nsIDNSListener)
NS_IMETHODIMP
DNSListenerProxy::OnLookupComplete(nsICancelable* aRequest,

2
netwerk/dns/nsDNSService2.h
View File

@ -20,7 +20,7 @@ class nsDNSService MOZ_FINAL : public nsPIDNSService
, public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSPIDNSSERVICE
NS_DECL_NSIDNSSERVICE
NS_DECL_NSIOBSERVER

8
netwerk/dns/nsIDNService.cpp
View File

@ -46,10 +46,10 @@ inline bool isOnlySafeChars(const nsAFlatString& in,
//-----------------------------------------------------------------------------
/* Implementation file */
NS_IMPL_THREADSAFE_ISUPPORTS3(nsIDNService,
nsIIDNService,
nsIObserver,
nsISupportsWeakReference)
NS_IMPL_ISUPPORTS3(nsIDNService,
nsIIDNService,
nsIObserver,
nsISupportsWeakReference)
nsresult nsIDNService::Init()
{

2
netwerk/dns/nsIDNService.h
View File

@ -27,7 +27,7 @@ class nsIDNService : public nsIIDNService,
public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIIDNSERVICE
NS_DECL_NSIOBSERVER

8
netwerk/ipc/RemoteOpenFileChild.cpp
View File

@ -62,10 +62,10 @@ private:
// RemoteOpenFileChild
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS3(RemoteOpenFileChild,
nsIFile,
nsIHashable,
nsICachedFileDescriptorListener)
NS_IMPL_ISUPPORTS3(RemoteOpenFileChild,
nsIFile,
nsIHashable,
nsICachedFileDescriptorListener)
RemoteOpenFileChild::RemoteOpenFileChild(const RemoteOpenFileChild& other)
: mTabChild(other.mTabChild)

2
netwerk/ipc/RemoteOpenFileChild.h
View File

@ -59,7 +59,7 @@ public:
virtual ~RemoteOpenFileChild();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIFILE
NS_DECL_NSIHASHABLE

4
netwerk/protocol/device/AndroidCaptureProvider.cpp
View File

@ -17,7 +17,7 @@
using namespace mozilla::net;
NS_IMPL_THREADSAFE_ISUPPORTS2(AndroidCameraInputStream, nsIInputStream, nsIAsyncInputStream)
NS_IMPL_ISUPPORTS2(AndroidCameraInputStream, nsIInputStream, nsIAsyncInputStream)
AndroidCameraInputStream::AndroidCameraInputStream() :
mWidth(0), mHeight(0), mCamera(0), mHeaderSent(false), mClosed(true), mFrameSize(0),
@ -255,7 +255,7 @@ NS_IMETHODIMP AndroidCameraInputStream::CloseWithStatus(nsresult status)
* AndroidCaptureProvider implementation
*/
NS_IMPL_THREADSAFE_ISUPPORTS0(AndroidCaptureProvider)
NS_IMPL_ISUPPORTS0(AndroidCaptureProvider)
AndroidCaptureProvider* AndroidCaptureProvider::sInstance = NULL;

4
netwerk/protocol/device/AndroidCaptureProvider.h
View File

@ -21,7 +21,7 @@ class AndroidCaptureProvider MOZ_FINAL : public nsDeviceCaptureProvider {
AndroidCaptureProvider();
~AndroidCaptureProvider();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
nsresult Init(nsACString& aContentType, nsCaptureParams* aParams, nsIInputStream** aStream);
static AndroidCaptureProvider* sInstance;
@ -34,7 +34,7 @@ class AndroidCameraInputStream MOZ_FINAL : public nsIAsyncInputStream, mozilla::
NS_IMETHODIMP Init(nsACString& aContentType, nsCaptureParams* aParams);
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIINPUTSTREAM
NS_DECL_NSIASYNCINPUTSTREAM

4
netwerk/protocol/device/nsDeviceProtocolHandler.cpp
View File

@ -12,8 +12,8 @@
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDeviceProtocolHandler,
nsIProtocolHandler)
NS_IMPL_ISUPPORTS1(nsDeviceProtocolHandler,
nsIProtocolHandler)
nsresult
nsDeviceProtocolHandler::Init(){

2
netwerk/protocol/device/nsDeviceProtocolHandler.h
View File

@ -17,7 +17,7 @@
class nsDeviceProtocolHandler MOZ_FINAL : public nsIProtocolHandler {
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIPROTOCOLHANDLER
nsDeviceProtocolHandler() {}

8
netwerk/protocol/file/nsFileProtocolHandler.cpp
View File

@ -51,10 +51,10 @@ nsFileProtocolHandler::Init()
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS3(nsFileProtocolHandler,
nsIFileProtocolHandler,
nsIProtocolHandler,
nsISupportsWeakReference)
NS_IMPL_ISUPPORTS3(nsFileProtocolHandler,
nsIFileProtocolHandler,
nsIProtocolHandler,
nsISupportsWeakReference)
//-----------------------------------------------------------------------------
// nsIProtocolHandler methods:

2
netwerk/protocol/file/nsFileProtocolHandler.h
View File

@ -13,7 +13,7 @@ class nsFileProtocolHandler : public nsIFileProtocolHandler
, public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIPROTOCOLHANDLER
NS_DECL_NSIFILEPROTOCOLHANDLER

4
netwerk/protocol/ftp/nsFTPChannel.cpp
View File

@ -159,7 +159,7 @@ public:
, mTargetThread(do_GetCurrentThread())
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIFTPEVENTSINK
class OnFTPControlLogRunnable : public nsRunnable
@ -186,7 +186,7 @@ private:
nsCOMPtr<nsIThread> mTargetThread;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(FTPEventSinkProxy, nsIFTPEventSink)
NS_IMPL_ISUPPORTS1(FTPEventSinkProxy, nsIFTPEventSink)
NS_IMETHODIMP
FTPEventSinkProxy::OnFTPControlLog(bool aServer, const char* aMsg)

10
netwerk/protocol/ftp/nsFtpProtocolHandler.cpp
View File

@ -94,11 +94,11 @@ nsFtpProtocolHandler::~nsFtpProtocolHandler()
gFtpHandler = nullptr;
}
NS_IMPL_THREADSAFE_ISUPPORTS4(nsFtpProtocolHandler,
nsIProtocolHandler,
nsIProxiedProtocolHandler,
nsIObserver,
nsISupportsWeakReference)
NS_IMPL_ISUPPORTS4(nsFtpProtocolHandler,
nsIProtocolHandler,
nsIProxiedProtocolHandler,
nsIObserver,
nsISupportsWeakReference)
nsresult
nsFtpProtocolHandler::Init()

2
netwerk/protocol/ftp/nsFtpProtocolHandler.h
View File

@ -28,7 +28,7 @@ class nsFtpProtocolHandler : public nsIProxiedProtocolHandler
, public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIPROTOCOLHANDLER
NS_DECL_NSIPROXIEDPROTOCOLHANDLER
NS_DECL_NSIOBSERVER

2
netwerk/protocol/http/NullHttpTransaction.cpp
View File

@ -15,7 +15,7 @@
namespace mozilla {
namespace net {
NS_IMPL_THREADSAFE_ISUPPORTS0(NullHttpTransaction)
NS_IMPL_ISUPPORTS0(NullHttpTransaction)
NullHttpTransaction::NullHttpTransaction(nsHttpConnectionInfo *ci,
nsIInterfaceRequestor *callbacks,

2
netwerk/protocol/http/NullHttpTransaction.h
View File

@ -24,7 +24,7 @@ namespace mozilla { namespace net {
class NullHttpTransaction MOZ_FINAL : public nsAHttpTransaction
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSAHTTPTRANSACTION
NullHttpTransaction(nsHttpConnectionInfo *ci,

2
netwerk/protocol/http/SpdyPush3.cpp
View File

@ -208,7 +208,7 @@ SpdyPushCache3::RemovePushedStream(nsCString key)
// stream has not yet been matched with a pull request
//////////////////////////////////////////
NS_IMPL_THREADSAFE_ISUPPORTS0(SpdyPush3TransactionBuffer)
NS_IMPL_ISUPPORTS0(SpdyPush3TransactionBuffer)
SpdyPush3TransactionBuffer::SpdyPush3TransactionBuffer()
: mStatus(NS_OK)

2
netwerk/protocol/http/SpdyPush3.h
View File

@ -73,7 +73,7 @@ private:
class SpdyPush3TransactionBuffer MOZ_FINAL : public nsAHttpTransaction
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSAHTTPTRANSACTION
SpdyPush3TransactionBuffer();

4
netwerk/protocol/http/SpdySession2.cpp
View File

@ -29,8 +29,8 @@ namespace net {
// SpdySession2 has multiple inheritance of things that implement
// nsISupports, so this magic is taken from nsHttpPipeline that
// implements some of the same abstract classes.
NS_IMPL_THREADSAFE_ADDREF(SpdySession2)
NS_IMPL_THREADSAFE_RELEASE(SpdySession2)
NS_IMPL_ADDREF(SpdySession2)
NS_IMPL_RELEASE(SpdySession2)
NS_INTERFACE_MAP_BEGIN(SpdySession2)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsAHttpConnection)
NS_INTERFACE_MAP_END

2
netwerk/protocol/http/SpdySession2.h
View File

@ -31,7 +31,7 @@ class SpdySession2 MOZ_FINAL : public ASpdySession
, public nsAHttpSegmentWriter
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSAHTTPTRANSACTION
NS_DECL_NSAHTTPCONNECTION(mConnection)
NS_DECL_NSAHTTPSEGMENTREADER

4
netwerk/protocol/http/SpdySession3.cpp
View File

@ -32,8 +32,8 @@ namespace net {
// SpdySession3 has multiple inheritance of things that implement
// nsISupports, so this magic is taken from nsHttpPipeline that
// implements some of the same abstract classes.
NS_IMPL_THREADSAFE_ADDREF(SpdySession3)
NS_IMPL_THREADSAFE_RELEASE(SpdySession3)
NS_IMPL_ADDREF(SpdySession3)
NS_IMPL_RELEASE(SpdySession3)
NS_INTERFACE_MAP_BEGIN(SpdySession3)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsAHttpConnection)
NS_INTERFACE_MAP_END

2
netwerk/protocol/http/SpdySession3.h
View File

@ -29,7 +29,7 @@ class SpdySession3 MOZ_FINAL : public ASpdySession
, public nsAHttpSegmentWriter
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSAHTTPTRANSACTION
NS_DECL_NSAHTTPCONNECTION(mConnection)
NS_DECL_NSAHTTPSEGMENTREADER

6
netwerk/protocol/http/nsHttpActivityDistributor.cpp
View File

@ -61,9 +61,9 @@ private:
ObserverArray mObservers;
};
NS_IMPL_THREADSAFE_ISUPPORTS2(nsHttpActivityDistributor,
nsIHttpActivityDistributor,
nsIHttpActivityObserver)
NS_IMPL_ISUPPORTS2(nsHttpActivityDistributor,
nsIHttpActivityDistributor,
nsIHttpActivityObserver)
nsHttpActivityDistributor::nsHttpActivityDistributor()
: mLock("nsHttpActivityDistributor.mLock")

2
netwerk/protocol/http/nsHttpActivityDistributor.h
View File

@ -15,7 +15,7 @@ class nsHttpActivityDistributor : public nsIHttpActivityDistributor
{
public:
typedef nsTArray<nsMainThreadPtrHandle<nsIHttpActivityObserver> > ObserverArray;
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIHTTPACTIVITYOBSERVER
NS_DECL_NSIHTTPACTIVITYDISTRIBUTOR

10
netwerk/protocol/http/nsHttpConnection.cpp
View File

@ -1514,11 +1514,11 @@ nsHttpConnection::SetupProxyConnect()
// nsHttpConnection::nsISupports
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS4(nsHttpConnection,
nsIInputStreamCallback,
nsIOutputStreamCallback,
nsITransportEventSink,
nsIInterfaceRequestor)
NS_IMPL_ISUPPORTS4(nsHttpConnection,
nsIInputStreamCallback,
nsIOutputStreamCallback,
nsITransportEventSink,
nsIInterfaceRequestor)
//-----------------------------------------------------------------------------
// nsHttpConnection::nsIInputStreamCallback

2
netwerk/protocol/http/nsHttpConnection.h
View File

@ -41,7 +41,7 @@ class nsHttpConnection : public nsAHttpSegmentReader
, public nsIInterfaceRequestor
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSAHTTPSEGMENTREADER
NS_DECL_NSAHTTPSEGMENTWRITER
NS_DECL_NSIINPUTSTREAMCALLBACK

6
netwerk/protocol/http/nsHttpConnectionInfo.h
View File

@ -36,14 +36,14 @@ public:
nsrefcnt AddRef()
{
nsrefcnt n = NS_AtomicIncrementRefcnt(mRef);
nsrefcnt n = ++mRef;
NS_LOG_ADDREF(this, n, "nsHttpConnectionInfo", sizeof(*this));
return n;
}
nsrefcnt Release()
{
nsrefcnt n = NS_AtomicDecrementRefcnt(mRef);
nsrefcnt n = --mRef;
NS_LOG_RELEASE(this, n, "nsHttpConnectionInfo");
if (n == 0)
delete this;
@ -97,7 +97,7 @@ public:
bool UsingProxy();
private:
nsrefcnt mRef;
mozilla::ThreadSafeAutoRefCnt mRef;
nsCString mHashKey;
nsCString mHost;
int32_t mPort;

14
netwerk/protocol/http/nsHttpConnectionMgr.cpp
View File

@ -37,7 +37,7 @@ static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS1(nsHttpConnectionMgr, nsIObserver)
NS_IMPL_ISUPPORTS1(nsHttpConnectionMgr, nsIObserver)
static void
InsertTransactionSorted(nsTArray<nsHttpTransaction*> &pendingQ, nsHttpTransaction *trans)
@ -2459,7 +2459,7 @@ nsHttpConnectionMgr::nsConnectionHandle::~nsConnectionHandle()
}
}
NS_IMPL_THREADSAFE_ISUPPORTS0(nsHttpConnectionMgr::nsConnectionHandle)
NS_IMPL_ISUPPORTS0(nsHttpConnectionMgr::nsConnectionHandle)
nsHttpConnectionMgr::nsConnectionEntry *
nsHttpConnectionMgr::GetOrCreateConnectionEntry(nsHttpConnectionInfo *ci)
@ -2557,11 +2557,11 @@ nsHttpConnectionMgr::nsConnectionHandle::PushBack(const char *buf, uint32_t bufL
//////////////////////// nsHalfOpenSocket
NS_IMPL_THREADSAFE_ISUPPORTS4(nsHttpConnectionMgr::nsHalfOpenSocket,
nsIOutputStreamCallback,
nsITransportEventSink,
nsIInterfaceRequestor,
nsITimerCallback)
NS_IMPL_ISUPPORTS4(nsHttpConnectionMgr::nsHalfOpenSocket,
nsIOutputStreamCallback,
nsITransportEventSink,
nsIInterfaceRequestor,
nsITimerCallback)
nsHttpConnectionMgr::
nsHalfOpenSocket::nsHalfOpenSocket(nsConnectionEntry *ent,

6
netwerk/protocol/http/nsHttpConnectionMgr.h
View File

@ -40,7 +40,7 @@ class EventTokenBucket;
class nsHttpConnectionMgr : public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOBSERVER
// parameter names
@ -390,7 +390,7 @@ private:
class nsConnectionHandle : public nsAHttpConnection
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSAHTTPCONNECTION(mConn)
nsConnectionHandle(nsHttpConnection *conn) { NS_ADDREF(mConn = conn); }
@ -408,7 +408,7 @@ private:
public nsITimerCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOUTPUTSTREAMCALLBACK
NS_DECL_NSITRANSPORTEVENTSINK
NS_DECL_NSIINTERFACEREQUESTOR

26
netwerk/protocol/http/nsHttpHandler.cpp
View File

@ -1502,13 +1502,13 @@ nsHttpHandler::SetAcceptEncodings(const char *aAcceptEncodings)
// nsHttpHandler::nsISupports
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS6(nsHttpHandler,
nsIHttpProtocolHandler,
nsIProxiedProtocolHandler,
nsIProtocolHandler,
nsIObserver,
nsISupportsWeakReference,
nsISpeculativeConnect)
NS_IMPL_ISUPPORTS6(nsHttpHandler,
nsIHttpProtocolHandler,
nsIProxiedProtocolHandler,
nsIProtocolHandler,
nsIObserver,
nsISupportsWeakReference,
nsISpeculativeConnect)
//-----------------------------------------------------------------------------
// nsHttpHandler::nsIProtocolHandler
@ -1939,12 +1939,12 @@ nsHttpHandler::TickleWifi(nsIInterfaceRequestor *cb)
// nsHttpsHandler implementation
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ISUPPORTS5(nsHttpsHandler,
nsIHttpProtocolHandler,
nsIProxiedProtocolHandler,
nsIProtocolHandler,
nsISupportsWeakReference,
nsISpeculativeConnect)
NS_IMPL_ISUPPORTS5(nsHttpsHandler,
nsIHttpProtocolHandler,
nsIProxiedProtocolHandler,
nsIProtocolHandler,
nsISupportsWeakReference,
nsISpeculativeConnect)
nsresult
nsHttpsHandler::Init()

4
netwerk/protocol/http/nsHttpHandler.h
View File

@ -55,7 +55,7 @@ class nsHttpHandler : public nsIHttpProtocolHandler
, public nsISpeculativeConnect
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIPROTOCOLHANDLER
NS_DECL_NSIPROXIEDPROTOCOLHANDLER
NS_DECL_NSIHTTPPROTOCOLHANDLER
@ -495,7 +495,7 @@ public:
// we basically just want to override GetScheme and GetDefaultPort...
// all other methods should be forwarded to the nsHttpHandler instance.
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIPROTOCOLHANDLER
NS_FORWARD_NSIPROXIEDPROTOCOLHANDLER (gHttpHandler->)
NS_FORWARD_NSIHTTPPROTOCOLHANDLER (gHttpHandler->)

4
netwerk/protocol/http/nsHttpPipeline.cpp
View File

@ -161,8 +161,8 @@ nsHttpPipeline::QueryPipeline()
// nsHttpPipeline::nsISupports
//-----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ADDREF(nsHttpPipeline)
NS_IMPL_THREADSAFE_RELEASE(nsHttpPipeline)
NS_IMPL_ADDREF(nsHttpPipeline)
NS_IMPL_RELEASE(nsHttpPipeline)
// multiple inheritance fun :-)
NS_INTERFACE_MAP_BEGIN(nsHttpPipeline)

2
netwerk/protocol/http/nsHttpPipeline.h
View File

@ -19,7 +19,7 @@ class nsHttpPipeline : public nsAHttpConnection
, public nsAHttpSegmentReader
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSAHTTPCONNECTION(mConnection)
NS_DECL_NSAHTTPTRANSACTION
NS_DECL_NSAHTTPSEGMENTREADER

Some files were not shown because too many files have changed in this diff Show More