Bug 884061 - Part 3s: Use NS_DECL_THREADSAFE_ISUPPORTS in security/, r=bsmith

--HG--
extra : rebase_source : 2b3329c361a71c49ef7c0793006c7dbb6f855e28
This commit is contained in:
Joshua Cranmer 2013-07-18 21:24:14 -05:00
parent b157373258
commit 870351ab3d
62 changed files with 122 additions and 127 deletions

View File

@ -23,9 +23,9 @@ nsEntropyCollector::~nsEntropyCollector()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS2(nsEntropyCollector,
nsIEntropyCollector,
nsIBufEntropyCollector)
NS_IMPL_ISUPPORTS2(nsEntropyCollector,
nsIEntropyCollector,
nsIBufEntropyCollector)
NS_IMETHODIMP
nsEntropyCollector::RandomUpdate(void *new_entropy, int32_t bufLen)

View File

@ -20,7 +20,7 @@ class nsEntropyCollector : public nsIBufEntropyCollector
nsEntropyCollector();
virtual ~nsEntropyCollector();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIENTROPYCOLLECTOR
NS_DECL_NSIBUFENTROPYCOLLECTOR

View File

@ -150,13 +150,13 @@ nsSecureBrowserUIImpl::~nsSecureBrowserUIImpl()
}
}
NS_IMPL_THREADSAFE_ISUPPORTS6(nsSecureBrowserUIImpl,
nsISecureBrowserUI,
nsIWebProgressListener,
nsIFormSubmitObserver,
nsIObserver,
nsISupportsWeakReference,
nsISSLStatusProvider)
NS_IMPL_ISUPPORTS6(nsSecureBrowserUIImpl,
nsISecureBrowserUI,
nsIWebProgressListener,
nsIFormSubmitObserver,
nsIObserver,
nsISupportsWeakReference,
nsISSLStatusProvider)
NS_IMETHODIMP
nsSecureBrowserUIImpl::Init(nsIDOMWindow *aWindow)

View File

@ -48,7 +48,7 @@ public:
nsSecureBrowserUIImpl();
virtual ~nsSecureBrowserUIImpl();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIWEBPROGRESSLISTENER
NS_DECL_NSISECUREBROWSERUI

View File

@ -19,7 +19,7 @@
#include "mozilla/Telemetry.h"
#include "nsISecurityUITelemetry.h"
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSecurityWarningDialogs, nsISecurityWarningDialogs)
NS_IMPL_ISUPPORTS1(nsSecurityWarningDialogs, nsISecurityWarningDialogs)
#define STRING_BUNDLE_URL "chrome://pipnss/locale/security.properties"

View File

@ -15,7 +15,7 @@
class nsSecurityWarningDialogs : public nsISecurityWarningDialogs
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISECURITYWARNINGDIALOGS
nsSecurityWarningDialogs();

View File

@ -83,9 +83,9 @@ nsStrictTransportSecurityService::~nsStrictTransportSecurityService()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS2(nsStrictTransportSecurityService,
nsIObserver,
nsIStrictTransportSecurityService)
NS_IMPL_ISUPPORTS2(nsStrictTransportSecurityService,
nsIObserver,
nsIStrictTransportSecurityService)
nsresult
nsStrictTransportSecurityService::Init()

View File

@ -125,7 +125,7 @@ class nsStrictTransportSecurityService : public nsIStrictTransportSecurityServic
, public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOBSERVER
NS_DECL_NSISTRICTTRANSPORTSECURITYSERVICE

View File

@ -8,8 +8,7 @@
#include "nsIMutableArray.h"
#include "nsArrayUtils.h"
NS_IMPL_THREADSAFE_ISUPPORTS2(nsNSSASN1Tree, nsIASN1Tree,
nsITreeView)
NS_IMPL_ISUPPORTS2(nsNSSASN1Tree, nsIASN1Tree, nsITreeView)
nsNSSASN1Tree::nsNSSASN1Tree()
:mTopNode(nullptr)

View File

@ -26,7 +26,7 @@
class nsNSSASN1Tree : public nsIASN1Tree
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIASN1TREE
NS_DECL_NSITREEVIEW

View File

@ -21,7 +21,7 @@ nsFormSigningDialog::~nsFormSigningDialog()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsFormSigningDialog, nsIFormSigningDialog)
NS_IMPL_ISUPPORTS1(nsFormSigningDialog, nsIFormSigningDialog)
NS_IMETHODIMP
nsFormSigningDialog::ConfirmSignText(nsIInterfaceRequestor *aContext,

View File

@ -18,7 +18,7 @@ public:
nsFormSigningDialog();
~nsFormSigningDialog();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIFORMSIGNINGDIALOG
};

