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

Bug 769356: Calling transaction.abort() should leave transaction.error as null, but throwing exceptions should set transaction.error. r=sicking

Browse Source
This commit is contained in:
Kyle Huey 2012-06-29 09:48:34 -07:00
parent c0b8b36893
commit 4eb6d0f6d4
7 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/indexedDB/AsyncConnectionHelper.cpp
View File

@ -438,7 +438,7 @@ AsyncConnectionHelper::OnSuccess()
if ((internalEvent->flags & NS_EVENT_FLAG_EXCEPTION_THROWN) &&
mTransaction &&
mTransaction->IsOpen()) {
rv = mTransaction->Abort();
rv = mTransaction->Abort(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR);
NS_ENSURE_SUCCESS(rv, rv);
}
@ -474,7 +474,7 @@ AsyncConnectionHelper::OnError()
if ((internalEvent->flags & NS_EVENT_FLAG_EXCEPTION_THROWN) &&
mTransaction &&
mTransaction->IsOpen() &&
NS_FAILED(mTransaction->Abort())) {
NS_FAILED(mTransaction->Abort(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR))) {
NS_WARNING("Failed to abort transaction!");
}

2
dom/indexedDB/IDBDatabase.cpp
View File

@ -818,7 +818,7 @@ void
NoRequestDatabaseHelper::OnError()
{
NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
mTransaction->AbortWithCode(GetResultCode());
mTransaction->Abort(GetResultCode());
}
nsresult

2
dom/indexedDB/IDBObjectStore.cpp
View File

@ -2357,7 +2357,7 @@ void
NoRequestObjectStoreHelper::OnError()
{
NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
mTransaction->AbortWithCode(GetResultCode());
mTransaction->Abort(GetResultCode());
}
nsresult

21
dom/indexedDB/IDBTransaction.cpp
View File

@ -498,10 +498,13 @@ IDBTransaction::ClearCreatedFileInfos()
}
nsresult
IDBTransaction::AbortWithCode(nsresult aAbortCode)
IDBTransaction::AbortInternal(nsresult aAbortCode,
already_AddRefed<nsIDOMDOMError> aError)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
nsCOMPtr<nsIDOMDOMError> error = aError;
if (IsFinished()) {
return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR;
}
@ -515,6 +518,7 @@ IDBTransaction::AbortWithCode(nsresult aAbortCode)
mAbortCode = aAbortCode;
mReadyState = IDBTransaction::DONE;
mError = error.forget();
if (GetMode() == IDBTransaction::VERSION_CHANGE) {
// If a version change transaction is aborted, we must revert the world
@ -566,9 +570,18 @@ IDBTransaction::Abort(IDBRequest* aRequest)
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(aRequest, "This is undesirable.");
aRequest->GetError(getter_AddRefs(mError));
nsCOMPtr<nsIDOMDOMError> error;
aRequest->GetError(getter_AddRefs(error));
return AbortWithCode(aRequest->GetErrorCode());
return AbortInternal(aRequest->GetErrorCode(), error.forget());
}
nsresult
IDBTransaction::Abort(nsresult aErrorCode)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
return AbortInternal(aErrorCode, DOMError::CreateForNSResult(aErrorCode));
}
NS_IMPL_CYCLE_COLLECTION_CLASS(IDBTransaction)
@ -747,7 +760,7 @@ NS_IMETHODIMP
IDBTransaction::Abort()
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
return AbortWithCode(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR);
return AbortInternal(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR, nsnull);
}
nsresult

7
dom/indexedDB/IDBTransaction.h
View File

@ -193,10 +193,10 @@ public:
IDBObjectStore** _retval);
nsresult
AbortWithCode(nsresult aAbortCode);
Abort(IDBRequest* aRequest);
nsresult
Abort(IDBRequest* aRequest);
Abort(nsresult aAbortCode);
nsresult
GetAbortCode() const
@ -205,6 +205,9 @@ public:
}
private:
nsresult
AbortInternal(nsresult aAbortCode, already_AddRefed<nsIDOMDOMError> aError);
// Should only be called directly through IndexedDBDatabaseChild.
static already_AddRefed<IDBTransaction>
CreateInternal(IDBDatabase* aDatabase,

2
dom/indexedDB/ipc/IndexedDBParent.cpp
View File

@ -578,7 +578,7 @@ bool
IndexedDBTransactionParent::RecvAbort(const nsresult& aAbortCode)
{
MOZ_ASSERT(mTransaction);
mTransaction->AbortWithCode(aAbortCode);
mTransaction->Abort(aAbortCode);
return true;
}

6
dom/indexedDB/test/exceptions_in_events_iframe.html
View File

@ -68,7 +68,7 @@
let event = yield;
is(event.type, "abort",
"Throwing during an upgradeneeded event should abort the transaction.");
is(event.target.error, null, "Got null error object");
is(event.target.error.name, "AbortError", "Got AbortError object");
request.onerror = grabEventAndContinueHandler;
event = yield;
@ -112,7 +112,7 @@
event = yield;
is(event.type, "abort", "Got transaction abort event");
is(event.target.error, null, "Got null error object");
is(event.target.error.name, "AbortError", "Got AbortError object");
openrequest.onerror = grabEventAndContinueHandler;
event = yield;
@ -161,7 +161,7 @@
event = yield;
is(event.type, "abort", "Got transaction abort event");
is(event.target.error, null, "Got null error object");
is(event.target.error.name, "AbortError", "Got AbortError object");
openrequest.onerror = grabEventAndContinueHandler;
event = yield;