diff options
Diffstat (limited to 'Source/WebCore/storage/IDBTransactionBackendImpl.cpp')
| -rw-r--r-- | Source/WebCore/storage/IDBTransactionBackendImpl.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/WebCore/storage/IDBTransactionBackendImpl.cpp b/Source/WebCore/storage/IDBTransactionBackendImpl.cpp index 0012231..1357838 100644 --- a/Source/WebCore/storage/IDBTransactionBackendImpl.cpp +++ b/Source/WebCore/storage/IDBTransactionBackendImpl.cpp @@ -35,15 +35,14 @@ namespace WebCore { -PassRefPtr<IDBTransactionBackendImpl> IDBTransactionBackendImpl::create(DOMStringList* objectStores, unsigned short mode, unsigned long timeout, IDBDatabaseBackendImpl* database) +PassRefPtr<IDBTransactionBackendImpl> IDBTransactionBackendImpl::create(DOMStringList* objectStores, unsigned short mode, IDBDatabaseBackendImpl* database) { - return adoptRef(new IDBTransactionBackendImpl(objectStores, mode, timeout, database)); + return adoptRef(new IDBTransactionBackendImpl(objectStores, mode, database)); } -IDBTransactionBackendImpl::IDBTransactionBackendImpl(DOMStringList* objectStores, unsigned short mode, unsigned long timeout, IDBDatabaseBackendImpl* database) +IDBTransactionBackendImpl::IDBTransactionBackendImpl(DOMStringList* objectStores, unsigned short mode, IDBDatabaseBackendImpl* database) : m_objectStoreNames(objectStores) , m_mode(mode) - , m_timeout(timeout) // FIXME: Implement timeout. , m_state(Unused) , m_database(database) , m_transaction(new SQLiteTransaction(database->sqliteDatabase())) @@ -180,12 +179,12 @@ void IDBTransactionBackendImpl::taskTimerFired(Timer<IDBTransactionBackendImpl>* if (m_state == StartPending) { m_transaction->begin(); m_state = Running; - } else - ASSERT(m_state == Running); + } TaskQueue queue; queue.swap(m_taskQueue); while (!queue.isEmpty() && m_state != Finished) { + ASSERT(m_state == Running); OwnPtr<ScriptExecutionContext::Task> task(queue.first().release()); queue.removeFirst(); m_pendingEvents++; |