View File

@ -47,14 +47,14 @@ nsNSSDialogs::~nsNSSDialogs()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS8(nsNSSDialogs, nsITokenPasswordDialogs,
nsICertificateDialogs,
nsIClientAuthDialogs,
nsICertPickDialogs,
nsITokenDialogs,
nsIDOMCryptoDialogs,
nsIGeneratingKeypairInfoDialogs,
nsISSLCertErrorDialog)
NS_IMPL_ISUPPORTS8(nsNSSDialogs, nsITokenPasswordDialogs,
nsICertificateDialogs,
nsIClientAuthDialogs,
nsICertPickDialogs,
nsITokenDialogs,
nsIDOMCryptoDialogs,
nsIGeneratingKeypairInfoDialogs,
nsISSLCertErrorDialog)
nsresult
nsNSSDialogs::Init()

View File

@ -34,7 +34,7 @@ class nsNSSDialogs
public nsISSLCertErrorDialog
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITOKENPASSWORDDIALOGS
NS_DECL_NSICERTIFICATEDIALOGS
NS_DECL_NSICLIENTAUTHDIALOGS

View File

@ -9,8 +9,7 @@
#include "nsIDialogParamBlock.h"
#include "nsIMutableArray.h"
NS_IMPL_THREADSAFE_ISUPPORTS2(nsPKIParamBlock, nsIPKIParamBlock,
nsIDialogParamBlock)
NS_IMPL_ISUPPORTS2(nsPKIParamBlock, nsIPKIParamBlock, nsIDialogParamBlock)
nsPKIParamBlock::nsPKIParamBlock()
{

View File

@ -27,7 +27,7 @@ public:
NS_DECL_NSIPKIPARAMBLOCK
NS_DECL_NSIDIALOGPARAMBLOCK
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
private:
nsCOMPtr<nsIDialogParamBlock> mDialogParamBlock;
nsCOMPtr<nsISupportsArray> mSupports;

View File

@ -68,13 +68,13 @@ TransportSecurityInfo::virtualDestroyNSSReference()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS6(TransportSecurityInfo,
nsITransportSecurityInfo,
nsIInterfaceRequestor,
nsISSLStatusProvider,
nsIAssociatedContentSecurity,
nsISerializable,
nsIClassInfo)
NS_IMPL_ISUPPORTS6(TransportSecurityInfo,
nsITransportSecurityInfo,
nsIInterfaceRequestor,
nsISSLStatusProvider,
nsIAssociatedContentSecurity,
nsISerializable,
nsIClassInfo)
nsresult
TransportSecurityInfo::SetHostName(const char* host)

View File

@ -38,7 +38,7 @@ public:
TransportSecurityInfo();
virtual ~TransportSecurityInfo();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITRANSPORTSECURITYINFO
NS_DECL_NSIINTERFACEREQUESTOR
NS_DECL_NSISSLSTATUSPROVIDER

View File

@ -29,8 +29,7 @@ using namespace mozilla;
static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
NS_IMPL_THREADSAFE_ISUPPORTS2(nsCMSMessage, nsICMSMessage,
nsICMSMessage2)
NS_IMPL_ISUPPORTS2(nsCMSMessage, nsICMSMessage, nsICMSMessage2)
nsCMSMessage::nsCMSMessage()
{
@ -726,7 +725,7 @@ loser:
return rv;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsCMSDecoder, nsICMSDecoder)
NS_IMPL_ISUPPORTS1(nsCMSDecoder, nsICMSDecoder)
nsCMSDecoder::nsCMSDecoder()
: m_dcx(nullptr)
@ -812,7 +811,7 @@ NS_IMETHODIMP nsCMSDecoder::Finish(nsICMSMessage ** aCMSMsg)
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsCMSEncoder, nsICMSEncoder)
NS_IMPL_ISUPPORTS1(nsCMSEncoder, nsICMSEncoder)
nsCMSEncoder::nsCMSEncoder()
: m_ecx(nullptr)

View File

@ -28,7 +28,7 @@ class nsCMSMessage : public nsICMSMessage,
public nsNSSShutDownObject
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICMSMESSAGE
NS_DECL_NSICMSMESSAGE2
@ -64,7 +64,7 @@ class nsCMSDecoder : public nsICMSDecoder,
public nsNSSShutDownObject
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICMSDECODER
nsCMSDecoder();
@ -87,7 +87,7 @@ class nsCMSEncoder : public nsICMSEncoder,
public nsNSSShutDownObject
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICMSENCODER
nsCMSEncoder();

