Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 884061 - Part 3f: Use NS_DECL_THREADSAFE_ISUPPORTS in dom/, r=smaug,dhylands.

Browse Source 
--HG--
extra : rebase_source : b8eaae07c54c94c8c46c7ed4c0e226eb74584652
This commit is contained in:
Joshua Cranmer 2013-07-18 21:21:20 -05:00
parent a7b443c4d3
commit 36673bcae2
68 changed files with 147 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsDOMScriptObjectFactory.cpp
View File

@ -209,7 +209,7 @@ nsresult NS_GetScriptRuntimeByID(uint32_t aScriptTypeID,
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDOMExceptionProvider, nsIExceptionProvider)
NS_IMPL_ISUPPORTS1(nsDOMExceptionProvider, nsIExceptionProvider)
NS_IMETHODIMP
nsDOMExceptionProvider::GetException(nsresult result,

2
dom/base/nsDOMScriptObjectFactory.h
View File

@ -51,6 +51,6 @@ public:
class nsDOMExceptionProvider MOZ_FINAL : public nsIExceptionProvider
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIEXCEPTIONPROVIDER
};

2
dom/devicestorage/DeviceStorage.h
View File

@ -65,7 +65,7 @@ public:
uint32_t aFileType,
uint32_t aFileAttributes);
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
bool IsAvailable();
bool IsComposite();

4
dom/devicestorage/DeviceStorageRequestParent.cpp
View File

@ -250,8 +250,8 @@ DeviceStorageRequestParent::~DeviceStorageRequestParent()
MOZ_COUNT_DTOR(DeviceStorageRequestParent);
}
NS_IMPL_THREADSAFE_ADDREF(DeviceStorageRequestParent)
NS_IMPL_THREADSAFE_RELEASE(DeviceStorageRequestParent)
NS_IMPL_ADDREF(DeviceStorageRequestParent)
NS_IMPL_RELEASE(DeviceStorageRequestParent)
void
DeviceStorageRequestParent::ActorDestroy(ActorDestroyReason)

3
dom/devicestorage/DeviceStorageRequestParent.h
View File

@ -36,7 +36,8 @@ protected:
~DeviceStorageRequestParent();
private:
nsAutoRefCnt mRefCnt;
ThreadSafeAutoRefCnt mRefCnt;
NS_DECL_OWNINGTHREAD
DeviceStorageParams mParams;
class CancelableRunnable : public nsRunnable

2
dom/devicestorage/nsDeviceStorage.cpp
View File

@ -1300,7 +1300,7 @@ DeviceStorageFile::GetStatusInternal(nsAString& aStorageName, nsAString& aStatus
#endif
}
NS_IMPL_THREADSAFE_ISUPPORTS0(DeviceStorageFile)
NS_IMPL_ISUPPORTS0(DeviceStorageFile)
static void
RegisterForSDCardChanges(nsIObserver* aObserver)

2
dom/file/ArchiveEvent.cpp
View File

@ -12,7 +12,7 @@
USING_FILE_NAMESPACE
NS_IMPL_THREADSAFE_ISUPPORTS0(ArchiveItem)
NS_IMPL_ISUPPORTS0(ArchiveItem)
ArchiveItem::ArchiveItem()
{

2
dom/file/ArchiveEvent.h
View File

@ -24,7 +24,7 @@ BEGIN_FILE_NAMESPACE
class ArchiveItem : public nsISupports
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
ArchiveItem();
virtual ~ArchiveItem();

8
dom/file/ArchiveZipFile.cpp
View File

@ -49,7 +49,7 @@ public:
Close();
}
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIINPUTSTREAM
NS_DECL_NSISEEKABLESTREAM
@ -82,9 +82,9 @@ private: // data
} mData;
};
NS_IMPL_THREADSAFE_ISUPPORTS2(ArchiveInputStream,
nsIInputStream,
nsISeekableStream)
NS_IMPL_ISUPPORTS2(ArchiveInputStream,
nsIInputStream,
nsISeekableStream)
nsresult
ArchiveInputStream::Init()

2
dom/file/AsyncHelper.cpp
View File

@ -14,7 +14,7 @@
USING_FILE_NAMESPACE
NS_IMPL_THREADSAFE_ISUPPORTS2(AsyncHelper, nsIRunnable, nsIRequest)
NS_IMPL_ISUPPORTS2(AsyncHelper, nsIRunnable, nsIRequest)
nsresult
AsyncHelper::AsyncWork(nsIRequestObserver* aObserver, nsISupports* aCtxt)

2
dom/file/AsyncHelper.h
View File

@ -25,7 +25,7 @@ class AsyncHelper : public nsIRunnable,
public nsIRequest
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
NS_DECL_NSIREQUEST

2
dom/file/FileHelper.cpp
View File

@ -41,7 +41,7 @@ FileHelper::~FileHelper()
!mRequest, "Should have cleared this!");
}
NS_IMPL_THREADSAFE_ISUPPORTS1(FileHelper, nsIRequestObserver)
NS_IMPL_ISUPPORTS1(FileHelper, nsIRequestObserver)
nsresult
FileHelper::Enqueue()

2
dom/file/FileHelper.h
View File

@ -45,7 +45,7 @@ class FileHelper : public nsIRequestObserver
friend class FileOutputStreamWrapper;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIREQUESTOBSERVER
nsresult

4
dom/file/FileService.cpp
View File

@ -343,8 +343,8 @@ FileService::LockedFileQueue::LockedFileQueue(LockedFile* aLockedFile)
NS_ASSERTION(aLockedFile, "Null pointer!");
}
NS_IMPL_THREADSAFE_ADDREF(FileService::LockedFileQueue)
NS_IMPL_THREADSAFE_RELEASE(FileService::LockedFileQueue)
NS_IMPL_ADDREF(FileService::LockedFileQueue)
NS_IMPL_RELEASE(FileService::LockedFileQueue)
nsresult
FileService::LockedFileQueue::Enqueue(FileHelper* aFileHelper)

2
dom/file/FileService.h
View File

@ -88,7 +88,7 @@ private:
nsresult
ProcessQueue();
nsAutoRefCnt mRefCnt;
ThreadSafeAutoRefCnt mRefCnt;
NS_DECL_OWNINGTHREAD
nsRefPtr<LockedFile> mLockedFile;
nsTArray<nsRefPtr<FileHelper> > mQueue;

14
dom/file/FileStreamWrappers.cpp
View File

@ -19,7 +19,7 @@ namespace {
class ProgressRunnable MOZ_FINAL : public nsIRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
ProgressRunnable(FileHelper* aFileHelper,
@ -40,7 +40,7 @@ private:
class CloseRunnable MOZ_FINAL : public nsIRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
CloseRunnable(FileHelper* aFileHelper)
@ -54,7 +54,7 @@ private:
class DestroyRunnable MOZ_FINAL : public nsIRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
DestroyRunnable(FileHelper* aFileHelper)
@ -101,7 +101,7 @@ FileStreamWrapper::~FileStreamWrapper()
}
}
NS_IMPL_THREADSAFE_ISUPPORTS0(FileStreamWrapper)
NS_IMPL_ISUPPORTS0(FileStreamWrapper)
FileInputStreamWrapper::FileInputStreamWrapper(nsISupports* aFileStream,
FileHelper* aFileHelper,
@ -347,7 +347,7 @@ FileOutputStreamWrapper::IsNonBlocking(bool* _retval)
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(ProgressRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS1(ProgressRunnable, nsIRunnable)
NS_IMETHODIMP
ProgressRunnable::Run()
@ -360,7 +360,7 @@ ProgressRunnable::Run()
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(CloseRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS1(CloseRunnable, nsIRunnable)
NS_IMETHODIMP
CloseRunnable::Run()
@ -373,7 +373,7 @@ CloseRunnable::Run()
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(DestroyRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS1(DestroyRunnable, nsIRunnable)
NS_IMETHODIMP
DestroyRunnable::Run()

2
dom/file/FileStreamWrappers.h
View File

@ -19,7 +19,7 @@ class FileHelper;
class FileStreamWrapper : public nsISupports
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
FileStreamWrapper(nsISupports* aFileStream,
FileHelper* aFileHelper,

2
dom/file/LockedFile.cpp
View File

@ -923,7 +923,7 @@ FinishHelper::FinishHelper(LockedFile* aLockedFile)
mStream.swap(aLockedFile->mStream);
}
NS_IMPL_THREADSAFE_ISUPPORTS1(FinishHelper, nsIRunnable)
NS_IMPL_ISUPPORTS1(FinishHelper, nsIRunnable)
NS_IMETHODIMP
FinishHelper::Run()

2
dom/file/LockedFile.h
View File

@ -126,7 +126,7 @@ class FinishHelper MOZ_FINAL : public nsIRunnable
friend class LockedFile;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
private:

2
dom/file/MemoryStreams.cpp
View File

@ -27,7 +27,7 @@ MemoryOutputStream::Create(uint64_t aSize)
return stream.forget();
}
NS_IMPL_THREADSAFE_ISUPPORTS1(MemoryOutputStream, nsIOutputStream)
NS_IMPL_ISUPPORTS1(MemoryOutputStream, nsIOutputStream)
NS_IMETHODIMP
MemoryOutputStream::Close()

2
dom/file/MemoryStreams.h
View File

@ -16,7 +16,7 @@ BEGIN_FILE_NAMESPACE
class MemoryOutputStream : public nsIOutputStream
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOUTPUTSTREAM
static already_AddRefed<MemoryOutputStream>

4
dom/indexedDB/AsyncConnectionHelper.cpp
View File

@ -185,8 +185,8 @@ AsyncConnectionHelper::~AsyncConnectionHelper()
NS_ASSERTION(!mOldProgressHandler, "Should not have anything here!");
}
NS_IMPL_THREADSAFE_ISUPPORTS2(AsyncConnectionHelper, nsIRunnable,
mozIStorageProgressHandler)
NS_IMPL_ISUPPORTS2(AsyncConnectionHelper, nsIRunnable,
mozIStorageProgressHandler)
NS_IMETHODIMP
AsyncConnectionHelper::Run()

2
dom/indexedDB/AsyncConnectionHelper.h
View File

@ -90,7 +90,7 @@ class AsyncConnectionHelper : public HelperBase,
public:
typedef ipc::ResponseValue ResponseValue;
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
NS_DECL_MOZISTORAGEPROGRESSHANDLER

6
dom/indexedDB/CheckPermissionsHelper.cpp
View File

@ -91,9 +91,9 @@ GetIndexedDBPermissions(nsIDOMWindow* aWindow)
} // anonymous namespace
NS_IMPL_THREADSAFE_ISUPPORTS3(CheckPermissionsHelper, nsIRunnable,
nsIInterfaceRequestor,
nsIObserver)
NS_IMPL_ISUPPORTS3(CheckPermissionsHelper, nsIRunnable,
nsIInterfaceRequestor,
nsIObserver)
NS_IMETHODIMP
CheckPermissionsHelper::Run()

2
dom/indexedDB/CheckPermissionsHelper.h
View File

@ -24,7 +24,7 @@ class CheckPermissionsHelper MOZ_FINAL : public nsIRunnable,
public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
NS_DECL_NSIINTERFACEREQUESTOR
NS_DECL_NSIOBSERVER

4
dom/indexedDB/FileInfo.cpp
View File

@ -65,8 +65,8 @@ FileInfo::GetReferences(int32_t* aRefCnt, int32_t* aDBRefCnt,
}
void
FileInfo::UpdateReferences(nsAutoRefCnt& aRefCount, int32_t aDelta,
bool aClear)
FileInfo::UpdateReferences(mozilla::ThreadSafeAutoRefCnt& aRefCount,
int32_t aDelta, bool aClear)
{
if (IndexedDatabaseManager::IsClosed()) {
NS_ERROR("Shouldn't be called after shutdown!");

12
dom/indexedDB/FileInfo.h
View File

@ -35,7 +35,7 @@ public:
void AddRef()
{
if (IndexedDatabaseManager::IsClosed()) {
NS_AtomicIncrementRefcnt(mRefCnt);
++mRefCnt;
}
else {
UpdateReferences(mRefCnt, 1);
@ -45,7 +45,7 @@ public:
void Release()
{
if (IndexedDatabaseManager::IsClosed()) {
nsrefcnt count = NS_AtomicDecrementRefcnt(mRefCnt);
nsrefcnt count = --mRefCnt;
if (count == 0) {
mRefCnt = 1;
delete this;
@ -82,13 +82,13 @@ public:
virtual int64_t Id() const = 0;
private:
void UpdateReferences(nsAutoRefCnt& aRefCount, int32_t aDelta,
void UpdateReferences(ThreadSafeAutoRefCnt& aRefCount, int32_t aDelta,
bool aClear = false);
void Cleanup();
nsAutoRefCnt mRefCnt;
nsAutoRefCnt mDBRefCnt;
nsAutoRefCnt mSliceRefCnt;
ThreadSafeAutoRefCnt mRefCnt;
ThreadSafeAutoRefCnt mDBRefCnt;
ThreadSafeAutoRefCnt mSliceRefCnt;
nsRefPtr<FileManager> mFileManager;
};

4
dom/indexedDB/IDBTransaction.cpp
View File

@ -820,7 +820,7 @@ CommitHelper::~CommitHelper()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS1(CommitHelper, nsIRunnable)
NS_IMPL_ISUPPORTS1(CommitHelper, nsIRunnable)
NS_IMETHODIMP
CommitHelper::Run()
@ -1021,7 +1021,7 @@ UpdateRefcountFunction::Init()
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(UpdateRefcountFunction, mozIStorageFunction)
NS_IMPL_ISUPPORTS1(UpdateRefcountFunction, mozIStorageFunction)
NS_IMETHODIMP
UpdateRefcountFunction::OnFunctionCall(mozIStorageValueArray* aValues,

4
dom/indexedDB/IDBTransaction.h
View File

@ -281,7 +281,7 @@ private:
class CommitHelper MOZ_FINAL : public nsIRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
CommitHelper(IDBTransaction* aTransaction,
@ -327,7 +327,7 @@ private:
class UpdateRefcountFunction MOZ_FINAL : public mozIStorageFunction
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_MOZISTORAGEFUNCTION
UpdateRefcountFunction(FileManager* aFileManager)

12
dom/indexedDB/IndexedDatabaseManager.cpp
View File

@ -51,7 +51,7 @@ int32_t gClosed = 0;
class AsyncDeleteFileRunnable MOZ_FINAL : public nsIRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
AsyncDeleteFileRunnable(FileManager* aFileManager, int64_t aFileId);
@ -64,7 +64,7 @@ private:
class GetFileReferencesHelper MOZ_FINAL : public nsIRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
GetFileReferencesHelper(const nsACString& aOrigin,
@ -611,8 +611,8 @@ AsyncDeleteFileRunnable::AsyncDeleteFileRunnable(FileManager* aFileManager,
{
}
NS_IMPL_THREADSAFE_ISUPPORTS1(AsyncDeleteFileRunnable,
nsIRunnable)
NS_IMPL_ISUPPORTS1(AsyncDeleteFileRunnable,
nsIRunnable)
NS_IMETHODIMP
AsyncDeleteFileRunnable::Run()
@ -683,8 +683,8 @@ GetFileReferencesHelper::DispatchAndReturnFileReferences(int32_t* aMemRefCnt,
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(GetFileReferencesHelper,
nsIRunnable)
NS_IMPL_ISUPPORTS1(GetFileReferencesHelper,
nsIRunnable)
NS_IMETHODIMP
GetFileReferencesHelper::Run()

2
dom/indexedDB/OpenDatabaseHelper.cpp
View File

@ -1680,7 +1680,7 @@ private:
} // anonymous namespace
NS_IMPL_THREADSAFE_ISUPPORTS1(OpenDatabaseHelper, nsIRunnable)
NS_IMPL_ISUPPORTS1(OpenDatabaseHelper, nsIRunnable)
nsresult
OpenDatabaseHelper::Init()

2
dom/indexedDB/OpenDatabaseHelper.h
View File

@ -53,7 +53,7 @@ public:
"Can't be for deletion and request a version!");
}
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
nsresult Init();

12
dom/indexedDB/TransactionThreadPool.cpp
View File

@ -34,7 +34,7 @@ bool gShutdown = false;
class TransactionThreadPoolListener : public nsIThreadPoolListener
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITHREADPOOLLISTENER
private:
@ -51,7 +51,7 @@ BEGIN_INDEXEDDB_NAMESPACE
class FinishTransactionRunnable MOZ_FINAL : public nsIRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
inline FinishTransactionRunnable(IDBTransaction* aTransaction,
@ -566,8 +566,7 @@ TransactionThreadPool::TransactionQueue::Finish(nsIRunnable* aFinishRunnable)
mMonitor.Notify();
}
NS_IMPL_THREADSAFE_ISUPPORTS1(TransactionThreadPool::TransactionQueue,
nsIRunnable)
NS_IMPL_ISUPPORTS1(TransactionThreadPool::TransactionQueue, nsIRunnable)
NS_IMETHODIMP
TransactionThreadPool::TransactionQueue::Run()
@ -639,7 +638,7 @@ FinishTransactionRunnable::FinishTransactionRunnable(
mFinishRunnable.swap(aFinishRunnable);
}
NS_IMPL_THREADSAFE_ISUPPORTS1(FinishTransactionRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS1(FinishTransactionRunnable, nsIRunnable)
NS_IMETHODIMP
FinishTransactionRunnable::Run()
@ -665,8 +664,7 @@ FinishTransactionRunnable::Run()
#ifdef MOZ_ENABLE_PROFILER_SPS
NS_IMPL_THREADSAFE_ISUPPORTS1(TransactionThreadPoolListener,
nsIThreadPoolListener)
NS_IMPL_ISUPPORTS1(TransactionThreadPoolListener, nsIThreadPoolListener)
NS_IMETHODIMP
TransactionThreadPoolListener::OnThreadCreated()

2
dom/indexedDB/TransactionThreadPool.h
View File

@ -59,7 +59,7 @@ protected:
class TransactionQueue MOZ_FINAL : public nsIRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
TransactionQueue(IDBTransaction* aTransaction);

6
dom/ipc/Blob.cpp
View File

@ -60,7 +60,7 @@ class RemoteInputStream : public nsIInputStream,
ActorFlavorEnum mOrigin;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
RemoteInputStream(nsIDOMBlob* aSourceBlob, ActorFlavorEnum aOrigin)
: mMonitor("RemoteInputStream.mMonitor"), mSourceBlob(aSourceBlob),
@ -312,8 +312,8 @@ private:
}
};
NS_IMPL_THREADSAFE_ADDREF(RemoteInputStream)
NS_IMPL_THREADSAFE_RELEASE(RemoteInputStream)
NS_IMPL_ADDREF(RemoteInputStream)
NS_IMPL_RELEASE(RemoteInputStream)
NS_INTERFACE_MAP_BEGIN(RemoteInputStream)
NS_INTERFACE_MAP_ENTRY(nsIInputStream)

8
dom/ipc/ContentParent.cpp
View File

@ -1572,10 +1572,10 @@ ContentParent::RecvRecordingDeviceEvents(const nsString& aRecordingStatus)
return true;
}
NS_IMPL_THREADSAFE_ISUPPORTS3(ContentParent,
nsIObserver,
nsIThreadObserver,
nsIDOMGeoPositionCallback)
NS_IMPL_ISUPPORTS3(ContentParent,
nsIObserver,
nsIThreadObserver,
nsIDOMGeoPositionCallback)
NS_IMETHODIMP
ContentParent::Observe(nsISupports* aSubject,

2
dom/ipc/ContentParent.h
View File

@ -108,7 +108,7 @@ public:
static void GetAll(nsTArray<ContentParent*>& aArray);
static void GetAllEvenIfDead(nsTArray<ContentParent*>& aArray);
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOBSERVER
NS_DECL_NSITHREADOBSERVER
NS_DECL_NSIDOMGEOPOSITIONCALLBACK

4
dom/media/MediaManager.cpp
View File

@ -230,7 +230,7 @@ protected:
/**
* nsIMediaDevice implementation.
*/
NS_IMPL_THREADSAFE_ISUPPORTS1(MediaDevice, nsIMediaDevice)
NS_IMPL_ISUPPORTS1(MediaDevice, nsIMediaDevice)
NS_IMETHODIMP
MediaDevice::GetName(nsAString& aName)
@ -893,7 +893,7 @@ MediaManager::MediaManager()
mActiveCallbacks.Init();
}
NS_IMPL_THREADSAFE_ISUPPORTS2(MediaManager, nsIMediaManagerService, nsIObserver)
NS_IMPL_ISUPPORTS2(MediaManager, nsIMediaManagerService, nsIObserver)
/* static */ StaticRefPtr<MediaManager> MediaManager::sSingleton;

4
dom/media/MediaManager.h
View File

@ -385,7 +385,7 @@ typedef nsClassHashtable<nsUint64HashKey, StreamListeners> WindowTable;
class MediaDevice : public nsIMediaDevice
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIMEDIADEVICE
MediaDevice(MediaEngineVideoSource* aSource) {
@ -425,7 +425,7 @@ public:
return Get()->mMediaThread;
}
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIOBSERVER
NS_DECL_NSIMEDIAMANAGERSERVICE

2
dom/plugins/base/nsNPAPIPluginInstance.cpp
View File

@ -162,7 +162,7 @@ using namespace mozilla::layers;
static NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID);
NS_IMPL_THREADSAFE_ISUPPORTS0(nsNPAPIPluginInstance)
NS_IMPL_ISUPPORTS0(nsNPAPIPluginInstance)
nsNPAPIPluginInstance::nsNPAPIPluginInstance()
:

2
dom/plugins/base/nsNPAPIPluginInstance.h
View File

@ -81,7 +81,7 @@ private:
typedef mozilla::PluginLibrary PluginLibrary;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
nsresult Initialize(nsNPAPIPlugin *aPlugin, nsPluginInstanceOwner* aOwner, const char* aMIMEType);
nsresult Start();

4
dom/plugins/base/nsPluginDirServiceProvider.cpp
View File

@ -177,8 +177,8 @@ nsPluginDirServiceProvider::~nsPluginDirServiceProvider()
// nsPluginDirServiceProvider::nsISupports
//*****************************************************************************
NS_IMPL_THREADSAFE_ISUPPORTS1(nsPluginDirServiceProvider,
nsIDirectoryServiceProvider)
NS_IMPL_ISUPPORTS1(nsPluginDirServiceProvider,
nsIDirectoryServiceProvider)
//*****************************************************************************
// nsPluginDirServiceProvider::nsIDirectoryServiceProvider

2
dom/plugins/base/nsPluginDirServiceProvider.h
View File

@ -29,7 +29,7 @@ class nsPluginDirServiceProvider : public nsIDirectoryServiceProvider
public:
nsPluginDirServiceProvider();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIDIRECTORYSERVICEPROVIDER
#ifdef XP_WIN

6
dom/quota/CheckQuotaHelper.cpp
View File

@ -137,9 +137,9 @@ CheckQuotaHelper::GetQuotaPermission(nsIPrincipal* aPrincipal)
return permission;
}
NS_IMPL_THREADSAFE_ISUPPORTS3(CheckQuotaHelper, nsIRunnable,
nsIInterfaceRequestor,
nsIObserver)
NS_IMPL_ISUPPORTS3(CheckQuotaHelper, nsIRunnable,
nsIInterfaceRequestor,
nsIObserver)
NS_IMETHODIMP
CheckQuotaHelper::Run()

2
dom/quota/CheckQuotaHelper.h
View File

@ -26,7 +26,7 @@ class CheckQuotaHelper MOZ_FINAL : public nsIRunnable,
public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
NS_DECL_NSIINTERFACEREQUESTOR
NS_DECL_NSIOBSERVER

20
dom/quota/QuotaManager.cpp
View File

@ -124,7 +124,7 @@ class OriginClearRunnable MOZ_FINAL : public nsIRunnable,
};
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
// AcquireListener override
@ -196,7 +196,7 @@ class AsyncUsageRunnable MOZ_FINAL : public UsageRunnable,
};
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
NS_DECL_NSIQUOTAREQUEST
@ -278,7 +278,7 @@ public:
NS_ASSERTION(mCountdown, "Wrong countdown!");
}
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
void
@ -300,7 +300,7 @@ public:
: mBusy(true)
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIRUNNABLE
bool
@ -1899,7 +1899,7 @@ OriginClearRunnable::DeleteFiles(QuotaManager* aQuotaManager)
aQuotaManager->OriginClearCompleted(mOriginOrPattern);
}
NS_IMPL_THREADSAFE_ISUPPORTS1(OriginClearRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS1(OriginClearRunnable, nsIRunnable)
NS_IMETHODIMP
OriginClearRunnable::Run()
@ -2143,9 +2143,9 @@ AsyncUsageRunnable::RunInternal()
return NS_ERROR_UNEXPECTED;
}
NS_IMPL_THREADSAFE_ISUPPORTS2(AsyncUsageRunnable,
nsIRunnable,
nsIQuotaRequest)
NS_IMPL_ISUPPORTS2(AsyncUsageRunnable,
nsIRunnable,
nsIQuotaRequest)
NS_IMETHODIMP
AsyncUsageRunnable::Run()
@ -2178,7 +2178,7 @@ AsyncUsageRunnable::Cancel()
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(WaitForTransactionsToFinishRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS1(WaitForTransactionsToFinishRunnable, nsIRunnable)
NS_IMETHODIMP
WaitForTransactionsToFinishRunnable::Run()
@ -2206,7 +2206,7 @@ WaitForTransactionsToFinishRunnable::Run()
return NS_OK;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(WaitForLockedFilesToFinishRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS1(WaitForLockedFilesToFinishRunnable, nsIRunnable)
NS_IMETHODIMP
WaitForLockedFilesToFinishRunnable::Run()

4
dom/quota/QuotaObject.cpp
View File

@ -17,7 +17,7 @@ QuotaObject::AddRef()
if (!quotaManager) {
NS_ERROR("Null quota manager, this shouldn't happen, possible leak!");
NS_AtomicIncrementRefcnt(mRefCnt);
++mRefCnt;
return;
}
@ -34,7 +34,7 @@ QuotaObject::Release()
if (!quotaManager) {
NS_ERROR("Null quota manager, this shouldn't happen, possible leak!");
nsrefcnt count = NS_AtomicDecrementRefcnt(mRefCnt);
nsrefcnt count = --mRefCnt;
if (count == 0) {
mRefCnt = 1;
delete this;

2
dom/quota/QuotaObject.h
View File

@ -42,7 +42,7 @@ private:
virtual ~QuotaObject()
{ }
nsAutoRefCnt mRefCnt;
mozilla::ThreadSafeAutoRefCnt mRefCnt;
OriginInfo* mOriginInfo;
nsString mPath;

8
dom/src/geolocation/nsGeoPosition.cpp
View File

@ -37,8 +37,8 @@ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMGeoPositionCoords)
NS_INTERFACE_MAP_ENTRY(nsIDOMGeoPositionCoords)
NS_INTERFACE_MAP_END
NS_IMPL_THREADSAFE_ADDREF(nsGeoPositionCoords)
NS_IMPL_THREADSAFE_RELEASE(nsGeoPositionCoords)
NS_IMPL_ADDREF(nsGeoPositionCoords)
NS_IMPL_RELEASE(nsGeoPositionCoords)
NS_IMETHODIMP
nsGeoPositionCoords::GetLatitude(double *aLatitude)
@ -128,8 +128,8 @@ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMGeoPosition)
NS_INTERFACE_MAP_ENTRY(nsIDOMGeoPosition)
NS_INTERFACE_MAP_END
NS_IMPL_THREADSAFE_ADDREF(nsGeoPosition)
NS_IMPL_THREADSAFE_RELEASE(nsGeoPosition)
NS_IMPL_ADDREF(nsGeoPosition)
NS_IMPL_RELEASE(nsGeoPosition)
NS_IMETHODIMP
nsGeoPosition::GetTimestamp(DOMTimeStamp* aTimestamp)

4
dom/src/geolocation/nsGeoPosition.h
View File

@ -27,7 +27,7 @@ struct JSContext;
class nsGeoPositionCoords MOZ_FINAL : public nsIDOMGeoPositionCoords
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIDOMGEOPOSITIONCOORDS
nsGeoPositionCoords(double aLat, double aLong,
@ -47,7 +47,7 @@ private:
class nsGeoPosition MOZ_FINAL : public nsIDOMGeoPosition
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIDOMGEOPOSITION
nsGeoPosition(double aLat, double aLong,

4
dom/src/geolocation/nsGeolocation.cpp
View File

@ -611,8 +611,8 @@ NS_INTERFACE_MAP_BEGIN(nsGeolocationService)
NS_INTERFACE_MAP_ENTRY(nsIObserver)
NS_INTERFACE_MAP_END
NS_IMPL_THREADSAFE_ADDREF(nsGeolocationService)
NS_IMPL_THREADSAFE_RELEASE(nsGeolocationService)
NS_IMPL_ADDREF(nsGeolocationService)
NS_IMPL_RELEASE(nsGeolocationService)
static bool sGeoEnabled = true;

2
dom/src/geolocation/nsGeolocation.h
View File

@ -108,7 +108,7 @@ public:
static already_AddRefed<nsGeolocationService> GetGeolocationService();
static mozilla::StaticRefPtr<nsGeolocationService> sService;
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIGEOLOCATIONUPDATE
NS_DECL_NSIOBSERVER

4
dom/src/jsurl/nsJSProtocolHandler.cpp
View File

@ -56,7 +56,7 @@ class nsJSThunk : public nsIInputStream
public:
nsJSThunk();
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_FORWARD_SAFE_NSIINPUTSTREAM(mInnerStream)
nsresult Init(nsIURI* uri);
@ -76,7 +76,7 @@ protected:
//
// nsISupports implementation...
//
NS_IMPL_THREADSAFE_ISUPPORTS1(nsJSThunk, nsIInputStream)
NS_IMPL_ISUPPORTS1(nsJSThunk, nsIInputStream)
nsJSThunk::nsJSThunk()

4
dom/src/storage/DOMStorageCache.cpp
View File

@ -53,7 +53,7 @@ GetDataSetIndex(const DOMStorage* aStorage)
// DOMStorageCacheBridge
NS_IMPL_THREADSAFE_ADDREF(DOMStorageCacheBridge)
NS_IMPL_ADDREF(DOMStorageCacheBridge)
// Since there is no consumer of return value of Release, we can turn this
// method to void to make implementation of asynchronous DOMStorageCache::Release
@ -61,7 +61,7 @@ NS_IMPL_THREADSAFE_ADDREF(DOMStorageCacheBridge)
NS_IMETHODIMP_(void) DOMStorageCacheBridge::Release(void)
{
MOZ_ASSERT(int32_t(mRefCnt) > 0, "dup release");
nsrefcnt count = NS_AtomicDecrementRefcnt(mRefCnt);
nsrefcnt count = --mRefCnt;
NS_LOG_RELEASE(this, count, "DOMStorageCacheBridge");
if (0 == count) {
mRefCnt = 1; /* stabilize */

3
dom/src/storage/DOMStorageCache.h
View File

@ -55,7 +55,8 @@ public:
virtual void LoadWait() = 0;
protected:
nsAutoRefCnt mRefCnt;
ThreadSafeAutoRefCnt mRefCnt;
NS_DECL_OWNINGTHREAD
};
// Implementation of scope cache that is responsible for preloading data

6
dom/src/storage/DOMStorageIPC.cpp
View File

@ -18,7 +18,7 @@ namespace dom {
// Child
// ----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ADDREF(DOMStorageDBChild)
NS_IMPL_ADDREF(DOMStorageDBChild)
NS_IMETHODIMP_(nsrefcnt) DOMStorageDBChild::Release(void)
{
@ -274,8 +274,8 @@ DOMStorageDBChild::RecvError(const nsresult& aRv)
// Parent
// ----------------------------------------------------------------------------
NS_IMPL_THREADSAFE_ADDREF(DOMStorageDBParent)
NS_IMPL_THREADSAFE_RELEASE(DOMStorageDBParent)
NS_IMPL_ADDREF(DOMStorageDBParent)
NS_IMPL_RELEASE(DOMStorageDBParent)
void
DOMStorageDBParent::AddIPDLReference()

6
dom/src/storage/DOMStorageIPC.h
View File

@ -76,7 +76,8 @@ private:
nsTHashtable<nsCStringHashKey>& ScopesHavingData();
nsAutoRefCnt mRefCnt;
ThreadSafeAutoRefCnt mRefCnt;
NS_DECL_OWNINGTHREAD
// Held to get caches to forward answers to.
nsRefPtr<DOMLocalStorageManager> mManager;
@ -179,7 +180,8 @@ private:
private:
CacheParentBridge* NewCache(const nsACString& aScope);
nsAutoRefCnt mRefCnt;
ThreadSafeAutoRefCnt mRefCnt;
NS_DECL_OWNINGTHREAD
// True when IPC channel is open and Send*() methods are OK to use.
bool mIPCOpen;

8
dom/system/gonk/AutoMounterSetting.cpp
View File

@ -37,7 +37,7 @@ namespace system {
class SettingsServiceCallback MOZ_FINAL : public nsISettingsServiceCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
SettingsServiceCallback() {}
@ -57,12 +57,12 @@ public:
}
};
NS_IMPL_THREADSAFE_ISUPPORTS1(SettingsServiceCallback, nsISettingsServiceCallback)
NS_IMPL_ISUPPORTS1(SettingsServiceCallback, nsISettingsServiceCallback)
class CheckVolumeSettingsCallback MOZ_FINAL : public nsISettingsServiceCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
CheckVolumeSettingsCallback(const nsACString& aVolumeName)
: mVolumeName(aVolumeName) {}
@ -85,7 +85,7 @@ private:
nsCString mVolumeName;
};
NS_IMPL_THREADSAFE_ISUPPORTS1(CheckVolumeSettingsCallback, nsISettingsServiceCallback)
NS_IMPL_ISUPPORTS1(CheckVolumeSettingsCallback, nsISettingsServiceCallback)
AutoMounterSetting::AutoMounterSetting()
{

8
dom/system/gonk/GonkGPSGeolocationProvider.cpp
View File

@ -44,10 +44,10 @@ static const int kDefaultPeriod = 1000; // ms
// While most methods of GonkGPSGeolocationProvider should only be
// called from main thread, we deliberately put the Init and ShutdownGPS
// methods off main thread to avoid blocking.
NS_IMPL_THREADSAFE_ISUPPORTS3(GonkGPSGeolocationProvider,
nsIGeolocationProvider,
nsIRILDataCallback,
nsISettingsServiceCallback)
NS_IMPL_ISUPPORTS3(GonkGPSGeolocationProvider,
nsIGeolocationProvider,
nsIRILDataCallback,
nsISettingsServiceCallback)
/* static */ GonkGPSGeolocationProvider* GonkGPSGeolocationProvider::sSingleton = nullptr;
GpsCallbacks GonkGPSGeolocationProvider::mCallbacks = {

2
dom/system/gonk/GonkGPSGeolocationProvider.h
View File

@ -37,7 +37,7 @@ class GonkGPSGeolocationProvider : public nsIGeolocationProvider
, public nsISettingsServiceCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIGEOLOCATIONPROVIDER
NS_DECL_NSIRILDATACALLBACK
NS_DECL_NSISETTINGSSERVICECALLBACK

2
dom/system/gonk/nsVolume.cpp
View File

@ -43,7 +43,7 @@ NS_VolumeStateStr(int32_t aState)
// allocate an nsVolume which is then passed to MainThread. Since we
// have a situation where we allocate on one thread and free on another
// we use a thread safe AddRef implementation.
NS_IMPL_THREADSAFE_ISUPPORTS1(nsVolume, nsIVolume)
NS_IMPL_ISUPPORTS1(nsVolume, nsIVolume)
nsVolume::nsVolume(const Volume* aVolume)
: mName(NS_ConvertUTF8toUTF16(aVolume->Name())),

2
dom/system/gonk/nsVolume.h
View File

@ -19,7 +19,7 @@ class VolumeMountLock;
class nsVolume : public nsIVolume
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIVOLUME
// This constructor is used by the UpdateVolumeRunnable constructor

6
dom/system/gonk/nsVolumeService.cpp
View File

@ -39,9 +39,9 @@ using namespace mozilla::services;
namespace mozilla {
namespace system {
NS_IMPL_THREADSAFE_ISUPPORTS2(nsVolumeService,
nsIVolumeService,
nsIDOMMozWakeLockListener)
NS_IMPL_ISUPPORTS2(nsVolumeService,
nsIVolumeService,
nsIDOMMozWakeLockListener)
StaticRefPtr<nsVolumeService> nsVolumeService::sSingleton;

2
dom/system/gonk/nsVolumeService.h
View File

@ -30,7 +30,7 @@ class nsVolumeService MOZ_FINAL : public nsIVolumeService,
public nsIDOMMozWakeLockListener
{
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIVOLUMESERVICE
NS_DECL_NSIDOMMOZWAKELOCKLISTENER

5
dom/workers/ScriptLoader.cpp
View File

@ -133,7 +133,7 @@ class ScriptLoaderRunnable : public WorkerFeature,
bool mCanceledMainThread;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
ScriptLoaderRunnable(WorkerPrivate* aWorkerPrivate,
uint32_t aSyncQueueKey,
@ -520,8 +520,7 @@ public:
}
};
NS_IMPL_THREADSAFE_ISUPPORTS2(ScriptLoaderRunnable, nsIRunnable,
nsIStreamLoaderObserver)
NS_IMPL_ISUPPORTS2(ScriptLoaderRunnable, nsIRunnable, nsIStreamLoaderObserver)
class StopSyncLoopRunnable MOZ_FINAL : public MainThreadSyncRunnable
{

11
dom/workers/WorkerPrivate.cpp
View File

@ -1184,7 +1184,7 @@ public:
: mWorkerRunnable(aWorkerRunnable)
{ }
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_IMETHOD
Dispatch(nsIRunnable* aRunnable, uint32_t aFlags)
@ -1213,7 +1213,7 @@ public:
}
};
NS_IMPL_THREADSAFE_ISUPPORTS1(WorkerRunnableEventTarget, nsIEventTarget)
NS_IMPL_ISUPPORTS1(WorkerRunnableEventTarget, nsIEventTarget)
class KillCloseEventRunnable : public WorkerRunnable
{
@ -1539,7 +1539,7 @@ WorkerRunnable::WorkerRunnable(WorkerPrivate* aWorkerPrivate, Target aTarget,
}
#endif
NS_IMPL_THREADSAFE_ISUPPORTS1(WorkerRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS1(WorkerRunnable, nsIRunnable)
bool
WorkerRunnable::PreDispatch(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
@ -1784,7 +1784,7 @@ class WorkerPrivate::MemoryReporter MOZ_FINAL : public nsIMemoryMultiReporter
bool mAlreadyMappedToAddon;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
MemoryReporter(WorkerPrivate* aWorkerPrivate)
: mMutex(aWorkerPrivate->mMutex), mWorkerPrivate(aWorkerPrivate),
@ -1891,8 +1891,7 @@ private:
}
};
NS_IMPL_THREADSAFE_ISUPPORTS1(WorkerPrivate::MemoryReporter,
nsIMemoryMultiReporter)
NS_IMPL_ISUPPORTS1(WorkerPrivate::MemoryReporter, nsIMemoryMultiReporter)
template <class Derived>
WorkerPrivateParent<Derived>::WorkerPrivateParent(

2
dom/workers/WorkerPrivate.h
View File

@ -65,7 +65,7 @@ protected:
ClearingBehavior mClearingBehavior;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
bool
Dispatch(JSContext* aCx);

4
dom/workers/XMLHttpRequest.cpp
View File

@ -125,7 +125,7 @@ public:
bool mInOpen;
public:
NS_DECL_ISUPPORTS
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIDOMEVENTLISTENER
Proxy(XMLHttpRequest* aXHRPrivate, bool aMozAnon, bool aMozSystem)
@ -1345,7 +1345,7 @@ Proxy::AddRemoveEventListeners(bool aUpload, bool aAdd)
return true;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(Proxy, nsIDOMEventListener)
NS_IMPL_ISUPPORTS1(Proxy, nsIDOMEventListener)
NS_IMETHODIMP
Proxy::HandleEvent(nsIDOMEvent* aEvent)