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 574811 - Rename IDBTransactionRequest to IDBTransaction

Browse Source 
Updating interface names per recent specification changes.
r=bent

--HG--
rename : dom/indexedDB/IDBTransactionRequest.cpp => dom/indexedDB/IDBTransaction.cpp
rename : dom/indexedDB/IDBTransactionRequest.h => dom/indexedDB/IDBTransaction.h
This commit is contained in:
Shawn Wilsher 2010-06-28 09:46:21 -07:00
parent 8f3f92a5f4
commit 7efa6fa6f7
24 changed files with 205 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/base/nsDOMClassInfo.cpp
View File

@ -484,7 +484,7 @@ using namespace mozilla::dom;
#include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
#include "mozilla/dom/indexedDB/IDBEvents.h"
#include "mozilla/dom/indexedDB/IDBObjectStoreRequest.h"
#include "mozilla/dom/indexedDB/IDBTransactionRequest.h"
#include "mozilla/dom/indexedDB/IDBTransaction.h"
#include "mozilla/dom/indexedDB/IDBCursorRequest.h"
#include "mozilla/dom/indexedDB/IDBKeyRange.h"
#include "mozilla/dom/indexedDB/IDBIndexRequest.h"
@ -1432,7 +1432,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(IDBObjectStoreRequest, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(IDBTransactionRequest, nsDOMGenericSH,
NS_DEFINE_CLASSINFO_DATA(IDBTransaction, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(IDBCursorRequest, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
@ -3962,8 +3962,7 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIIDBObjectStore)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(IDBTransactionRequest, nsIIDBTransactionRequest)
DOM_CLASSINFO_MAP_ENTRY(nsIIDBTransactionRequest)
DOM_CLASSINFO_MAP_BEGIN(IDBTransaction, nsIIDBTransaction)
DOM_CLASSINFO_MAP_ENTRY(nsIIDBTransaction)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)

2
dom/base/nsDOMClassInfoClasses.h
View File

@ -487,7 +487,7 @@ DOMCI_CLASS(IDBErrorEvent)
DOMCI_CLASS(IDBSuccessEvent)
DOMCI_CLASS(IDBTransactionEvent)
DOMCI_CLASS(IDBObjectStoreRequest)
DOMCI_CLASS(IDBTransactionRequest)
DOMCI_CLASS(IDBTransaction)
DOMCI_CLASS(IDBCursorRequest)
DOMCI_CLASS(IDBKeyRange)
DOMCI_CLASS(IDBIndexRequest)

10
dom/indexedDB/AsyncConnectionHelper.cpp
View File

@ -47,7 +47,7 @@
#include "nsThreadUtils.h"
#include "IDBEvents.h"
#include "IDBTransactionRequest.h"
#include "IDBTransaction.h"
#include "TransactionThreadPool.h"
using mozilla::TimeStamp;
@ -67,12 +67,12 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIEVENTTARGET
TransactionPoolEventTarget(IDBTransactionRequest* aTransaction)
TransactionPoolEventTarget(IDBTransaction* aTransaction)
: mTransaction(aTransaction)
{ }
private:
IDBTransactionRequest* mTransaction;
IDBTransaction* mTransaction;
};
} // anonymous namespace
@ -89,7 +89,7 @@ AsyncConnectionHelper::AsyncConnectionHelper(IDBDatabaseRequest* aDatabase,
NS_ASSERTION(mRequest, "Null request!");
}
AsyncConnectionHelper::AsyncConnectionHelper(IDBTransactionRequest* aTransaction,
AsyncConnectionHelper::AsyncConnectionHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest)
: mDatabase(aTransaction->mDatabase),
mTransaction(aTransaction),
@ -112,7 +112,7 @@ AsyncConnectionHelper::~AsyncConnectionHelper()
IDBDatabaseRequest* database;
mDatabase.forget(&database);
IDBTransactionRequest* transaction;
IDBTransaction* transaction;
mTransaction.forget(&transaction);
IDBRequest* request;

6
dom/indexedDB/AsyncConnectionHelper.h
View File

