Changeset 116562 in webkit

Timestamp:

May 9, 2012 3:09:10 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

IndexedDB: call abort handler when there are problems committing
​https://bugs.webkit.org/show_bug.cgi?id=85841

Patch by Alec Flett <​alecflett@chromium.org> on 2012-05-09
Reviewed by Ojan Vafai.

No new tests. Every existing test that calls commit() is testing
the success side of this, and this only throws when there are
LevelDB errors, which is exactly what we're trying to diagnose
with this patch.

• Modules/indexeddb/IDBBackingStore.h:

(Transaction):

• Modules/indexeddb/IDBLevelDBBackingStore.cpp:

(WebCore::IDBLevelDBBackingStore::deleteDatabase):
(WebCore::IDBLevelDBBackingStore::Transaction::commit):

• Modules/indexeddb/IDBLevelDBBackingStore.h:

(Transaction):

• Modules/indexeddb/IDBTransactionBackendImpl.cpp:

(WebCore::IDBTransactionBackendImpl::commit):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBBackingStore.h (modified) (1 diff)
• Modules/indexeddb/IDBLevelDBBackingStore.cpp (modified) (2 diffs)
• Modules/indexeddb/IDBLevelDBBackingStore.h (modified) (1 diff)
• Modules/indexeddb/IDBTransactionBackendImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-09  Alec Flett  <alecflett@chromium.org>
+
+        IndexedDB: call abort handler when there are problems committing
+        https://bugs.webkit.org/show_bug.cgi?id=85841
+
+        Reviewed by Ojan Vafai.
+
+        No new tests. Every existing test that calls commit() is testing
+        the success side of this, and this only throws when there are
+        LevelDB errors, which is exactly what we're trying to diagnose
+        with this patch.
+
+        * Modules/indexeddb/IDBBackingStore.h:
+        (Transaction):
+        * Modules/indexeddb/IDBLevelDBBackingStore.cpp:
+        (WebCore::IDBLevelDBBackingStore::deleteDatabase):
+        (WebCore::IDBLevelDBBackingStore::Transaction::commit):
+        * Modules/indexeddb/IDBLevelDBBackingStore.h:
+        (Transaction):
+        * Modules/indexeddb/IDBTransactionBackendImpl.cpp:
+        (WebCore::IDBTransactionBackendImpl::commit):
+
 2012-05-09  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.h

@@ -114 +114 @@
         virtual ~Transaction() { }
         virtual void begin() = 0;
-        virtual void commit() = 0;
+        virtual bool commit() = 0;
         virtual void rollback() = 0;
     };

trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp

@@ -310 +310 @@
     m_currentTransaction->remove(key);
 
-    transaction->commit();
-    return true;
+    return transaction->commit();
 }
 
@@ -1576 +1575 @@
 }
 
-void IDBLevelDBBackingStore::Transaction::commit()
+bool IDBLevelDBBackingStore::Transaction::commit()
 {
     ASSERT(m_backingStore->m_currentTransaction);
-    m_backingStore->m_currentTransaction->commit();
+    bool result = m_backingStore->m_currentTransaction->commit();
     m_backingStore->m_currentTransaction.clear();
+    return result;
 }
 

trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.h

@@ -94 +94 @@
         static PassRefPtr<Transaction> create(IDBLevelDBBackingStore*);
         virtual void begin();
-        virtual void commit();
+        virtual bool commit();
         virtual void rollback();
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp

@@ -198 +198 @@
     m_state = Finished;
     closeOpenCursors();
-    m_transaction->commit();
-    m_callbacks->onComplete();
+    if (m_transaction->commit())
+        m_callbacks->onComplete();
+    else
+        m_callbacks->onAbort();
     m_database->transactionCoordinator()->didFinishTransaction(this);
     m_database->transactionFinished(this);