Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp

Issue 12288067: Merge 142890 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp
===================================================================
--- Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp (revision 143412)
+++ Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp (working copy)
@@ -71,6 +71,8 @@
GetNewDatabaseId,
GetNewVersionNumber,
CreateIDBDatabaseMetaData,
+ DeleteDatabase,
+ TransactionCommit,
IDBLevelDBBackingStoreInternalErrorMax,
};
@@ -587,7 +589,11 @@
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)
@@ -1843,6 +1849,8 @@
ASSERT(m_transaction);
bool result = m_transaction->commit();
m_transaction.clear();
+ if (!result)
+ INTERNAL_WRITE_ERROR(TransactionCommit);
return result;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698