@ -56,7 +56,7 @@ class mozIStorageConnection;
BEGIN_INDEXEDDB_NAMESPACE
class IDBTransactionRequest;
class IDBTransaction;
/**
* Must be subclassed. The subclass must implement DoDatabaseWork. It may then
@ -100,7 +100,7 @@ protected:
AsyncConnectionHelper(IDBDatabaseRequest* aDatabase,
IDBRequest* aRequest);
AsyncConnectionHelper(IDBTransactionRequest* aTransaction,
AsyncConnectionHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest);
virtual ~AsyncConnectionHelper();
@ -155,7 +155,7 @@ protected:
protected:
nsRefPtr<IDBDatabaseRequest> mDatabase;
nsRefPtr<IDBTransactionRequest> mTransaction;
nsRefPtr<IDBTransaction> mTransaction;
nsRefPtr<IDBRequest> mRequest;
private:

14
dom/indexedDB/IDBCursorRequest.cpp
View File

@ -59,7 +59,7 @@
#include "IDBEvents.h"
#include "IDBIndexRequest.h"
#include "IDBObjectStoreRequest.h"
#include "IDBTransactionRequest.h"
#include "IDBTransaction.h"
#include "Savepoint.h"
#include "TransactionThreadPool.h"
@ -70,7 +70,7 @@ namespace {
class UpdateHelper : public AsyncConnectionHelper
{
public:
UpdateHelper(IDBTransactionRequest* aTransaction,
UpdateHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
PRInt64 aObjectStoreID,
const nsAString& aValue,
@ -98,7 +98,7 @@ private:
class RemoveHelper : public AsyncConnectionHelper
{
public:
RemoveHelper(IDBTransactionRequest* aTransaction,
RemoveHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
PRInt64 aObjectStoreID,
const Key& aKey,
@ -142,7 +142,7 @@ END_INDEXEDDB_NAMESPACE
// static
already_AddRefed<IDBCursorRequest>
IDBCursorRequest::Create(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
IDBObjectStoreRequest* aObjectStore,
PRUint16 aDirection,
nsTArray<KeyValuePair>& aData)
@ -169,7 +169,7 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
// static
already_AddRefed<IDBCursorRequest>
IDBCursorRequest::Create(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
IDBIndexRequest* aIndex,
PRUint16 aDirection,
nsTArray<KeyKeyPair>& aData)
@ -197,7 +197,7 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
// static
already_AddRefed<IDBCursorRequest>
IDBCursorRequest::Create(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
IDBIndexRequest* aIndex,
PRUint16 aDirection,
nsTArray<KeyValuePair>& aData)
@ -225,7 +225,7 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
// static
already_AddRefed<IDBCursorRequest>
IDBCursorRequest::CreateCommon(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
PRUint16 aDirection)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");

12
dom/indexedDB/IDBCursorRequest.h
View File

@ -52,7 +52,7 @@ BEGIN_INDEXEDDB_NAMESPACE
class IDBIndexRequest;
class IDBRequest;
class IDBObjectStoreRequest;
class IDBTransactionRequest;
class IDBTransaction;
struct KeyValuePair
{
@ -81,7 +81,7 @@ public:
static
already_AddRefed<IDBCursorRequest>
Create(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
IDBObjectStoreRequest* aObjectStore,
PRUint16 aDirection,
nsTArray<KeyValuePair>& aData);
@ -89,7 +89,7 @@ public:
static
already_AddRefed<IDBCursorRequest>
Create(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
IDBIndexRequest* aIndex,
PRUint16 aDirection,
nsTArray<KeyKeyPair>& aData);
@ -97,7 +97,7 @@ public:
static
already_AddRefed<IDBCursorRequest>
Create(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
IDBIndexRequest* aIndex,
PRUint16 aDirection,
nsTArray<KeyValuePair>& aData);
@ -116,11 +116,11 @@ protected:
static
already_AddRefed<IDBCursorRequest>
CreateCommon(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
PRUint16 aDirection);
nsRefPtr<IDBRequest> mRequest;
nsRefPtr<IDBTransactionRequest> mTransaction;
nsRefPtr<IDBTransaction> mTransaction;
nsRefPtr<IDBObjectStoreRequest> mObjectStore;
nsRefPtr<IDBIndexRequest> mIndex;

44
dom/indexedDB/IDBDatabaseRequest.cpp
View File

@ -40,7 +40,6 @@
#include "IDBDatabaseRequest.h"
#include "nsIIDBDatabaseException.h"
#include "nsIIDBTransactionRequest.h"
#include "mozilla/storage.h"
#include "nsDOMClassInfo.h"
@ -51,7 +50,7 @@
#include "DatabaseInfo.h"
#include "IDBEvents.h"
#include "IDBObjectStoreRequest.h"
#include "IDBTransactionRequest.h"
#include "IDBTransaction.h"
#include "IDBFactory.h"
#include "LazyIdleThread.h"
@ -72,7 +71,7 @@ isupports_cast(IDBDatabaseRequest* aClassPtr)
class SetVersionHelper : public AsyncConnectionHelper
{
public:
SetVersionHelper(IDBTransactionRequest* aTransaction,
SetVersionHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
const nsAString& aVersion)
: AsyncConnectionHelper(aTransaction, aRequest), mVersion(aVersion)
@ -89,7 +88,7 @@ private:
class CreateObjectStoreHelper : public AsyncConnectionHelper
{
public:
CreateObjectStoreHelper(IDBTransactionRequest* aTransaction,
CreateObjectStoreHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
const nsAString& aName,
const nsAString& aKeyPath,
@ -115,7 +114,7 @@ protected:
class RemoveObjectStoreHelper : public AsyncConnectionHelper
{
public:
RemoveObjectStoreHelper(IDBTransactionRequest* aTransaction,
RemoveObjectStoreHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
const nsAString& aName)
: AsyncConnectionHelper(aTransaction, aRequest), mName(aName)
@ -400,10 +399,9 @@ IDBDatabaseRequest::CreateObjectStore(const nsAString& aName,
return nsIIDBDatabaseException::UNKNOWN_ERR;
}
nsRefPtr<IDBTransactionRequest> transaction =
IDBTransactionRequest::Create(this, objectStores,
nsIIDBTransaction::READ_WRITE,
kDefaultDatabaseTimeoutSeconds);
nsRefPtr<IDBTransaction> transaction =
IDBTransaction::Create(this, objectStores, nsIIDBTransaction::READ_WRITE,
kDefaultDatabaseTimeoutSeconds);
nsRefPtr<CreateObjectStoreHelper> helper =
new CreateObjectStoreHelper(transaction, request, aName, keyPath,
@ -441,10 +439,9 @@ IDBDatabaseRequest::RemoveObjectStore(const nsAString& aName,
return NS_ERROR_OUT_OF_MEMORY;
}
nsRefPtr<IDBTransactionRequest> transaction =
IDBTransactionRequest::Create(this, storesToOpen,
nsIIDBTransaction::READ_WRITE,
kDefaultDatabaseTimeoutSeconds);
nsRefPtr<IDBTransaction> transaction =
IDBTransaction::Create(this, storesToOpen, nsIIDBTransaction::READ_WRITE,
kDefaultDatabaseTimeoutSeconds);
NS_ENSURE_TRUE(transaction, NS_ERROR_FAILURE);
@ -475,10 +472,9 @@ IDBDatabaseRequest::SetVersion(const nsAString& aVersion,
// Lock the whole database
nsTArray<nsString> storesToOpen;
nsRefPtr<IDBTransactionRequest> transaction =
IDBTransactionRequest::Create(this, storesToOpen,
IDBTransactionRequest::FULL_LOCK,
kDefaultDatabaseTimeoutSeconds);
nsRefPtr<IDBTransaction> transaction =
IDBTransaction::Create(this, storesToOpen, IDBTransaction::FULL_LOCK,
kDefaultDatabaseTimeoutSeconds);
NS_ENSURE_TRUE(transaction, NS_ERROR_FAILURE);
nsRefPtr<SetVersionHelper> helper =
@ -495,7 +491,7 @@ IDBDatabaseRequest::Transaction(nsIVariant* aStoreNames,
PRUint16 aMode,
PRUint32 aTimeout,
PRUint8 aOptionalArgCount,
nsIIDBTransactionRequest** _retval)
nsIIDBTransaction** _retval)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -617,9 +613,9 @@ IDBDatabaseRequest::Transaction(nsIVariant* aStoreNames,
return NS_ERROR_ILLEGAL_VALUE;
}
nsRefPtr<IDBTransactionRequest> transaction =
IDBTransactionRequest::Create(this, storesToOpen, aMode,
kDefaultDatabaseTimeoutSeconds);
nsRefPtr<IDBTransaction> transaction =
IDBTransaction::Create(this, storesToOpen, aMode,
kDefaultDatabaseTimeoutSeconds);
NS_ENSURE_TRUE(transaction, NS_ERROR_FAILURE);
transaction.forget(_retval);
@ -665,9 +661,9 @@ IDBDatabaseRequest::ObjectStore(const nsAString& aName,
return NS_ERROR_OUT_OF_MEMORY;
}
nsRefPtr<IDBTransactionRequest> transaction =
IDBTransactionRequest::Create(this, storesToOpen, aMode,
kDefaultDatabaseTimeoutSeconds);
nsRefPtr<IDBTransaction> transaction =
IDBTransaction::Create(this, storesToOpen, aMode,
kDefaultDatabaseTimeoutSeconds);
NS_ENSURE_TRUE(transaction, NS_ERROR_FAILURE);
nsresult rv = transaction->ObjectStore(aName, _retval);

2
dom/indexedDB/IDBDatabaseRequest.h
View File

@ -53,7 +53,7 @@ BEGIN_INDEXEDDB_NAMESPACE
class AsyncConnectionHelper;
struct DatabaseInfo;
class IDBTransactionRequest;
class IDBTransaction;
class IDBDatabaseRequest : public IDBRequest::Generator,
public nsIIDBDatabaseRequest,

12
dom/indexedDB/IDBEvents.cpp
View File

@ -49,7 +49,7 @@
#include "nsThreadUtils.h"
#include "IDBRequest.h"
#include "IDBTransactionRequest.h"
#include "IDBTransaction.h"
#define NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_CONDITIONAL(_class, _condition) \
if ((_condition) && (aIID.Equals(NS_GET_IID(nsIClassInfo)) || \
@ -294,7 +294,7 @@ IDBErrorEvent::SetMessage(const nsAString& aMessage)
already_AddRefed<nsIDOMEvent>
IDBSuccessEvent::Create(IDBRequest* aRequest,
nsIVariant* aResult,
nsIIDBTransactionRequest* aTransaction)
nsIIDBTransaction* aTransaction)
{
nsRefPtr<IDBSuccessEvent> event(new IDBSuccessEvent());
@ -318,7 +318,7 @@ IDBSuccessEvent::Create(IDBRequest* aRequest,
already_AddRefed<nsIRunnable>
IDBSuccessEvent::CreateRunnable(IDBRequest* aRequest,
nsIVariant* aResult,
nsIIDBTransactionRequest* aTransaction)
nsIIDBTransaction* aTransaction)
{
nsCOMPtr<nsIDOMEvent> event =
IDBSuccessEvent::Create(aRequest, aResult, aTransaction);
@ -351,16 +351,16 @@ IDBSuccessEvent::GetResult(nsIVariant** aResult)
}
NS_IMETHODIMP
IDBSuccessEvent::GetTransaction(nsIIDBTransactionRequest** aTransaction)
IDBSuccessEvent::GetTransaction(nsIIDBTransaction** aTransaction)
{
nsCOMPtr<nsIIDBTransactionRequest> transaction(mTransaction);
nsCOMPtr<nsIIDBTransaction> transaction(mTransaction);
transaction.forget(aTransaction);
return NS_OK;
}
nsresult
GetSuccessEvent::Init(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction)
IDBTransaction* aTransaction)
{
mSource = aRequest->GetGenerator();
mTransaction = aTransaction;

12
dom/indexedDB/IDBEvents.h
View File

@ -46,7 +46,7 @@
#include "nsIIDBErrorEvent.h"
#include "nsIIDBSuccessEvent.h"
#include "nsIIDBTransactionEvent.h"
#include "nsIIDBTransactionRequest.h"
#include "nsIIDBTransaction.h"
#include "nsIRunnable.h"
#include "nsIVariant.h"
@ -64,7 +64,7 @@
BEGIN_INDEXEDDB_NAMESPACE
class IDBRequest;
class IDBTransactionRequest;
class IDBTransaction;
class IDBEvent : public nsDOMEvent,
public nsIIDBEvent
@ -125,18 +125,18 @@ public:
static already_AddRefed<nsIDOMEvent>
Create(IDBRequest* aRequest,
nsIVariant* aResult,
nsIIDBTransactionRequest* aTransaction);
nsIIDBTransaction* aTransaction);
static already_AddRefed<nsIRunnable>
CreateRunnable(IDBRequest* aRequest,
nsIVariant* aResult,
nsIIDBTransactionRequest* aTransaction);
nsIIDBTransaction* aTransaction);
protected:
IDBSuccessEvent() { }
nsCOMPtr<nsIVariant> mResult;
nsCOMPtr<nsIIDBTransactionRequest> mTransaction;
nsCOMPtr<nsIIDBTransaction> mTransaction;
};
class GetSuccessEvent : public IDBSuccessEvent
@ -158,7 +158,7 @@ public:
NS_IMETHOD GetResult(nsIVariant** aResult);
nsresult Init(IDBRequest* aRequest,
IDBTransactionRequest* aTransaction);
IDBTransaction* aTransaction);
private:
nsString mValue;

14
dom/indexedDB/IDBIndexRequest.cpp
View File

@ -51,7 +51,7 @@
#include "IDBCursorRequest.h"
#include "IDBEvents.h"
#include "IDBObjectStoreRequest.h"
#include "IDBTransactionRequest.h"
#include "IDBTransaction.h"
#include "DatabaseInfo.h"
USING_INDEXEDDB_NAMESPACE
@ -61,7 +61,7 @@ namespace {
class GetHelper : public AsyncConnectionHelper
{
public:
GetHelper(IDBTransactionRequest* aTransaction,
GetHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
const Key& aKey,
PRInt64 aId,
@ -85,7 +85,7 @@ protected:
class GetObjectHelper : public GetHelper
{
public:
GetObjectHelper(IDBTransactionRequest* aTransaction,
GetObjectHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
const Key& aKey,
PRInt64 aId,
@ -104,7 +104,7 @@ protected:
class GetAllHelper : public GetHelper
{
public:
GetAllHelper(IDBTransactionRequest* aTransaction,
GetAllHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
const Key& aKey,
PRInt64 aId,
@ -126,7 +126,7 @@ protected:
class GetAllObjectsHelper : public GetHelper
{
public:
GetAllObjectsHelper(IDBTransactionRequest* aTransaction,
GetAllObjectsHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
const Key& aKey,
PRInt64 aId,
@ -148,7 +148,7 @@ protected:
class OpenCursorHelper : public AsyncConnectionHelper
{
public:
OpenCursorHelper(IDBTransactionRequest* aTransaction,
OpenCursorHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
IDBIndexRequest* aIndex,
PRInt64 aId,
@ -187,7 +187,7 @@ private:
class OpenObjectCursorHelper : public AsyncConnectionHelper
{
public:
OpenObjectCursorHelper(IDBTransactionRequest* aTransaction,
OpenObjectCursorHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
IDBIndexRequest* aIndex,
PRInt64 aId,

20
dom/indexedDB/IDBObjectStoreRequest.cpp
View File

@ -61,7 +61,7 @@
#include "AsyncConnectionHelper.h"
#include "IDBCursorRequest.h"
#include "IDBKeyRange.h"
#include "IDBTransactionRequest.h"
#include "IDBTransaction.h"
#include "DatabaseInfo.h"
#include "Savepoint.h"
@ -76,7 +76,7 @@ namespace {
class AddHelper : public AsyncConnectionHelper
{
public:
AddHelper(IDBTransactionRequest* aTransaction,
AddHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
PRInt64 aObjectStoreID,
const nsAString& aKeyPath,
@ -116,7 +116,7 @@ private:
class GetHelper : public AsyncConnectionHelper
{
public:
GetHelper(IDBTransactionRequest* aTransaction,
GetHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
PRInt64 aObjectStoreID,
const Key& aKey,
@ -142,7 +142,7 @@ private:
class RemoveHelper : public GetHelper
{
public:
RemoveHelper(IDBTransactionRequest* aTransaction,
RemoveHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
PRInt64 aObjectStoreID,
const Key& aKey,
@ -158,7 +158,7 @@ public:
class OpenCursorHelper : public AsyncConnectionHelper
{
public:
OpenCursorHelper(IDBTransactionRequest* aTransaction,
OpenCursorHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
IDBObjectStoreRequest* aObjectStore,
const Key& aLeftKey,
@ -190,7 +190,7 @@ private:
class CreateIndexHelper : public AsyncConnectionHelper
{
public:
CreateIndexHelper(IDBTransactionRequest* aTransaction,
CreateIndexHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
const nsAString& aName,
const nsAString& aKeyPath,
@ -222,7 +222,7 @@ private:
class RemoveIndexHelper : public AsyncConnectionHelper
{
public:
RemoveIndexHelper(IDBTransactionRequest* aDatabase,
RemoveIndexHelper(IDBTransaction* aDatabase,
IDBRequest* aRequest,
const nsAString& aName,
IDBObjectStoreRequest* aObjectStore)
@ -242,7 +242,7 @@ private:
class GetAllHelper : public AsyncConnectionHelper
{
public:
GetAllHelper(IDBTransactionRequest* aTransaction,
GetAllHelper(IDBTransaction* aTransaction,
IDBRequest* aRequest,
PRInt64 aObjectStoreID,
const Key& aLeftKey,
@ -323,7 +323,7 @@ GetKeyFromObject(JSContext* aCx,
// static
already_AddRefed<IDBObjectStoreRequest>
IDBObjectStoreRequest::Create(IDBDatabaseRequest* aDatabase,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
const ObjectStoreInfo* aStoreInfo,
PRUint16 aMode)
{
@ -559,7 +559,7 @@ IDBObjectStoreRequest::GetIndexUpdateInfo(ObjectStoreInfo* aObjectStoreInfo,
/* static */
nsresult
IDBObjectStoreRequest::UpdateIndexes(IDBTransactionRequest* aTransaction,
IDBObjectStoreRequest::UpdateIndexes(IDBTransaction* aTransaction,
PRInt64 aObjectStoreId,
const Key& aObjectStoreKey,
bool aAutoIncrement,

10
dom/indexedDB/IDBObjectStoreRequest.h
View File

@ -42,7 +42,7 @@
#include "mozilla/dom/indexedDB/IDBRequest.h"
#include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
#include "mozilla/dom/indexedDB/IDBTransactionRequest.h"
#include "mozilla/dom/indexedDB/IDBTransaction.h"
#include "nsIIDBObjectStoreRequest.h"
@ -215,7 +215,7 @@ public:
static already_AddRefed<IDBObjectStoreRequest>
Create(IDBDatabaseRequest* aDatabase,
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
const ObjectStoreInfo* aInfo,
PRUint16 aMode);
@ -240,7 +240,7 @@ public:
nsTArray<IndexUpdateInfo>& aUpdateInfoArray);
static nsresult
UpdateIndexes(IDBTransactionRequest* aTransaction,
UpdateIndexes(IDBTransaction* aTransaction,
PRInt64 aObjectStoreId,
const Key& aObjectStoreKey,
bool aAutoIncrement,
@ -274,7 +274,7 @@ public:
return mKeyPath;
}
IDBTransactionRequest* Transaction()
IDBTransaction* Transaction()
{
return mTransaction;
}
@ -293,7 +293,7 @@ protected:
private:
nsRefPtr<IDBDatabaseRequest> mDatabase;
nsRefPtr<IDBTransactionRequest> mTransaction;
nsRefPtr<IDBTransaction> mTransaction;
PRInt64 mId;
nsString mName;

109
dom/indexedDB/IDBTransactionRequest.cpp → dom/indexedDB/IDBTransaction.cpp
View File

@ -37,7 +37,7 @@
*
* ***** END LICENSE BLOCK ***** */
#include "IDBTransactionRequest.h"
#include "IDBTransaction.h"
#include "mozilla/storage.h"
#include "nsDOMClassInfo.h"
@ -71,15 +71,15 @@ DoomCachedStatements(const nsACString& aQuery,
} // anonymous namespace
// static
already_AddRefed<IDBTransactionRequest>
IDBTransactionRequest::Create(IDBDatabaseRequest* aDatabase,
nsTArray<nsString>& aObjectStoreNames,
PRUint16 aMode,
PRUint32 aTimeout)
already_AddRefed<IDBTransaction>
IDBTransaction::Create(IDBDatabaseRequest* aDatabase,
nsTArray<nsString>& aObjectStoreNames,
PRUint16 aMode,
PRUint32 aTimeout)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
nsRefPtr<IDBTransactionRequest> transaction = new IDBTransactionRequest();
nsRefPtr<IDBTransaction> transaction = new IDBTransaction();
transaction->mDatabase = aDatabase;
transaction->mMode = aMode;
@ -98,7 +98,7 @@ IDBTransactionRequest::Create(IDBDatabaseRequest* aDatabase,
return transaction.forget();
}
IDBTransactionRequest::IDBTransactionRequest()
IDBTransaction::IDBTransaction()
: mReadyState(nsIIDBTransaction::INITIAL),
mMode(nsIIDBTransaction::READ_ONLY),
mTimeout(0),
@ -110,7 +110,7 @@ IDBTransactionRequest::IDBTransactionRequest()
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
}
IDBTransactionRequest::~IDBTransactionRequest()
IDBTransaction::~IDBTransaction()
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(!mPendingRequests, "Should have no pending requests here!");
@ -123,7 +123,7 @@ IDBTransactionRequest::~IDBTransactionRequest()
}
void
IDBTransactionRequest::OnNewRequest()
IDBTransaction::OnNewRequest()
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
if (!mPendingRequests) {
@ -135,7 +135,7 @@ IDBTransactionRequest::OnNewRequest()
}
void
IDBTransactionRequest::OnRequestFinished()
IDBTransaction::OnRequestFinished()
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(mPendingRequests, "Mismatched calls!");
@ -151,7 +151,7 @@ IDBTransactionRequest::OnRequestFinished()
}
nsresult
IDBTransactionRequest::CommitOrRollback()
IDBTransaction::CommitOrRollback()
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(mReadyState == nsIIDBTransaction::DONE, "Bad readyState!");
@ -171,7 +171,7 @@ IDBTransactionRequest::CommitOrRollback()
}
bool
IDBTransactionRequest::StartSavepoint()
IDBTransaction::StartSavepoint()
{
NS_PRECONDITION(!NS_IsMainThread(), "Wrong thread!");
NS_PRECONDITION(mConnection, "No connection!");
@ -199,7 +199,7 @@ IDBTransactionRequest::StartSavepoint()
}
nsresult
IDBTransactionRequest::ReleaseSavepoint()
IDBTransaction::ReleaseSavepoint()
{
NS_PRECONDITION(!NS_IsMainThread(), "Wrong thread!");
NS_PRECONDITION(mConnection, "No connection!");
@ -216,7 +216,7 @@ IDBTransactionRequest::ReleaseSavepoint()
}
void
IDBTransactionRequest::RollbackSavepoint()
IDBTransaction::RollbackSavepoint()
{
NS_PRECONDITION(!NS_IsMainThread(), "Wrong thread!");
NS_PRECONDITION(mConnection, "No connection!");
@ -232,7 +232,7 @@ IDBTransactionRequest::RollbackSavepoint()
}
nsresult
IDBTransactionRequest::GetOrCreateConnection(mozIStorageConnection** aResult)
IDBTransaction::GetOrCreateConnection(mozIStorageConnection** aResult)
{
NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
@ -250,9 +250,9 @@ IDBTransactionRequest::GetOrCreateConnection(mozIStorageConnection** aResult)
}
already_AddRefed<mozIStorageStatement>
IDBTransactionRequest::AddStatement(bool aCreate,
bool aOverwrite,
bool aAutoIncrement)
IDBTransaction::AddStatement(bool aCreate,
bool aOverwrite,
bool aAutoIncrement)
{
#ifdef DEBUG
if (!aCreate) {
@ -301,7 +301,7 @@ IDBTransactionRequest::AddStatement(bool aCreate,
}
already_AddRefed<mozIStorageStatement>
IDBTransactionRequest::RemoveStatement(bool aAutoIncrement)
IDBTransaction::RemoveStatement(bool aAutoIncrement)
{
if (aAutoIncrement) {
return GetCachedStatement(
@ -318,7 +318,7 @@ IDBTransactionRequest::RemoveStatement(bool aAutoIncrement)
}
already_AddRefed<mozIStorageStatement>
IDBTransactionRequest::GetStatement(bool aAutoIncrement)
IDBTransaction::GetStatement(bool aAutoIncrement)
{
if (aAutoIncrement) {
return GetCachedStatement(
@ -337,8 +337,8 @@ IDBTransactionRequest::GetStatement(bool aAutoIncrement)
}
already_AddRefed<mozIStorageStatement>
IDBTransactionRequest::IndexGetStatement(bool aUnique,
bool aAutoIncrement)
IDBTransaction::IndexGetStatement(bool aUnique,
bool aAutoIncrement)
{
if (aAutoIncrement) {
if (aUnique) {
@ -373,8 +373,8 @@ IDBTransactionRequest::IndexGetStatement(bool aUnique,
}
already_AddRefed<mozIStorageStatement>
IDBTransactionRequest::IndexGetObjectStatement(bool aUnique,
bool aAutoIncrement)
IDBTransaction::IndexGetObjectStatement(bool aUnique,
bool aAutoIncrement)
{
if (aAutoIncrement) {
if (aUnique) {
@ -417,9 +417,9 @@ IDBTransactionRequest::IndexGetObjectStatement(bool aUnique,
}
already_AddRefed<mozIStorageStatement>
IDBTransactionRequest::IndexUpdateStatement(bool aAutoIncrement,
bool aUnique,
bool aOverwrite)
IDBTransaction::IndexUpdateStatement(bool aAutoIncrement,
bool aUnique,
bool aOverwrite)
{
if (aAutoIncrement) {
if (aUnique) {
@ -478,7 +478,7 @@ IDBTransactionRequest::IndexUpdateStatement(bool aAutoIncrement,
}
already_AddRefed<mozIStorageStatement>
IDBTransactionRequest::GetCachedStatement(const nsACString& aQuery)
IDBTransaction::GetCachedStatement(const nsACString& aQuery)
{
NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(!aQuery.IsEmpty(), "Empty sql statement!");
@ -513,7 +513,7 @@ IDBTransactionRequest::GetCachedStatement(const nsACString& aQuery)
#ifdef DEBUG
bool
IDBTransactionRequest::TransactionIsOpen() const
IDBTransaction::TransactionIsOpen() const
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
return mReadyState == nsIIDBTransaction::INITIAL ||
@ -521,42 +521,41 @@ IDBTransactionRequest::TransactionIsOpen() const
}
bool
IDBTransactionRequest::IsWriteAllowed() const
IDBTransaction::IsWriteAllowed() const
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
return mMode == nsIIDBTransaction::READ_WRITE;
}
#endif
NS_IMPL_CYCLE_COLLECTION_CLASS(IDBTransactionRequest)
NS_IMPL_CYCLE_COLLECTION_CLASS(IDBTransaction)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IDBTransactionRequest,
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IDBTransaction,
nsDOMEventTargetHelper)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnCompleteListener)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnAbortListener)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnTimeoutListener)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(IDBTransactionRequest,
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(IDBTransaction,
nsDOMEventTargetHelper)
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnCompleteListener)
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnAbortListener)
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnTimeoutListener)
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBTransactionRequest)
NS_INTERFACE_MAP_ENTRY(nsIIDBTransactionRequest)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBTransaction)
NS_INTERFACE_MAP_ENTRY(nsIIDBTransaction)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBTransactionRequest)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBTransaction)
NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
NS_IMPL_ADDREF_INHERITED(IDBTransactionRequest, nsDOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(IDBTransactionRequest, nsDOMEventTargetHelper)
NS_IMPL_ADDREF_INHERITED(IDBTransaction, nsDOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(IDBTransaction, nsDOMEventTargetHelper)
DOMCI_DATA(IDBTransactionRequest, IDBTransactionRequest)
DOMCI_DATA(IDBTransaction, IDBTransaction)
NS_IMETHODIMP
IDBTransactionRequest::GetDb(nsIIDBDatabase** aDB)
IDBTransaction::GetDb(nsIIDBDatabase** aDB)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -565,7 +564,7 @@ IDBTransactionRequest::GetDb(nsIIDBDatabase** aDB)
}
NS_IMETHODIMP
IDBTransactionRequest::GetReadyState(PRUint16* aReadyState)
IDBTransaction::GetReadyState(PRUint16* aReadyState)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -574,17 +573,17 @@ IDBTransactionRequest::GetReadyState(PRUint16* aReadyState)
}
NS_IMETHODIMP
IDBTransactionRequest::GetMode(PRUint16* aMode)
IDBTransaction::GetMode(PRUint16* aMode)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
*aMode = mMode == IDBTransactionRequest::FULL_LOCK ?
*aMode = mMode == IDBTransaction::FULL_LOCK ?
nsIIDBTransaction::READ_WRITE : mMode;
return NS_OK;
}
NS_IMETHODIMP
IDBTransactionRequest::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
IDBTransaction::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -593,7 +592,7 @@ IDBTransactionRequest::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
nsTArray<nsString> stackArray;
nsTArray<nsString>* arrayOfNames;
if (mMode == IDBTransactionRequest::FULL_LOCK) {
if (mMode == IDBTransaction::FULL_LOCK) {
DatabaseInfo* info;
if (!DatabaseInfo::Get(mDatabase->Id(), &info)) {
NS_ERROR("This should never fail!");
@ -621,8 +620,8 @@ IDBTransactionRequest::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
}
NS_IMETHODIMP
IDBTransactionRequest::ObjectStore(const nsAString& aName,
nsIIDBObjectStoreRequest** _retval)
IDBTransaction::ObjectStore(const nsAString& aName,
nsIIDBObjectStoreRequest** _retval)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -656,7 +655,7 @@ IDBTransactionRequest::ObjectStore(const nsAString& aName,
}
NS_IMETHODIMP
IDBTransactionRequest::Abort()
IDBTransaction::Abort()
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -671,7 +670,7 @@ IDBTransactionRequest::Abort()
}
NS_IMETHODIMP
IDBTransactionRequest::GetOncomplete(nsIDOMEventListener** aOncomplete)
IDBTransaction::GetOncomplete(nsIDOMEventListener** aOncomplete)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -679,7 +678,7 @@ IDBTransactionRequest::GetOncomplete(nsIDOMEventListener** aOncomplete)
}
NS_IMETHODIMP
IDBTransactionRequest::SetOncomplete(nsIDOMEventListener* aOncomplete)
IDBTransaction::SetOncomplete(nsIDOMEventListener* aOncomplete)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -688,7 +687,7 @@ IDBTransactionRequest::SetOncomplete(nsIDOMEventListener* aOncomplete)
}
NS_IMETHODIMP
IDBTransactionRequest::GetOnabort(nsIDOMEventListener** aOnabort)
IDBTransaction::GetOnabort(nsIDOMEventListener** aOnabort)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -696,7 +695,7 @@ IDBTransactionRequest::GetOnabort(nsIDOMEventListener** aOnabort)
}
NS_IMETHODIMP
IDBTransactionRequest::SetOnabort(nsIDOMEventListener* aOnabort)
IDBTransaction::SetOnabort(nsIDOMEventListener* aOnabort)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -705,7 +704,7 @@ IDBTransactionRequest::SetOnabort(nsIDOMEventListener* aOnabort)
}
NS_IMETHODIMP
IDBTransactionRequest::GetOntimeout(nsIDOMEventListener** aOntimeout)
IDBTransaction::GetOntimeout(nsIDOMEventListener** aOntimeout)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -713,7 +712,7 @@ IDBTransactionRequest::GetOntimeout(nsIDOMEventListener** aOntimeout)
}
NS_IMETHODIMP
IDBTransactionRequest::SetOntimeout(nsIDOMEventListener* aOntimeout)
IDBTransaction::SetOntimeout(nsIDOMEventListener* aOntimeout)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");

