Merge 142890

Source/WebCore/Modules/indexeddb/IDBBackingStore.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 53 matching lines @@
     SetupMetadata,
     GetPrimaryKeyViaIndex,
     KeyExistsInIndex,
     VersionExists,
     DeleteObjectStore,
     SetMaxObjectStoreId,
     SetMaxIndexId,
     GetNewDatabaseId,
     GetNewVersionNumber,
     CreateIDBDatabaseMetaData,
+    DeleteDatabase,
+    TransactionCommit,
     IDBLevelDBBackingStoreInternalErrorMax,
 };
 
 static void recordInternalError(const char* type, IDBBackingStoreErrorSource location)
 {
     String name = String::format("WebCore.IndexedDB.BackingStore.%sError", type);
     HistogramSupport::histogramEnumeration(name.utf8().data(), location, IDBLevelDBBackingStoreInternalErrorMax);
 }
 
 // Use to signal conditions that usually indicate developer error, but could be caused by data corruption.
@@ skipping 496 matching lines @@
 
     const Vector<char> startKey = DatabaseMetaDataKey::encode(metadata.id, DatabaseMetaDataKey::OriginName);
     const Vector<char> stopKey = DatabaseMetaDataKey::encode(metadata.id + 1, DatabaseMetaDataKey::OriginName);
     OwnPtr<LevelDBIterator> it = m_db->createIterator();
     for (it->seek(startKey); it->isValid() && compareKeys(it->key(), stopKey) < 0; it->next())
         transaction->remove(it->key());
 
     const Vector<char> key = DatabaseNameKey::encode(m_identifier, name);
     transaction->remove(key);
 
-    return transaction->commit();
+    if (!transaction->commit()) {
+        INTERNAL_WRITE_ERROR(DeleteDatabase);
+        return false;
+    }
+    return true;
 }
 
 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 1235 matching lines @@
     ASSERT(!m_transaction);
     m_transaction = LevelDBTransaction::create(m_backingStore->m_db.get());
 }
 
 bool IDBBackingStore::Transaction::commit()
 {
     IDB_TRACE("IDBBackingStore::Transaction::commit");
     ASSERT(m_transaction);
     bool result = m_transaction->commit();
     m_transaction.clear();
+    if (!result)
+        INTERNAL_WRITE_ERROR(TransactionCommit);
     return result;
 }
 
 void IDBBackingStore::Transaction::rollback()
 {
     IDB_TRACE("IDBBackingStore::Transaction::rollback");
     ASSERT(m_transaction);
     m_transaction->rollback();
     m_transaction.clear();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INDEXED_DATABASE)