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

Unified Diff: content/browser/indexed_db/indexed_db_transaction.cc

Issue 502643003: IndexedDB: Cancel transaction inactivity timer on Commit() arrival (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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: content/browser/indexed_db/indexed_db_transaction.cc
diff --git a/content/browser/indexed_db/indexed_db_transaction.cc b/content/browser/indexed_db/indexed_db_transaction.cc
index 4658ca6295d22dbe2ceaa5b3f6c1b72dda9aa582..61ca2748511da043a343197e8895d1c5ed63990a 100644
--- a/content/browser/indexed_db/indexed_db_transaction.cc
+++ b/content/browser/indexed_db/indexed_db_transaction.cc
@@ -238,6 +238,8 @@ void IndexedDBTransaction::BlobWriteComplete(bool success) {
leveldb::Status IndexedDBTransaction::Commit() {
IDB_TRACE1("IndexedDBTransaction::Commit", "txn.id", id());
+ timeout_timer_.Stop();
+
// In multiprocess ports, front-end may have requested a commit but
// an abort has already been initiated asynchronously by the
// back-end.
@@ -285,8 +287,6 @@ leveldb::Status IndexedDBTransaction::CommitPhaseTwo() {
// alive while executing this method.
scoped_refptr<IndexedDBTransaction> protect(this);
- timeout_timer_.Stop();
-
state_ = FINISHED;
leveldb::Status s;
« 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