View File

@ -81,10 +81,10 @@ nsCertOverride::convertStringToBits(const nsACString &str, OverrideBits &ob)
}
}
NS_IMPL_THREADSAFE_ISUPPORTS3(nsCertOverrideService,
nsICertOverrideService,
nsIObserver,
nsISupportsWeakReference)
NS_IMPL_ISUPPORTS3(nsCertOverrideService,
nsICertOverrideService,
nsIObserver,
nsISupportsWeakReference)
nsCertOverrideService::nsCertOverrideService()
: monitor("nsCertOverrideService.monitor")

View File

@ -131,7 +131,7 @@ class nsCertOverrideService MOZ_FINAL : public nsICertOverrideService
, public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICERTOVERRIDESERVICE
NS_DECL_NSIOBSERVER

View File

@ -10,7 +10,7 @@ using namespace mozilla;
nsCertVerificationThread *nsCertVerificationThread::verification_thread_singleton;
NS_IMPL_THREADSAFE_ISUPPORTS1(nsCertVerificationResult, nsICertVerificationResult)
NS_IMPL_ISUPPORTS1(nsCertVerificationResult, nsICertVerificationResult)
namespace {
class DispatchCertVerificationResult : public nsRunnable

View File

@ -27,9 +27,9 @@
using namespace mozilla;
using namespace mozilla::psm;
NS_IMPL_THREADSAFE_ISUPPORTS2(nsClientAuthRememberService,
nsIObserver,
nsISupportsWeakReference)
NS_IMPL_ISUPPORTS2(nsClientAuthRememberService,
nsIObserver,
nsISupportsWeakReference)
nsClientAuthRememberService::nsClientAuthRememberService()
: monitor("nsClientAuthRememberService.monitor")

View File

@ -110,7 +110,7 @@ class nsClientAuthRememberService MOZ_FINAL : public nsIObserver,
public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOBSERVER
nsClientAuthRememberService();

View File

@ -124,7 +124,7 @@ nsKeyObject::GetType(int16_t *_retval)
//////////////////////////////////////////////////////////////////////////////
// nsIKeyObjectFactory
NS_IMPL_THREADSAFE_ISUPPORTS1(nsKeyObjectFactory, nsIKeyObjectFactory)
NS_IMPL_ISUPPORTS1(nsKeyObjectFactory, nsIKeyObjectFactory)
nsKeyObjectFactory::nsKeyObjectFactory()
{

View File

@ -52,7 +52,7 @@ class nsKeyObjectFactory MOZ_FINAL : public nsIKeyObjectFactory
public:
nsKeyObjectFactory();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIKEYOBJECTFACTORY
private:

View File

@ -258,7 +258,7 @@ decode_ec_params(const char *curve)
return ecparams;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsKeygenFormProcessor, nsIFormProcessor)
NS_IMPL_ISUPPORTS1(nsKeygenFormProcessor, nsIFormProcessor)
nsKeygenFormProcessor::nsKeygenFormProcessor()
{

View File

@ -33,7 +33,7 @@ public:
NS_IMETHOD ProvideContent(const nsAString& aFormType,
nsTArray<nsString>& aContent,
nsAString& aAttribute);
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
static nsresult Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);

View File

@ -16,7 +16,7 @@
using namespace mozilla;
using namespace mozilla::psm;
NS_IMPL_THREADSAFE_ISUPPORTS1(nsKeygenThread, nsIKeygenThread)
NS_IMPL_ISUPPORTS1(nsKeygenThread, nsIKeygenThread)
nsKeygenThread::nsKeygenThread()

View File

@ -46,7 +46,7 @@ public:
virtual ~nsKeygenThread();
NS_DECL_NSIKEYGENTHREAD
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
void SetParams(
PK11SlotInfo *a_slot,

View File

@ -9,10 +9,8 @@
#include "nsArrayUtils.h"
#include "nsXPCOMCID.h"
NS_IMPL_THREADSAFE_ISUPPORTS2(nsNSSASN1Sequence, nsIASN1Sequence,
nsIASN1Object)
NS_IMPL_THREADSAFE_ISUPPORTS2(nsNSSASN1PrintableItem, nsIASN1PrintableItem,
nsIASN1Object)
NS_IMPL_ISUPPORTS2(nsNSSASN1Sequence, nsIASN1Sequence, nsIASN1Object)
NS_IMPL_ISUPPORTS2(nsNSSASN1PrintableItem, nsIASN1PrintableItem, nsIASN1Object)
// This function is used to interpret an integer that
// was encoded in a DER buffer. This function is used

View File

@ -20,7 +20,7 @@
class nsNSSASN1Sequence : public nsIASN1Sequence
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIASN1SEQUENCE
NS_DECL_NSIASN1OBJECT
@ -40,7 +40,7 @@ private:
class nsNSSASN1PrintableItem : public nsIASN1PrintableItem
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIASN1PRINTABLEITEM
NS_DECL_NSIASN1OBJECT

View File

@ -298,13 +298,13 @@ SECStatus nsNSSHttpRequestSession::trySendAndReceiveFcn(PRPollDesc **pPollDesc,
void
nsNSSHttpRequestSession::AddRef()
{
NS_AtomicIncrementRefcnt(mRefCount);
++mRefCount;
}
void
nsNSSHttpRequestSession::Release()
{
int32_t newRefCount = NS_AtomicDecrementRefcnt(mRefCount);
int32_t newRefCount = --mRefCount;
if (!newRefCount) {
delete this;
}
@ -569,7 +569,7 @@ nsHTTPListener::~nsHTTPListener()
}
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsHTTPListener, nsIStreamLoaderObserver)
NS_IMPL_ISUPPORTS1(nsHTTPListener, nsIStreamLoaderObserver)
void
nsHTTPListener::FreeLoadGroup(bool aCancelLoad)

View File

@ -37,7 +37,7 @@ private:
public:
nsHTTPListener();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISTREAMLOADEROBSERVER
nsCOMPtr<nsIStreamLoader> mLoader;
@ -81,7 +81,7 @@ public:
class nsNSSHttpRequestSession
{
protected:
int32_t mRefCount;
mozilla::ThreadSafeAutoRefCnt mRefCount;
public:
static SECStatus createFcn(SEC_HTTP_SERVER_SESSION session,

View File

@ -11,7 +11,7 @@
using namespace mozilla;
NS_IMPL_THREADSAFE_ISUPPORTS1(nsNSSCertCache, nsINSSCertCache)
NS_IMPL_ISUPPORTS1(nsNSSCertCache, nsINSSCertCache)
nsNSSCertCache::nsNSSCertCache()
:mutex("nsNSSCertCache.mutex"), mCertList(nullptr)

View File

@ -16,7 +16,7 @@ class nsNSSCertCache : public nsINSSCertCache,
public nsNSSShutDownObject
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSINSSCERTCACHE
nsNSSCertCache();

View File

@ -12,7 +12,7 @@
#include "cert.h"
/* Implementation file */
NS_IMPL_THREADSAFE_ISUPPORTS1(nsX509CertValidity, nsIX509CertValidity)
NS_IMPL_ISUPPORTS1(nsX509CertValidity, nsIX509CertValidity)
nsX509CertValidity::nsX509CertValidity() : mTimesInitialized(false)
{

View File

@ -12,7 +12,7 @@
class nsX509CertValidity : public nsIX509CertValidity
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIX509CERTVALIDITY
nsX509CertValidity();

View File

@ -68,13 +68,14 @@ NSSCleanupAutoPtrClass_WithParam(PLArenaPool, PORT_FreeArena, FalseParam, false)
/* nsNSSCertificate */
NS_IMPL_THREADSAFE_ISUPPORTS7(nsNSSCertificate, nsIX509Cert,
nsIX509Cert2,
nsIX509Cert3,
nsIIdentityInfo,
nsISMimeCert,
nsISerializable,
nsIClassInfo)
NS_IMPL_ISUPPORTS7(nsNSSCertificate,
nsIX509Cert,
nsIX509Cert2,
nsIX509Cert3,
nsIIdentityInfo,
nsISMimeCert,
nsISerializable,
nsIClassInfo)
/* static */
nsNSSCertificate*
@ -1476,7 +1477,7 @@ char* nsNSSCertificate::defaultServerNickname(CERTCertificate* cert)
return nickname;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsNSSCertList, nsIX509CertList)
NS_IMPL_ISUPPORTS1(nsNSSCertList, nsIX509CertList)
nsNSSCertList::nsNSSCertList(CERTCertList *certList, bool adopt)
{
@ -1582,8 +1583,7 @@ nsNSSCertList::GetEnumerator(nsISimpleEnumerator **_retval)
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsNSSCertListEnumerator,
nsISimpleEnumerator)
NS_IMPL_ISUPPORTS1(nsNSSCertListEnumerator, nsISimpleEnumerator)
nsNSSCertListEnumerator::nsNSSCertListEnumerator(CERTCertList *certList)
{

View File

@ -35,7 +35,7 @@ class nsNSSCertificate : public nsIX509Cert3,
public nsNSSShutDownObject
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIX509CERT
NS_DECL_NSIX509CERT2
NS_DECL_NSIX509CERT3
@ -80,7 +80,7 @@ private:
class nsNSSCertList: public nsIX509CertList
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIX509CERTLIST
nsNSSCertList(CERTCertList *certList = nullptr, bool adopt = false);
@ -98,7 +98,7 @@ private:
class nsNSSCertListEnumerator: public nsISimpleEnumerator
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISIMPLEENUMERATOR
nsNSSCertListEnumerator(CERTCertList *certList);

View File

@ -58,7 +58,7 @@ extern PRLogModuleInfo* gPIPNSSLog;
static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
NS_IMPL_THREADSAFE_ISUPPORTS2(nsNSSCertificateDB, nsIX509CertDB, nsIX509CertDB2)
NS_IMPL_ISUPPORTS2(nsNSSCertificateDB, nsIX509CertDB, nsIX509CertDB2)
nsNSSCertificateDB::nsNSSCertificateDB()
: mBadCertsLock("nsNSSCertificateDB::mBadCertsLock")

View File

@ -18,7 +18,7 @@ class nsRecentBadCerts;
class nsNSSCertificateDB : public nsIX509CertDB, public nsIX509CertDB2
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIX509CERTDB
NS_DECL_NSIX509CERTDB2

View File

@ -20,9 +20,10 @@ extern PRLogModuleInfo* gPIPNSSLog;
/* nsNSSCertificateFakeTransport */
NS_IMPL_THREADSAFE_ISUPPORTS3(nsNSSCertificateFakeTransport, nsIX509Cert,
nsISerializable,
nsIClassInfo)
NS_IMPL_ISUPPORTS3(nsNSSCertificateFakeTransport,
nsIX509Cert,
nsISerializable,
nsIClassInfo)
nsNSSCertificateFakeTransport::nsNSSCertificateFakeTransport() :
mCertSerialization(nullptr)

View File

@ -17,7 +17,7 @@ class nsNSSCertificateFakeTransport : public nsIX509Cert,
public nsIClassInfo
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIX509CERT
NS_DECL_NSISERIALIZABLE
NS_DECL_NSICLASSINFO

View File

@ -95,14 +95,14 @@ public:
virtual ~nsTokenEventRunnable();
NS_IMETHOD Run ();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
private:
nsString mType;
nsString mTokenName;
};
// ISuuports implementation for nsTokenEventRunnable
NS_IMPL_THREADSAFE_ISUPPORTS1(nsTokenEventRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS1(nsTokenEventRunnable, nsIRunnable)
nsTokenEventRunnable::nsTokenEventRunnable(const nsAString &aType,
const nsAString &aTokenName): mType(aType), mTokenName(aTokenName) { }
@ -1411,12 +1411,12 @@ nsNSSComponent::Init()
}
/* nsISupports Implementation for the class */
NS_IMPL_THREADSAFE_ISUPPORTS5(nsNSSComponent,
nsISignatureVerifier,
nsIEntropyCollector,
nsINSSComponent,
nsIObserver,
nsISupportsWeakReference)
NS_IMPL_ISUPPORTS5(nsNSSComponent,
nsISignatureVerifier,
nsIEntropyCollector,
nsINSSComponent,
nsIObserver,
nsISupportsWeakReference)
/* Callback functions for decoder. For now, use empty/default functions. */
@ -1886,7 +1886,7 @@ nsNSSComponent::GetDefaultCertVerifier(RefPtr<CertVerifier> &out)
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(PipUIContext, nsIInterfaceRequestor)
NS_IMPL_ISUPPORTS1(PipUIContext, nsIInterfaceRequestor)
PipUIContext::PipUIContext()
{

View File

@ -133,7 +133,7 @@ public:
nsNSSComponent();
virtual ~nsNSSComponent();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISIGNATUREVERIFIER
NS_DECL_NSIENTROPYCOLLECTOR
NS_DECL_NSIOBSERVER

View File

@ -18,7 +18,7 @@
class PipUIContext : public nsIInterfaceRequestor
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIINTERFACEREQUESTOR
PipUIContext();

View File

@ -1321,7 +1321,7 @@ static int64_t PSMAvailable64(void)
namespace {
class PrefObserver : public nsIObserver {
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOBSERVER
PrefObserver(nsSSLIOLayerHelpers* aOwner) : mOwner(aOwner) {}
virtual ~PrefObserver() {}
@ -1330,7 +1330,7 @@ private:
};
} // namespace anonymous
NS_IMPL_THREADSAFE_ISUPPORTS1(PrefObserver, nsIObserver)
NS_IMPL_ISUPPORTS1(PrefObserver, nsIObserver)
NS_IMETHODIMP
PrefObserver::Observe(nsISupports *aSubject, const char *aTopic,

View File

@ -15,7 +15,7 @@
using namespace mozilla;
using namespace mozilla::psm;
NS_IMPL_THREADSAFE_ISUPPORTS1(nsProtectedAuthThread, nsIProtectedAuthThread)
NS_IMPL_ISUPPORTS1(nsProtectedAuthThread, nsIProtectedAuthThread)
static void nsProtectedAuthThreadRunner(void *arg)
{

View File

@ -37,7 +37,7 @@ public:
nsProtectedAuthThread();
virtual ~nsProtectedAuthThread();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIPROTECTEDAUTHTHREAD
// Sets parameters for the thread

View File

@ -11,7 +11,7 @@
////////////////////////////////////////////////////////////////////////////////
//// nsRandomGenerator
NS_IMPL_THREADSAFE_ISUPPORTS1(nsRandomGenerator, nsIRandomGenerator)
NS_IMPL_ISUPPORTS1(nsRandomGenerator, nsIRandomGenerator)
////////////////////////////////////////////////////////////////////////////////
//// nsIRandomGenerator

View File

@ -17,7 +17,7 @@
class nsRandomGenerator MOZ_FINAL : public nsIRandomGenerator
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRANDOMGENERATOR
};

View File

@ -22,8 +22,7 @@
using namespace mozilla;
NS_IMPL_THREADSAFE_ISUPPORTS1(nsRecentBadCerts,
nsIRecentBadCerts)
NS_IMPL_ISUPPORTS1(nsRecentBadCerts, nsIRecentBadCerts)
nsRecentBadCerts::nsRecentBadCerts()
:monitor("nsRecentBadCerts.monitor")

View File

@ -57,7 +57,7 @@ private:
class nsRecentBadCerts MOZ_FINAL : public nsIRecentBadCerts
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRECENTBADCERTS
nsRecentBadCerts();

View File

@ -16,7 +16,7 @@ nsSSLSocketProvider::~nsSSLSocketProvider()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSSLSocketProvider, nsISocketProvider)
NS_IMPL_ISUPPORTS1(nsSSLSocketProvider, nsISocketProvider)
NS_IMETHODIMP
nsSSLSocketProvider::NewSocket(int32_t family,

View File

@ -17,7 +17,7 @@
class nsSSLSocketProvider : public nsISocketProvider
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISOCKETPROVIDER
// nsSSLSocketProvider methods:

View File

@ -223,7 +223,7 @@ nsSSLStatus::nsSSLStatus()
mCipherName = "";
}
NS_IMPL_THREADSAFE_ISUPPORTS3(nsSSLStatus, nsISSLStatus, nsISerializable, nsIClassInfo)
NS_IMPL_ISUPPORTS3(nsSSLStatus, nsISSLStatus, nsISerializable, nsIClassInfo)
nsSSLStatus::~nsSSLStatus()
{

View File

@ -20,7 +20,7 @@ class nsSSLStatus
, public nsIClassInfo
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISSLSTATUS
NS_DECL_NSISERIALIZABLE
NS_DECL_NSICLASSINFO

View File

@ -16,7 +16,7 @@ nsTLSSocketProvider::~nsTLSSocketProvider()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsTLSSocketProvider, nsISocketProvider)
NS_IMPL_ISUPPORTS1(nsTLSSocketProvider, nsISocketProvider)
NS_IMETHODIMP
nsTLSSocketProvider::NewSocket(int32_t family,

View File

@ -21,7 +21,7 @@
class nsTLSSocketProvider : public nsISocketProvider
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISOCKETPROVIDER
// nsTLSSocketProvider methods:

View File

@ -37,7 +37,7 @@ public:
nsCertVerificationResult();
virtual ~nsCertVerificationResult();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICERTVERIFICATIONRESULT
private: