Merge 116562 - IndexedDB: call abort handler when there are problems committing

Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 291 matching lines @@
     const Vector<char> startKey = DatabaseMetaDataKey::encode(databaseId, DatabaseMetaDataKey::kOriginName);
     const Vector<char> stopKey = DatabaseMetaDataKey::encode(databaseId + 1, DatabaseMetaDataKey::kOriginName);
     if (!deleteRange(m_currentTransaction.get(), startKey, stopKey)) {
         transaction->rollback();
         return false;
     }
 
     const Vector<char> key = DatabaseNameKey::encode(m_identifier, name);
     m_currentTransaction->remove(key);
 
-    transaction->commit();
-    return true;
+    return transaction->commit();
 }
 
 static bool checkObjectStoreAndMetaDataType(const LevelDBIterator* it, const Vector<char>& stopKey, int64_t objectStoreId, int64_t metaDataType)
 {
     if (!it->isValid() || compareKeys(it->key(), stopKey) >= 0)
         return false;
 
     ObjectStoreMetaDataKey metaDataKey;
     const char* p = ObjectStoreMetaDataKey::decode(it->key().begin(), it->key().end(), &metaDataKey);
     ASSERT_UNUSED(p, p);
@@ skipping 1244 matching lines @@
     : m_backingStore(backingStore)
 {
 }
 
 void IDBLevelDBBackingStore::Transaction::begin()
 {
     ASSERT(!m_backingStore->m_currentTransaction);
     m_backingStore->m_currentTransaction = LevelDBTransaction::create(m_backingStore->m_db.get());
 }
 
-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;
 }
 
 void IDBLevelDBBackingStore::Transaction::rollback()
 {
     ASSERT(m_backingStore->m_currentTransaction);
     m_backingStore->m_currentTransaction->rollback();
     m_backingStore->m_currentTransaction.clear();
 }
 
 bool IDBLevelDBBackingStore::backingStoreExists(SecurityOrigin* securityOrigin, const String&, const String& pathBaseArg)
 {
     String pathBase = pathBaseArg;
 
     if (pathBase.isEmpty())
         return false;
 
     // FIXME: We should eventually use the same LevelDB database for all origins.
     String path = pathByAppendingComponent(pathBase, securityOrigin->databaseIdentifier() + ".indexeddb.leveldb");
 
     // FIXME: this is checking for presence of the domain, not the database itself
     return fileExists(path+"/CURRENT");
 }
 
 } // namespace WebCore
 
 #endif // USE(LEVELDB)
 #endif // ENABLE(INDEXED_DATABASE)