31
dom/indexedDB/IDBTransactionRequest.h → dom/indexedDB/IDBTransaction.h
View File

@ -37,13 +37,13 @@
*
* ***** END LICENSE BLOCK ***** */
#ifndef mozilla_dom_indexeddb_idbtransactionrequest_h__
#define mozilla_dom_indexeddb_idbtransactionrequest_h__
#ifndef mozilla_dom_indexeddb_idbtransaction_h__
#define mozilla_dom_indexeddb_idbtransaction_h__
#include "mozilla/dom/indexedDB/IDBRequest.h"
#include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
#include "nsIIDBTransactionRequest.h"
#include "nsIIDBTransaction.h"
#include "nsIRunnable.h"
#include "nsDOMEventTargetHelper.h"
@ -62,9 +62,9 @@ class CommitHelper;
struct ObjectStoreInfo;
class TransactionThreadPool;
class IDBTransactionRequest : public nsDOMEventTargetHelper,
public IDBRequest::Generator,
public nsIIDBTransactionRequest
class IDBTransaction : public nsDOMEventTargetHelper,
public IDBRequest::Generator,
public nsIIDBTransaction
{
friend class AsyncConnectionHelper;
friend class CommitHelper;
@ -73,12 +73,11 @@ class IDBTransactionRequest : public nsDOMEventTargetHelper,
public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIIDBTRANSACTION
NS_DECL_NSIIDBTRANSACTIONREQUEST
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(IDBTransactionRequest,
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(IDBTransaction,
nsDOMEventTargetHelper)
static already_AddRefed<IDBTransactionRequest>
static already_AddRefed<IDBTransaction>
Create(IDBDatabaseRequest* aDatabase,
nsTArray<nsString>& aObjectStoreNames,
PRUint16 aMode,
@ -146,8 +145,8 @@ public:
enum { FULL_LOCK = nsIIDBTransaction::SNAPSHOT_READ + 1 };
private:
IDBTransactionRequest();
~IDBTransactionRequest();
IDBTransaction();
~IDBTransaction();
// Only meant to be called on mStorageThread!
nsresult GetOrCreateConnection(mozIStorageConnection** aConnection);
@ -183,7 +182,7 @@ NS_STACK_CLASS
class AutoTransactionRequestNotifier
{
public:
AutoTransactionRequestNotifier(IDBTransactionRequest* aTransaction)
AutoTransactionRequestNotifier(IDBTransaction* aTransaction)
: mTransaction(aTransaction)
{
NS_ASSERTION(mTransaction, "Null pointer!");
@ -196,7 +195,7 @@ public:
}
private:
nsRefPtr<IDBTransactionRequest> mTransaction;
nsRefPtr<IDBTransaction> mTransaction;
};
class CommitHelper : public nsIRunnable
@ -205,7 +204,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIRUNNABLE
CommitHelper(IDBTransactionRequest* aTransaction)
CommitHelper(IDBTransaction* aTransaction)
: mTransaction(aTransaction),
mAborted(!!aTransaction->mAborted),
mHasInitialSavepoint(!!aTransaction->mHasInitialSavepoint)
@ -227,7 +226,7 @@ public:
}
private:
nsRefPtr<IDBTransactionRequest> mTransaction;
nsRefPtr<IDBTransaction> mTransaction;
nsCOMPtr<mozIStorageConnection> mConnection;
nsAutoTArray<nsCOMPtr<nsISupports>, 10> mDoomedObjects;
bool mAborted;
@ -236,4 +235,4 @@ private:
END_INDEXEDDB_NAMESPACE
#endif // mozilla_dom_indexeddb_idbtransactionrequest_h__
#endif // mozilla_dom_indexeddb_idbtransaction_h__

5
dom/indexedDB/Makefile.in
View File

@ -61,7 +61,7 @@ CPPSRCS = \
IDBKeyRange.cpp \
IDBObjectStoreRequest.cpp \
IDBRequest.cpp \
IDBTransactionRequest.cpp \
IDBTransaction.cpp \
IDBFactory.cpp \
LazyIdleThread.cpp \
TransactionThreadPool.cpp \
@ -75,7 +75,7 @@ EXPORTS_mozilla/dom/indexedDB = \
IDBKeyRange.h \
IDBObjectStoreRequest.h \
IDBRequest.h \
IDBTransactionRequest.h \
IDBTransaction.h \
IndexedDatabase.h \
IDBFactory.h \
LazyIdleThread.h \
@ -108,7 +108,6 @@ XPIDLSRCS = \
nsIIDBSuccessEvent.idl \
nsIIDBTransaction.idl \
nsIIDBTransactionEvent.idl \
nsIIDBTransactionRequest.idl \
nsIIDBFactory.idl \
$(NULL)

6
dom/indexedDB/Savepoint.h
View File

@ -41,7 +41,7 @@
#define mozilla_dom_indexeddb_savepoint_h__
// Only meant to be included in IndexedDB source files, not exported.
#include "IDBTransactionRequest.h"
#include "IDBTransaction.h"
BEGIN_INDEXEDDB_NAMESPACE
@ -49,7 +49,7 @@ NS_STACK_CLASS
class Savepoint
{
public:
Savepoint(IDBTransactionRequest* aTransaction)
Savepoint(IDBTransaction* aTransaction)
: mTransaction(aTransaction)
, mHasSavepoint(false)
{
@ -77,7 +77,7 @@ public:
}
private:
IDBTransactionRequest* mTransaction;
IDBTransaction* mTransaction;
bool mHasSavepoint;
};

26
dom/indexedDB/TransactionThreadPool.cpp
View File

@ -71,7 +71,7 @@ struct QueuedDispatchInfo
: finish(false)
{ }
nsRefPtr<IDBTransactionRequest> transaction;
nsRefPtr<IDBTransaction> transaction;
nsCOMPtr<nsIRunnable> runnable;
nsCOMPtr<nsIRunnable> finishRunnable;
bool finish;
@ -83,11 +83,11 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIRUNNABLE
inline FinishTransactionRunnable(IDBTransactionRequest* aTransaction,
inline FinishTransactionRunnable(IDBTransaction* aTransaction,
nsCOMPtr<nsIRunnable>& aFinishRunnable);
private:
IDBTransactionRequest* mTransaction;
IDBTransaction* mTransaction;
nsCOMPtr<nsIRunnable> mFinishRunnable;
};
@ -189,13 +189,13 @@ TransactionThreadPool::Cleanup()
}
void
TransactionThreadPool::FinishTransaction(IDBTransactionRequest* aTransaction)
TransactionThreadPool::FinishTransaction(IDBTransaction* aTransaction)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(aTransaction, "Null pointer!");
// AddRef here because removing from the hash will call Release.
nsRefPtr<IDBTransactionRequest> transaction(aTransaction);
nsRefPtr<IDBTransaction> transaction(aTransaction);
const PRUint32 databaseId = aTransaction->mDatabase->Id();
@ -211,7 +211,7 @@ TransactionThreadPool::FinishTransaction(IDBTransactionRequest* aTransaction)
PRUint32 count = transactionsInProgress.Length();
#ifdef DEBUG
if (aTransaction->mMode == IDBTransactionRequest::FULL_LOCK) {
if (aTransaction->mMode == IDBTransaction::FULL_LOCK) {
NS_ASSERTION(dbTransactionInfo->locked, "Should be locked!");
NS_ASSERTION(count == 1, "More transactions running than should be!");
}
@ -255,7 +255,7 @@ TransactionThreadPool::FinishTransaction(IDBTransactionRequest* aTransaction)
}
bool
TransactionThreadPool::TransactionCanRun(IDBTransactionRequest* aTransaction,
TransactionThreadPool::TransactionCanRun(IDBTransaction* aTransaction,
TransactionQueue** aQueue)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -279,7 +279,7 @@ TransactionThreadPool::TransactionCanRun(IDBTransactionRequest* aTransaction,
PRUint32 transactionCount = transactionsInProgress.Length();
if (mode == IDBTransactionRequest::FULL_LOCK) {
if (mode == IDBTransaction::FULL_LOCK) {
switch (transactionCount) {
case 0: {
*aQueue = nsnull;
@ -390,7 +390,7 @@ TransactionThreadPool::TransactionCanRun(IDBTransactionRequest* aTransaction,
}
nsresult
TransactionThreadPool::Dispatch(IDBTransactionRequest* aTransaction,
TransactionThreadPool::Dispatch(IDBTransaction* aTransaction,
nsIRunnable* aRunnable,
bool aFinish,
nsIRunnable* aFinishRunnable)
@ -423,7 +423,7 @@ TransactionThreadPool::Dispatch(IDBTransactionRequest* aTransaction,
const PRUint32 databaseId = aTransaction->mDatabase->Id();
#ifdef DEBUG
if (aTransaction->mMode == IDBTransactionRequest::FULL_LOCK) {
if (aTransaction->mMode == IDBTransaction::FULL_LOCK) {
NS_ASSERTION(!mTransactionsInProgress.Get(databaseId, nsnull),
"Shouldn't have anything in progress!");
}
@ -438,7 +438,7 @@ TransactionThreadPool::Dispatch(IDBTransactionRequest* aTransaction,
dbTransactionInfo = autoDBTransactionInfo;
}
if (aTransaction->mMode == IDBTransactionRequest::FULL_LOCK) {
if (aTransaction->mMode == IDBTransaction::FULL_LOCK) {
NS_ASSERTION(!dbTransactionInfo->locked, "Already locked?!");
dbTransactionInfo->locked = true;
}
@ -494,7 +494,7 @@ TransactionThreadPool::Observe(nsISupports* /* aSubject */,
}
TransactionThreadPool::
TransactionQueue::TransactionQueue(IDBTransactionRequest* aTransaction,
TransactionQueue::TransactionQueue(IDBTransaction* aTransaction,
nsIRunnable* aRunnable)
: mMutex("TransactionQueue::mMutex"),
mCondVar(mMutex, "TransactionQueue::mCondVar"),
@ -585,7 +585,7 @@ TransactionThreadPool::TransactionQueue::Run()
}
FinishTransactionRunnable::FinishTransactionRunnable(
IDBTransactionRequest* aTransaction,
IDBTransaction* aTransaction,
nsCOMPtr<nsIRunnable>& aFinishRunnable)
: mTransaction(aTransaction)
{

14
dom/indexedDB/TransactionThreadPool.h
View File

@ -51,7 +51,7 @@
#include "nsHashKeys.h"
#include "nsRefPtrHashtable.h"
#include "IDBTransactionRequest.h"
#include "IDBTransaction.h"
class nsIRunnable;
class nsIThreadPool;
@ -73,7 +73,7 @@ public:
static TransactionThreadPool* GetOrCreate();
static void Shutdown();
nsresult Dispatch(IDBTransactionRequest* aTransaction,
nsresult Dispatch(IDBTransaction* aTransaction,
nsIRunnable* aRunnable,
bool aFinish,
nsIRunnable* aFinishRunnable);
@ -85,7 +85,7 @@ protected:
NS_DECL_ISUPPORTS
NS_DECL_NSIRUNNABLE
inline TransactionQueue(IDBTransactionRequest* aTransaction,
inline TransactionQueue(IDBTransaction* aTransaction,
nsIRunnable* aRunnable);
inline void Dispatch(nsIRunnable* aRunnable);
@ -95,7 +95,7 @@ protected:
private:
mozilla::Mutex mMutex;
mozilla::CondVar mCondVar;
IDBTransactionRequest* mTransaction;
IDBTransaction* mTransaction;
nsAutoTArray<nsCOMPtr<nsIRunnable>, 10> mQueue;
nsCOMPtr<nsIRunnable> mFinishRunnable;
bool mShouldFinish;
@ -118,7 +118,7 @@ protected:
: mode(nsIIDBTransaction::READ_ONLY)
{ }
nsRefPtr<IDBTransactionRequest> transaction;
nsRefPtr<IDBTransaction> transaction;
nsRefPtr<TransactionQueue> queue;
nsTArray<TransactionObjectStoreInfo> objectStoreInfo;
PRUint16 mode;
@ -141,9 +141,9 @@ protected:
nsresult Init();
nsresult Cleanup();
void FinishTransaction(IDBTransactionRequest* aTransaction);
void FinishTransaction(IDBTransaction* aTransaction);
bool TransactionCanRun(IDBTransactionRequest* aTransaction,
bool TransactionCanRun(IDBTransaction* aTransaction,
TransactionQueue** aQueue);
nsCOMPtr<nsIThreadPool> mThreadPool;

4
dom/indexedDB/nsIIDBDatabaseRequest.idl
View File

@ -42,7 +42,7 @@
interface nsIVariant;
interface nsIIDBObjectStoreRequest;
interface nsIIDBRequest;
interface nsIIDBTransactionRequest;
interface nsIIDBTransaction;
/**
* IDBDatabaseRequest interface. See
@ -64,7 +64,7 @@ interface nsIIDBDatabaseRequest : nsIIDBDatabase
setVersion(in AString version);
[optional_argc]
nsIIDBTransactionRequest
nsIIDBTransaction
transaction(in nsIVariant storeNames, // js array of strings
[optional /* READ_ONLY */] in unsigned short mode,
[optional /* 5000ms */] in unsigned long timeout);

29
dom/indexedDB/nsIIDBTransaction.idl
View File

@ -39,15 +39,18 @@
#include "nsISupports.idl"
interface nsIDOMEventListener;
interface nsIIDBObjectStoreRequest;
interface nsIIDBRequest;
interface nsIIDBDatabase;
interface nsIDOMDOMStringList;
/**
* IDBDTransaction interface. See
* http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBDTransaction for more
* information.
* http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#idl-def-IDBTransaction
* for more information.
*/
[scriptable, uuid(00c3f651-f4bf-416b-9dc4-759135a35fa9)]
[scriptable, uuid(99bb825e-56aa-4cb9-b640-4fadb00b874d)]
interface nsIIDBTransaction : nsISupports
{
readonly attribute nsIIDBDatabase db;
@ -63,4 +66,24 @@ interface nsIIDBTransaction : nsISupports
readonly attribute unsigned short mode;
readonly attribute nsIDOMDOMStringList objectStoreNames;
nsIIDBObjectStoreRequest
objectStore(in AString name);
// Don't commit the transaction.
void abort();
// Event listener that fires when the transaction is completed
// successfully. Receives an Event.
attribute nsIDOMEventListener oncomplete;
// Event listener that fires when the transaction is aborted.
// Receives an Event.
attribute nsIDOMEventListener onabort;
// Event listener that fires when the transaction times out while
// attempting to grab the relevant locks, as specified by the
// timeoutSeconds parameter
// Receives an Event.
attribute nsIDOMEventListener ontimeout;
};

6
dom/indexedDB/nsIIDBTransactionEvent.idl
View File

@ -39,10 +39,10 @@
#include "nsIIDBSuccessEvent.idl"
interface nsIIDBTransactionRequest;
interface nsIIDBTransaction;
[scriptable, uuid(f84fa3ee-2df2-4d55-b8bc-27d7d9438336)]
[scriptable, uuid(cdf58757-78b9-4f5f-8559-1bf96e1cdfba)]
interface nsIIDBTransactionEvent : nsIIDBSuccessEvent
{
readonly attribute nsIIDBTransactionRequest transaction;
readonly attribute nsIIDBTransaction transaction;
};

73
dom/indexedDB/nsIIDBTransactionRequest.idl
View File

@ -1,73 +0,0 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Indexed Database.
*
* The Initial Developer of the Original Code is
* The Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Ben Turner <bent.mozilla@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsIIDBTransaction.idl"
interface nsIDOMEventListener;
interface nsIIDBObjectStoreRequest;
interface nsIIDBRequest;
/**
* IDBDTransactionRequest interface. See
* http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBDTransactionRequest for
* more information.
*/
[scriptable, uuid(073f5f2e-fecc-4f96-bba2-d8a90532c926)]
interface nsIIDBTransactionRequest : nsIIDBTransaction
{
nsIIDBObjectStoreRequest
objectStore(in AString name);
// Don't commit the transaction.
void abort();
// Event listener that fires when the transaction is completed
// successfully. Receives an Event.
attribute nsIDOMEventListener oncomplete;
// Event listener that fires when the transaction is aborted.
// Receives an Event.
attribute nsIDOMEventListener onabort;
// Event listener that fires when the transaction times out while
// attempting to grab the relevant locks, as specified by the
// timeoutSeconds parameter
// Receives an Event.
attribute nsIDOMEventListener ontimeout;
};

1
js/src/xpconnect/src/dom_quickstubs.qsconf
View File

@ -477,7 +477,6 @@ members = [
# 'nsIIDBSuccessEvent.*',
'nsIIDBTransaction.*',
'nsIIDBTransactionEvent.*',
'nsIIDBTransactionRequest.*',
'nsIIDBFactory.*',
# Remove once XPIDL can handle jsvals
'-nsIIDBObjectStoreRequest.add',