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

Unified Diff: Source/modules/indexeddb/IDBDatabase.cpp

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry Created 7 years, 1 month 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 | « Source/modules/indexeddb/IDBDatabase.h ('k') | Source/modules/indexeddb/IDBFactory.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/indexeddb/IDBDatabase.cpp
diff --git a/Source/modules/indexeddb/IDBDatabase.cpp b/Source/modules/indexeddb/IDBDatabase.cpp
index 0df7e7bab63922919df9d13cabf1423a0631b893..c5575fcd1ef2baca16b2a04aeb5144c949d0f4b1 100644
--- a/Source/modules/indexeddb/IDBDatabase.cpp
+++ b/Source/modules/indexeddb/IDBDatabase.cpp
@@ -161,7 +161,7 @@ PassRefPtr<IDBAny> IDBDatabase::version() const
return IDBAny::create(intVersion);
}
-PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, const Dictionary& options, ExceptionState& es)
+PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, const Dictionary& options, ExceptionState& exceptionState)
{
IDBKeyPath keyPath;
bool autoIncrement = false;
@@ -176,38 +176,38 @@ PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, co
options.get("autoIncrement", autoIncrement);
}
- return createObjectStore(name, keyPath, autoIncrement, es);
+ return createObjectStore(name, keyPath, autoIncrement, exceptionState);
}
-PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, const IDBKeyPath& keyPath, bool autoIncrement, ExceptionState& es)
+PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, const IDBKeyPath& keyPath, bool autoIncrement, ExceptionState& exceptionState)
{
IDB_TRACE("IDBDatabase::createObjectStore");
blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBCreateObjectStoreCall, IDBMethodsMax);
if (!m_versionChangeTransaction) {
- es.throwDOMException(InvalidStateError, IDBDatabase::notVersionChangeTransactionErrorMessage);
+ exceptionState.throwDOMException(InvalidStateError, IDBDatabase::notVersionChangeTransactionErrorMessage);
return 0;
}
if (m_versionChangeTransaction->isFinished()) {
- es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
+ exceptionState.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
return 0;
}
if (!m_versionChangeTransaction->isActive()) {
- es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
+ exceptionState.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
return 0;
}
if (containsObjectStore(name)) {
- es.throwDOMException(ConstraintError, "An object store with the specified name already exists.");
+ exceptionState.throwDOMException(ConstraintError, "An object store with the specified name already exists.");
return 0;
}
if (!keyPath.isNull() && !keyPath.isValid()) {
- es.throwDOMException(SyntaxError, "The keyPath option is not a valid key path.");
+ exceptionState.throwDOMException(SyntaxError, "The keyPath option is not a valid key path.");
return 0;
}
if (autoIncrement && ((keyPath.type() == IDBKeyPath::StringType && keyPath.string().isEmpty()) || keyPath.type() == IDBKeyPath::ArrayType)) {
- es.throwDOMException(InvalidAccessError, "The autoIncrement option was set but the keyPath option was empty or an array.");
+ exceptionState.throwDOMException(InvalidAccessError, "The autoIncrement option was set but the keyPath option was empty or an array.");
return 0;
}
@@ -223,26 +223,26 @@ PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, co
return objectStore.release();
}
-void IDBDatabase::deleteObjectStore(const String& name, ExceptionState& es)
+void IDBDatabase::deleteObjectStore(const String& name, ExceptionState& exceptionState)
{
IDB_TRACE("IDBDatabase::deleteObjectStore");
blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBDeleteObjectStoreCall, IDBMethodsMax);
if (!m_versionChangeTransaction) {
- es.throwDOMException(InvalidStateError, IDBDatabase::notVersionChangeTransactionErrorMessage);
+ exceptionState.throwDOMException(InvalidStateError, IDBDatabase::notVersionChangeTransactionErrorMessage);
return;
}
if (m_versionChangeTransaction->isFinished()) {
- es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
+ exceptionState.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
return;
}
if (!m_versionChangeTransaction->isActive()) {
- es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
+ exceptionState.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
return;
}
int64_t objectStoreId = findObjectStoreId(name);
if (objectStoreId == IDBObjectStoreMetadata::InvalidId) {
- es.throwDOMException(NotFoundError, "The specified object store was not found.");
+ exceptionState.throwDOMException(NotFoundError, "The specified object store was not found.");
return;
}
@@ -251,26 +251,26 @@ void IDBDatabase::deleteObjectStore(const String& name, ExceptionState& es)
m_metadata.objectStores.remove(objectStoreId);
}
-PassRefPtr<IDBTransaction> IDBDatabase::transaction(ExecutionContext* context, const Vector<String>& scope, const String& modeString, ExceptionState& es)
+PassRefPtr<IDBTransaction> IDBDatabase::transaction(ExecutionContext* context, const Vector<String>& scope, const String& modeString, ExceptionState& exceptionState)
{
IDB_TRACE("IDBDatabase::transaction");
blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBTransactionCall, IDBMethodsMax);
if (!scope.size()) {
- es.throwDOMException(InvalidAccessError, "The storeNames parameter was empty.");
+ exceptionState.throwDOMException(InvalidAccessError, "The storeNames parameter was empty.");
return 0;
}
- IndexedDB::TransactionMode mode = IDBTransaction::stringToMode(modeString, es);
- if (es.hadException())
+ IndexedDB::TransactionMode mode = IDBTransaction::stringToMode(modeString, exceptionState);
+ if (exceptionState.hadException())
return 0;
if (m_versionChangeTransaction) {
- es.throwDOMException(InvalidStateError, "A version change transaction is running.");
+ exceptionState.throwDOMException(InvalidStateError, "A version change transaction is running.");
return 0;
}
if (m_closePending) {
- es.throwDOMException(InvalidStateError, "The database connection is closing.");
+ exceptionState.throwDOMException(InvalidStateError, "The database connection is closing.");
return 0;
}
@@ -278,7 +278,7 @@ PassRefPtr<IDBTransaction> IDBDatabase::transaction(ExecutionContext* context, c
for (size_t i = 0; i < scope.size(); ++i) {
int64_t objectStoreId = findObjectStoreId(scope[i]);
if (objectStoreId == IDBObjectStoreMetadata::InvalidId) {
- es.throwDOMException(NotFoundError, "One of the specified object stores was not found.");
+ exceptionState.throwDOMException(NotFoundError, "One of the specified object stores was not found.");
return 0;
}
objectStoreIds.append(objectStoreId);
@@ -291,11 +291,11 @@ PassRefPtr<IDBTransaction> IDBDatabase::transaction(ExecutionContext* context, c
return transaction.release();
}
-PassRefPtr<IDBTransaction> IDBDatabase::transaction(ExecutionContext* context, const String& storeName, const String& mode, ExceptionState& es)
+PassRefPtr<IDBTransaction> IDBDatabase::transaction(ExecutionContext* context, const String& storeName, const String& mode, ExceptionState& exceptionState)
{
RefPtr<DOMStringList> storeNames = DOMStringList::create();
storeNames->append(storeName);
- return transaction(context, storeNames, mode, es);
+ return transaction(context, storeNames, mode, exceptionState);
}
void IDBDatabase::forceClose()
« no previous file with comments | « Source/modules/indexeddb/IDBDatabase.h ('k') | Source/modules/indexeddb/IDBFactory.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698