| Index: Source/modules/indexeddb/IDBTransaction.cpp
|
| diff --git a/Source/modules/indexeddb/IDBTransaction.cpp b/Source/modules/indexeddb/IDBTransaction.cpp
|
| index 49eb7704d99421a08b0ccc4afed9cb8104ff1a2d..d3a08d141cc3721c0c378943dc41a1d348f6c949 100644
|
| --- a/Source/modules/indexeddb/IDBTransaction.cpp
|
| +++ b/Source/modules/indexeddb/IDBTransaction.cpp
|
| @@ -135,10 +135,10 @@ void IDBTransaction::setError(PassRefPtr<DOMError> error)
|
| }
|
| }
|
|
|
| -PassRefPtr<IDBObjectStore> IDBTransaction::objectStore(const String& name, ExceptionState& es)
|
| +PassRefPtr<IDBObjectStore> IDBTransaction::objectStore(const String& name, ExceptionState& exceptionState)
|
| {
|
| if (m_state == Finished) {
|
| - es.throwDOMException(InvalidStateError, IDBDatabase::transactionFinishedErrorMessage);
|
| + exceptionState.throwDOMException(InvalidStateError, IDBDatabase::transactionFinishedErrorMessage);
|
| return 0;
|
| }
|
|
|
| @@ -147,14 +147,14 @@ PassRefPtr<IDBObjectStore> IDBTransaction::objectStore(const String& name, Excep
|
| return it->value;
|
|
|
| if (!isVersionChange() && !m_objectStoreNames.contains(name)) {
|
| - es.throwDOMException(NotFoundError, IDBDatabase::noSuchObjectStoreErrorMessage);
|
| + exceptionState.throwDOMException(NotFoundError, IDBDatabase::noSuchObjectStoreErrorMessage);
|
| return 0;
|
| }
|
|
|
| int64_t objectStoreId = m_database->findObjectStoreId(name);
|
| if (objectStoreId == IDBObjectStoreMetadata::InvalidId) {
|
| ASSERT(isVersionChange());
|
| - es.throwDOMException(NotFoundError, IDBDatabase::noSuchObjectStoreErrorMessage);
|
| + exceptionState.throwDOMException(NotFoundError, IDBDatabase::noSuchObjectStoreErrorMessage);
|
| return 0;
|
| }
|
|
|
| @@ -200,10 +200,10 @@ void IDBTransaction::setActive(bool active)
|
| backendDB()->commit(m_id);
|
| }
|
|
|
| -void IDBTransaction::abort(ExceptionState& es)
|
| +void IDBTransaction::abort(ExceptionState& exceptionState)
|
| {
|
| if (m_state == Finishing || m_state == Finished) {
|
| - es.throwDOMException(InvalidStateError, IDBDatabase::transactionFinishedErrorMessage);
|
| + exceptionState.throwDOMException(InvalidStateError, IDBDatabase::transactionFinishedErrorMessage);
|
| return;
|
| }
|
|
|
| @@ -294,7 +294,7 @@ bool IDBTransaction::hasPendingActivity() const
|
| return m_hasPendingActivity && !m_contextStopped;
|
| }
|
|
|
| -IndexedDB::TransactionMode IDBTransaction::stringToMode(const String& modeString, ExceptionState& es)
|
| +IndexedDB::TransactionMode IDBTransaction::stringToMode(const String& modeString, ExceptionState& exceptionState)
|
| {
|
| if (modeString.isNull()
|
| || modeString == IDBTransaction::modeReadOnly())
|
| @@ -302,7 +302,7 @@ IndexedDB::TransactionMode IDBTransaction::stringToMode(const String& modeString
|
| if (modeString == IDBTransaction::modeReadWrite())
|
| return IndexedDB::TransactionReadWrite;
|
|
|
| - es.throwUninformativeAndGenericTypeError();
|
| + exceptionState.throwUninformativeAndGenericTypeError();
|
| return IndexedDB::TransactionReadOnly;
|
| }
|
|
|
|
|