Bug 884061 - Part 3v: Use NS_DECL_THREADSAFE_ISUPPORTS in toolkit/, r=Mossop

--HG--
extra : rebase_source : ad2b2f20219b42b192c313b6fa9da3383f904805
This commit is contained in:
Joshua Cranmer 2013-07-18 21:24:15 -05:00
parent d94a47f569
commit 48e91a819c
31 changed files with 63 additions and 63 deletions

View File

@ -24,7 +24,7 @@ using namespace mozilla;
using mozilla::dom::ContentChild;
NS_IMPL_THREADSAFE_ISUPPORTS2(nsAlertsService, nsIAlertsService, nsIAlertsProgressListener)
NS_IMPL_ISUPPORTS2(nsAlertsService, nsIAlertsService, nsIAlertsProgressListener)
nsAlertsService::nsAlertsService()
{

View File

@ -33,7 +33,7 @@ class nsAlertsService : public nsIAlertsService,
public:
NS_DECL_NSIALERTSPROGRESSLISTENER
NS_DECL_NSIALERTSSERVICE
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
nsAlertsService();
virtual ~nsAlertsService();

View File

@ -52,7 +52,7 @@ GenerateGUIDFunction::create(mozIStorageConnection *aDBConn)
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(
NS_IMPL_ISUPPORTS1(
GenerateGUIDFunction,
mozIStorageFunction
)

View File

@ -25,7 +25,7 @@ namespace downloads {
class GenerateGUIDFunction MOZ_FINAL : public mozIStorageFunction
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_MOZISTORAGEFUNCTION
/**

View File

@ -215,7 +215,7 @@ class BlockingConnectionCloseCallback MOZ_FINAL : public mozIStorageCompletionCa
bool mDone;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_MOZISTORAGECOMPLETIONCALLBACK
BlockingConnectionCloseCallback();
void Spin();
@ -249,7 +249,7 @@ void BlockingConnectionCloseCallback::Spin() {
}
}
NS_IMPL_THREADSAFE_ISUPPORTS1(
NS_IMPL_ISUPPORTS1(
BlockingConnectionCloseCallback
, mozIStorageCompletionCallback
)
@ -332,7 +332,7 @@ CreateRoot(nsCOMPtr<mozIStorageConnection>& aDBConn,
PLACES_FACTORY_SINGLETON_IMPLEMENTATION(Database, gDatabase)
NS_IMPL_THREADSAFE_ISUPPORTS2(Database
NS_IMPL_ISUPPORTS2(Database
, nsIObserver
, nsISupportsWeakReference
)

View File

@ -66,7 +66,7 @@ class Database MOZ_FINAL : public nsIObserver
typedef mozilla::storage::StatementCache<mozIStorageAsyncStatement> AsyncStatementCache;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOBSERVER
Database();

View File

@ -378,7 +378,7 @@ PlacesEvent::Notify()
}
}
NS_IMPL_THREADSAFE_ISUPPORTS1(
NS_IMPL_ISUPPORTS1(
PlacesEvent
, nsIRunnable
)

View File

@ -217,7 +217,7 @@ bool GetHiddenState(bool aIsRedirect,
class PlacesEvent : public nsRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
PlacesEvent(const char* aTopic);

View File

@ -2930,7 +2930,7 @@ History::Observe(nsISupports* aSubject, const char* aTopic,
////////////////////////////////////////////////////////////////////////////////
//// nsISupports
NS_IMPL_THREADSAFE_ISUPPORTS4(
NS_IMPL_ISUPPORTS4(
History
, IHistory
, nsIDownloadHistory

View File

@ -40,7 +40,7 @@ class History : public IHistory
, public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_IHISTORY
NS_DECL_NSIDOWNLOADHISTORY
NS_DECL_MOZIASYNCHISTORY

View File

@ -318,7 +318,7 @@ namespace places {
};
}
NS_IMPL_THREADSAFE_ISUPPORTS1(
NS_IMPL_ISUPPORTS1(
MatchAutoCompleteFunction,
mozIStorageFunction
)
@ -434,7 +434,7 @@ namespace places {
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(
NS_IMPL_ISUPPORTS1(
CalculateFrecencyFunction,
mozIStorageFunction
)
@ -636,7 +636,7 @@ namespace places {
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(
NS_IMPL_ISUPPORTS1(
GenerateGUIDFunction,
mozIStorageFunction
)
@ -675,7 +675,7 @@ namespace places {
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(
NS_IMPL_ISUPPORTS1(
GetUnreversedHostFunction,
mozIStorageFunction
)
@ -729,7 +729,7 @@ namespace places {
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(
NS_IMPL_ISUPPORTS1(
FixupURLFunction,
mozIStorageFunction
)

View File

@ -59,7 +59,7 @@ namespace places {
class MatchAutoCompleteFunction MOZ_FINAL : public mozIStorageFunction
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_MOZISTORAGEFUNCTION
/**
@ -196,7 +196,7 @@ private:
class CalculateFrecencyFunction MOZ_FINAL : public mozIStorageFunction
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_MOZISTORAGEFUNCTION
/**
@ -217,7 +217,7 @@ public:
class GenerateGUIDFunction MOZ_FINAL : public mozIStorageFunction
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_MOZISTORAGEFUNCTION
/**
@ -240,7 +240,7 @@ public:
class GetUnreversedHostFunction MOZ_FINAL : public mozIStorageFunction
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_MOZISTORAGEFUNCTION
/**
@ -268,7 +268,7 @@ public:
class FixupURLFunction MOZ_FINAL : public mozIStorageFunction
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_MOZISTORAGEFUNCTION
/**

View File

@ -159,8 +159,8 @@ static const char* kObservedPrefs[] = {
, nullptr
};
NS_IMPL_THREADSAFE_ADDREF(nsNavHistory)
NS_IMPL_THREADSAFE_RELEASE(nsNavHistory)
NS_IMPL_ADDREF(nsNavHistory)
NS_IMPL_RELEASE(nsNavHistory)
NS_IMPL_CLASSINFO(nsNavHistory, NULL, nsIClassInfo::SINGLETON,
NS_NAVHISTORYSERVICE_CID)

View File

@ -76,7 +76,7 @@ class nsNavHistory MOZ_FINAL : public nsSupportsWeakReference
public:
nsNavHistory();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSINAVHISTORYSERVICE
NS_DECL_NSIBROWSERHISTORY
NS_DECL_NSIOBSERVER

View File

@ -216,7 +216,7 @@ nsAppStartup::Init()
// nsAppStartup->nsISupports
//
NS_IMPL_THREADSAFE_ISUPPORTS5(nsAppStartup,
NS_IMPL_ISUPPORTS5(nsAppStartup,
nsIAppStartup,
nsIWindowCreator,
nsIWindowCreator2,

View File

@ -35,7 +35,7 @@ class nsAppStartup MOZ_FINAL : public nsIAppStartup,
public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIAPPSTARTUP
NS_DECL_NSIWINDOWCREATOR
NS_DECL_NSIWINDOWCREATOR2

View File

@ -234,7 +234,7 @@ HangReports::GetDuration(unsigned aIndex) const {
class TelemetryImpl MOZ_FINAL : public nsITelemetry
{
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITELEMETRY
public:
@ -2061,7 +2061,7 @@ TelemetryImpl::RecordChromeHang(uint32_t duration,
}
#endif
NS_IMPL_THREADSAFE_ISUPPORTS1(TelemetryImpl, nsITelemetry)
NS_IMPL_ISUPPORTS1(TelemetryImpl, nsITelemetry)
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsITelemetry, TelemetryImpl::CreateTelemetryInstance)
#define NS_TELEMETRY_CID \

View File

@ -111,7 +111,7 @@ class nsUrlClassifierDBServiceWorker MOZ_FINAL :
public:
nsUrlClassifierDBServiceWorker();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURLCLASSIFIERDBSERVICE
NS_DECL_NSIURLCLASSIFIERDBSERVICEWORKER
@ -196,7 +196,7 @@ private:
nsTArray<PendingLookup> mPendingLookups;
};
NS_IMPL_THREADSAFE_ISUPPORTS2(nsUrlClassifierDBServiceWorker,
NS_IMPL_ISUPPORTS2(nsUrlClassifierDBServiceWorker,
nsIUrlClassifierDBServiceWorker,
nsIUrlClassifierDBService)
@ -788,7 +788,7 @@ class nsUrlClassifierLookupCallback MOZ_FINAL : public nsIUrlClassifierLookupCal
, public nsIUrlClassifierHashCompleterCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURLCLASSIFIERLOOKUPCALLBACK
NS_DECL_NSIURLCLASSIFIERHASHCOMPLETERCALLBACK
@ -815,7 +815,7 @@ private:
nsCOMPtr<nsIUrlClassifierCallback> mCallback;
};
NS_IMPL_THREADSAFE_ISUPPORTS2(nsUrlClassifierLookupCallback,
NS_IMPL_ISUPPORTS2(nsUrlClassifierLookupCallback,
nsIUrlClassifierLookupCallback,
nsIUrlClassifierHashCompleterCallback)
@ -1005,7 +1005,7 @@ nsUrlClassifierLookupCallback::HandleResults()
class nsUrlClassifierClassifyCallback MOZ_FINAL : public nsIUrlClassifierCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURLCLASSIFIERCALLBACK
nsUrlClassifierClassifyCallback(nsIURIClassifierCallback *c,
@ -1022,7 +1022,7 @@ private:
bool mCheckPhishing;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsUrlClassifierClassifyCallback,
NS_IMPL_ISUPPORTS1(nsUrlClassifierClassifyCallback,
nsIUrlClassifierCallback)
NS_IMETHODIMP
@ -1059,7 +1059,7 @@ nsUrlClassifierClassifyCallback::HandleEvent(const nsACString& tables)
// -------------------------------------------------------------------------
// Proxy class implementation
NS_IMPL_THREADSAFE_ISUPPORTS3(nsUrlClassifierDBService,
NS_IMPL_ISUPPORTS3(nsUrlClassifierDBService,
nsIUrlClassifierDBService,
nsIURIClassifier,
nsIObserver)

View File

@ -51,7 +51,7 @@ public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_URLCLASSIFIERDBSERVICE_CID)
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURLCLASSIFIERDBSERVICE
NS_DECL_NSIURICLASSIFIER
NS_DECL_NSIOBSERVER

View File

@ -40,7 +40,7 @@ public:
nsPrefixSetReporter(nsUrlClassifierPrefixSet* aParent, const nsACString& aName);
virtual ~nsPrefixSetReporter() {}
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIMEMORYREPORTER
private:
@ -48,7 +48,7 @@ private:
nsUrlClassifierPrefixSet* mParent;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsPrefixSetReporter, nsIMemoryReporter)
NS_IMPL_ISUPPORTS1(nsPrefixSetReporter, nsIMemoryReporter)
NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(StoragePrefixSetMallocSizeOf)

View File

@ -18,7 +18,7 @@ DispatchToWorkerThread(nsIRunnable* r)
return t->Dispatch(r, NS_DISPATCH_NORMAL);
}
NS_IMPL_THREADSAFE_ISUPPORTS1(UrlClassifierDBServiceWorkerProxy,
NS_IMPL_ISUPPORTS1(UrlClassifierDBServiceWorkerProxy,
nsIUrlClassifierDBServiceWorker)
NS_IMETHODIMP
@ -181,7 +181,7 @@ UrlClassifierDBServiceWorkerProxy::CacheMissesRunnable::Run()
}
NS_IMPL_THREADSAFE_ISUPPORTS1(UrlClassifierLookupCallbackProxy,
NS_IMPL_ISUPPORTS1(UrlClassifierLookupCallbackProxy,
nsIUrlClassifierLookupCallback)
NS_IMETHODIMP
@ -199,7 +199,7 @@ UrlClassifierLookupCallbackProxy::LookupCompleteRunnable::Run()
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(UrlClassifierCallbackProxy,
NS_IMPL_ISUPPORTS1(UrlClassifierCallbackProxy,
nsIUrlClassifierCallback)
NS_IMETHODIMP
@ -216,7 +216,7 @@ UrlClassifierCallbackProxy::HandleEventRunnable::Run()
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(UrlClassifierUpdateObserverProxy,
NS_IMPL_ISUPPORTS1(UrlClassifierUpdateObserverProxy,
nsIUrlClassifierUpdateObserver)
NS_IMETHODIMP

View File

@ -25,7 +25,7 @@ public:
: mTarget(aTarget)
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURLCLASSIFIERDBSERVICE
NS_DECL_NSIURLCLASSIFIERDBSERVICEWORKER
@ -165,7 +165,7 @@ public:
: mTarget(new nsMainThreadPtrHolder<nsIUrlClassifierLookupCallback>(aTarget))
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURLCLASSIFIERLOOKUPCALLBACK
class LookupCompleteRunnable : public nsRunnable
@ -195,7 +195,7 @@ public:
: mTarget(new nsMainThreadPtrHolder<nsIUrlClassifierCallback>(aTarget))
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURLCLASSIFIERCALLBACK
class HandleEventRunnable : public nsRunnable
@ -226,7 +226,7 @@ public:
: mTarget(new nsMainThreadPtrHolder<nsIUrlClassifierUpdateObserver>(aTarget))
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURLCLASSIFIERUPDATEOBSERVER
class UpdateUrlRequestedRunnable : public nsRunnable

View File

@ -42,7 +42,7 @@ nsUrlClassifierStreamUpdater::nsUrlClassifierStreamUpdater()
}
NS_IMPL_THREADSAFE_ISUPPORTS7(nsUrlClassifierStreamUpdater,
NS_IMPL_ISUPPORTS7(nsUrlClassifierStreamUpdater,
nsIUrlClassifierStreamUpdater,
nsIUrlClassifierUpdateObserver,
nsIRequestObserver,

View File

@ -30,7 +30,7 @@ class nsUrlClassifierStreamUpdater MOZ_FINAL : public nsIUrlClassifierStreamUpda
public:
nsUrlClassifierStreamUpdater();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURLCLASSIFIERSTREAMUPDATER
NS_DECL_NSIURLCLASSIFIERUPDATEOBSERVER
NS_DECL_NSIINTERFACEREQUESTOR

View File

@ -93,7 +93,7 @@ Base64UrlDecodeImpl(const nsACString & base64Input, nsACString & result)
class KeyPair : public nsIIdentityKeyPair, public nsNSSShutDownObject
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIIDENTITYKEYPAIR
KeyPair(SECKEYPrivateKey* aPrivateKey, SECKEYPublicKey* aPublicKey);
@ -129,7 +129,7 @@ private:
void operator=(const KeyPair &) MOZ_DELETE;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(KeyPair, nsIIdentityKeyPair)
NS_IMPL_ISUPPORTS1(KeyPair, nsIIdentityKeyPair)
class KeyGenRunnable : public nsRunnable, public nsNSSShutDownObject
{
@ -212,7 +212,7 @@ private:
class IdentityCryptoService MOZ_FINAL : public nsIIdentityCryptoService
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIIDENTITYCRYPTOSERVICE
IdentityCryptoService() { }
@ -231,7 +231,7 @@ private:
void operator=(const IdentityCryptoService &) MOZ_DELETE;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(IdentityCryptoService, nsIIdentityCryptoService)
NS_IMPL_ISUPPORTS1(IdentityCryptoService, nsIIdentityCryptoService)
NS_IMETHODIMP
IdentityCryptoService::GenerateKeyPair(

View File

@ -20,7 +20,7 @@
class nsAndroidSystemProxySettings : public nsISystemProxySettings
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISYSTEMPROXYSETTINGS
nsAndroidSystemProxySettings() {};
@ -30,7 +30,7 @@ private:
~nsAndroidSystemProxySettings() {};
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsAndroidSystemProxySettings, nsISystemProxySettings)
NS_IMPL_ISUPPORTS1(nsAndroidSystemProxySettings, nsISystemProxySettings)
NS_IMETHODIMP
nsAndroidSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)

View File

@ -19,7 +19,7 @@
class nsOSXSystemProxySettings MOZ_FINAL : public nsISystemProxySettings {
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISYSTEMPROXYSETTINGS
nsOSXSystemProxySettings();
@ -58,7 +58,7 @@ private:
static const SchemeMapping gSchemeMappingList[];
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsOSXSystemProxySettings, nsISystemProxySettings)
NS_IMPL_ISUPPORTS1(nsOSXSystemProxySettings, nsISystemProxySettings)
NS_IMETHODIMP
nsOSXSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)

View File

@ -18,7 +18,7 @@ extern "C" {
class nsUnixSystemProxySettings : public nsISystemProxySettings {
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISYSTEMPROXYSETTINGS
nsUnixSystemProxySettings() { mProxyFactory = nullptr; }
@ -33,7 +33,7 @@ private:
pxProxyFactory *mProxyFactory;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
NS_IMETHODIMP
nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)

View File

@ -20,7 +20,7 @@
class nsWindowsSystemProxySettings MOZ_FINAL : public nsISystemProxySettings
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSISYSTEMPROXYSETTINGS
nsWindowsSystemProxySettings() {};
@ -33,7 +33,7 @@ private:
bool PatternMatch(const nsACString& aHost, const nsACString& aOverride);
};
NS_IMPL_THREADSAFE_ISUPPORTS1(nsWindowsSystemProxySettings, nsISystemProxySettings)
NS_IMPL_ISUPPORTS1(nsWindowsSystemProxySettings, nsISystemProxySettings)
NS_IMETHODIMP
nsWindowsSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)

View File

@ -1019,7 +1019,7 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
NS_IMPL_THREADSAFE_ISUPPORTS1(nsUpdateProcessor, nsIUpdateProcessor)
NS_IMPL_ISUPPORTS1(nsUpdateProcessor, nsIUpdateProcessor)
nsUpdateProcessor::nsUpdateProcessor()
: mUpdaterPID(0)

View File

@ -67,7 +67,7 @@ class nsUpdateProcessor MOZ_FINAL : public nsIUpdateProcessor
public:
nsUpdateProcessor();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIUPDATEPROCESSOR
private: