mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 884061 - Part 3u: Use NS_DECL_THREADSAFE_ISUPPORTS in storage/, r=mak
--HG-- extra : rebase_source : fdc61fe0dad1e88c33325e32c755ed8f2c389af2
This commit is contained in:
parent
a0980cbcf6
commit
6957c96175
@ -34,7 +34,7 @@ namespace storage {
|
||||
class Variant_base : public nsIVariant
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_NSIVARIANT
|
||||
|
||||
protected:
|
||||
|
@ -18,9 +18,9 @@ namespace storage {
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
//// Variant_base
|
||||
|
||||
inline NS_IMPL_THREADSAFE_ADDREF(Variant_base)
|
||||
inline NS_IMPL_THREADSAFE_RELEASE(Variant_base)
|
||||
inline NS_IMPL_THREADSAFE_QUERY_INTERFACE1(
|
||||
inline NS_IMPL_ADDREF(Variant_base)
|
||||
inline NS_IMPL_RELEASE(Variant_base)
|
||||
inline NS_IMPL_QUERY_INTERFACE1(
|
||||
Variant_base,
|
||||
nsIVariant
|
||||
)
|
||||
|
@ -262,8 +262,8 @@ AsyncStatement::cleanupJSHelpers()
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
//// nsISupports
|
||||
|
||||
NS_IMPL_THREADSAFE_ADDREF(AsyncStatement)
|
||||
NS_IMPL_THREADSAFE_RELEASE(AsyncStatement)
|
||||
NS_IMPL_ADDREF(AsyncStatement)
|
||||
NS_IMPL_RELEASE(AsyncStatement)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(AsyncStatement)
|
||||
NS_INTERFACE_MAP_ENTRY(mozIStorageAsyncStatement)
|
||||
|
@ -31,7 +31,7 @@ class AsyncStatement MOZ_FINAL : public mozIStorageAsyncStatement
|
||||
, public StorageBaseStatementInternal
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_MOZISTORAGEASYNCSTATEMENT
|
||||
NS_DECL_MOZISTORAGEBASESTATEMENT
|
||||
NS_DECL_MOZISTORAGEBINDINGPARAMS
|
||||
|
@ -514,7 +514,7 @@ AsyncExecuteStatements::notifyResults()
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(
|
||||
NS_IMPL_ISUPPORTS2(
|
||||
AsyncExecuteStatements,
|
||||
nsIRunnable,
|
||||
mozIStoragePendingStatement
|
||||
|
@ -41,7 +41,7 @@ class AsyncExecuteStatements MOZ_FINAL : public nsIRunnable
|
||||
, public mozIStoragePendingStatement
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_NSIRUNNABLE
|
||||
NS_DECL_MOZISTORAGEPENDINGSTATEMENT
|
||||
|
||||
|
@ -202,7 +202,7 @@ AsyncBindingParams::iterateOverNamedParameters(const nsACString &aName,
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
//// nsISupports
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(
|
||||
NS_IMPL_ISUPPORTS2(
|
||||
BindingParams
|
||||
, mozIStorageBindingParams
|
||||
, IStorageBindingParamsInternal
|
||||
|
@ -25,7 +25,7 @@ class BindingParams : public mozIStorageBindingParams
|
||||
, public IStorageBindingParamsInternal
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_MOZISTORAGEBINDINGPARAMS
|
||||
NS_DECL_ISTORAGEBINDINGPARAMSINTERNAL
|
||||
|
||||
|
@ -39,7 +39,7 @@ BindingParamsArray::getOwner() const
|
||||
return mOwningStatement;
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(
|
||||
NS_IMPL_ISUPPORTS1(
|
||||
BindingParamsArray,
|
||||
mozIStorageBindingParamsArray
|
||||
)
|
||||
|
@ -23,7 +23,7 @@ class BindingParamsArray MOZ_FINAL : public mozIStorageBindingParamsArray
|
||||
typedef nsTArray< nsCOMPtr<mozIStorageBindingParams> > array_type;
|
||||
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_MOZISTORAGEBINDINGPARAMSARRAY
|
||||
|
||||
BindingParamsArray(StorageBaseStatementInternal *aOwningStatement);
|
||||
|
@ -497,7 +497,7 @@ Connection::~Connection()
|
||||
"AsyncClose has not been invoked on this connection!");
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ADDREF(Connection)
|
||||
NS_IMPL_ADDREF(Connection)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(Connection)
|
||||
NS_INTERFACE_MAP_ENTRY(mozIStorageAsyncConnection)
|
||||
@ -506,12 +506,12 @@ NS_INTERFACE_MAP_BEGIN(Connection)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozIStorageConnection)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
// This is identical to what NS_IMPL_THREADSAFE_RELEASE provides, but with the
|
||||
// This is identical to what NS_IMPL_RELEASE provides, but with the
|
||||
// extra |1 == count| case.
|
||||
NS_IMETHODIMP_(nsrefcnt) Connection::Release(void)
|
||||
{
|
||||
NS_PRECONDITION(0 != mRefCnt, "dup release");
|
||||
nsrefcnt count = NS_AtomicDecrementRefcnt(mRefCnt);
|
||||
nsrefcnt count = --mRefCnt;
|
||||
NS_LOG_RELEASE(this, count, "Connection");
|
||||
if (1 == count) {
|
||||
// If the refcount is 1, the single reference must be from
|
||||
|
@ -40,7 +40,7 @@ class Connection MOZ_FINAL : public mozIStorageConnection
|
||||
, public nsIInterfaceRequestor
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_MOZISTORAGEASYNCCONNECTION
|
||||
NS_DECL_MOZISTORAGECONNECTION
|
||||
NS_DECL_NSIINTERFACEREQUESTOR
|
||||
|
@ -23,7 +23,7 @@ Error::Error(int aResult,
|
||||
* Note: This object is only ever accessed on one thread at a time. It it not
|
||||
* threadsafe, but it does need threadsafe AddRef and Release.
|
||||
*/
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(
|
||||
NS_IMPL_ISUPPORTS1(
|
||||
Error,
|
||||
mozIStorageError
|
||||
)
|
||||
|
@ -17,7 +17,7 @@ namespace storage {
|
||||
class Error MOZ_FINAL : public mozIStorageError
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_MOZISTORAGEERROR
|
||||
|
||||
Error(int aResult, const char *aMessage);
|
||||
|
@ -33,7 +33,7 @@ ResultSet::add(mozIStorageRow *aRow)
|
||||
* Note: This object is only ever accessed on one thread at a time. It it not
|
||||
* threadsafe, but it does need threadsafe AddRef and Release.
|
||||
*/
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(
|
||||
NS_IMPL_ISUPPORTS1(
|
||||
ResultSet,
|
||||
mozIStorageResultSet
|
||||
)
|
||||
|
@ -18,7 +18,7 @@ namespace storage {
|
||||
class ResultSet MOZ_FINAL : public mozIStorageResultSet
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_MOZISTORAGERESULTSET
|
||||
|
||||
ResultSet();
|
||||
|
@ -78,7 +78,7 @@ Row::initialize(sqlite3_stmt *aStatement)
|
||||
* Note: This object is only ever accessed on one thread at a time. It it not
|
||||
* threadsafe, but it does need threadsafe AddRef and Release.
|
||||
*/
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(
|
||||
NS_IMPL_ISUPPORTS2(
|
||||
Row,
|
||||
mozIStorageRow,
|
||||
mozIStorageValueArray
|
||||
|
@ -20,7 +20,7 @@ namespace storage {
|
||||
class Row MOZ_FINAL : public mozIStorageRow
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_MOZISTORAGEROW
|
||||
NS_DECL_MOZISTORAGEVALUEARRAY
|
||||
|
||||
|
@ -79,7 +79,7 @@ private:
|
||||
nsCString mSchemaDesc;
|
||||
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
|
||||
StorageSQLiteMultiReporter(Service *aService)
|
||||
: mService(aService)
|
||||
@ -216,7 +216,7 @@ private:
|
||||
}
|
||||
};
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(
|
||||
NS_IMPL_ISUPPORTS1(
|
||||
StorageSQLiteMultiReporter,
|
||||
nsIMemoryMultiReporter
|
||||
)
|
||||
@ -224,7 +224,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
//// Service
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(
|
||||
NS_IMPL_ISUPPORTS2(
|
||||
Service,
|
||||
mozIStorageService,
|
||||
nsIObserver
|
||||
|
@ -53,7 +53,7 @@ public:
|
||||
|
||||
static Service *getSingleton();
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_MOZISTORAGESERVICE
|
||||
NS_DECL_NSIOBSERVER
|
||||
|
||||
|
@ -250,8 +250,8 @@ Statement::~Statement()
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
//// nsISupports
|
||||
|
||||
NS_IMPL_THREADSAFE_ADDREF(Statement)
|
||||
NS_IMPL_THREADSAFE_RELEASE(Statement)
|
||||
NS_IMPL_ADDREF(Statement)
|
||||
NS_IMPL_RELEASE(Statement)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(Statement)
|
||||
NS_INTERFACE_MAP_ENTRY(mozIStorageStatement)
|
||||
|
@ -32,7 +32,7 @@ class Statement MOZ_FINAL : public mozIStorageStatement
|
||||
, public StorageBaseStatementInternal
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_MOZISTORAGESTATEMENT
|
||||
NS_DECL_MOZISTORAGEBASESTATEMENT
|
||||
NS_DECL_MOZISTORAGEBINDINGPARAMS
|
||||
|
@ -108,7 +108,7 @@ public:
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(
|
||||
NS_IMPL_ISUPPORTS2(
|
||||
Foo
|
||||
, IBar
|
||||
, IBaz
|
||||
|
Loading…
Reference in New Issue
Block a user