Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(572)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp

Issue 2808763007: IndexedDB: Clean up boilerplate when throwing TransactionInactiveError (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp ('k') | third_party/WebKit/Source/modules/indexeddb/IDBObserver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
index 22124fbe721bac4c9df62b2196aeb3dcfeae42c2..fda99b4e31ff64dc8a324f5881757a2553b9c8ac 100644
--- a/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
@@ -89,16 +89,9 @@ void IDBObjectStore::setName(const String& name,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return;
}
@@ -140,16 +133,9 @@ IDBRequest* IDBObjectStore::get(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
IDBKeyRange* key_range = IDBKeyRange::FromScriptValue(
@@ -184,16 +170,9 @@ IDBRequest* IDBObjectStore::getKey(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
IDBKeyRange* key_range = IDBKeyRange::FromScriptValue(
@@ -239,16 +218,9 @@ IDBRequest* IDBObjectStore::getAll(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
IDBKeyRange* range = IDBKeyRange::FromScriptValue(
@@ -289,16 +261,9 @@ IDBRequest* IDBObjectStore::getAllKeys(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
IDBKeyRange* range = IDBKeyRange::FromScriptValue(
@@ -398,16 +363,9 @@ IDBRequest* IDBObjectStore::put(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
if (transaction_->IsReadOnly()) {
@@ -564,16 +522,9 @@ IDBRequest* IDBObjectStore::deleteFunction(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
if (transaction_->IsReadOnly()) {
@@ -612,16 +563,9 @@ IDBRequest* IDBObjectStore::clear(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
if (transaction_->IsReadOnly()) {
@@ -756,16 +700,9 @@ IDBIndex* IDBObjectStore::createIndex(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
if (ContainsIndex(name)) {
@@ -869,16 +806,9 @@ void IDBObjectStore::deleteIndex(const String& name,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return;
}
int64_t index_id = FindIndexId(name);
@@ -914,16 +844,9 @@ IDBRequest* IDBObjectStore::openCursor(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
@@ -967,16 +890,9 @@ IDBRequest* IDBObjectStore::openKeyCursor(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
@@ -1013,16 +929,9 @@ IDBRequest* IDBObjectStore::count(ScriptState* script_state,
kInvalidStateError, IDBDatabase::kObjectStoreDeletedErrorMessage);
return nullptr;
}
- if (transaction_->IsFinished() || transaction_->IsFinishing()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionFinishedErrorMessage);
- return nullptr;
- }
if (!transaction_->IsActive()) {
- exception_state.ThrowDOMException(
- kTransactionInactiveError,
- IDBDatabase::kTransactionInactiveErrorMessage);
+ exception_state.ThrowDOMException(kTransactionInactiveError,
+ transaction_->InactiveErrorMessage());
return nullptr;
}
« no previous file with comments | « third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp ('k') | third_party/WebKit/Source/modules/indexeddb/IDBObserver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698