| 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 904a284651a5220be85d53d13c6958292ac8756c..e5c5e81ebaa2233abb41381aa89f21a872631fdd 100644
|
| --- a/content/browser/indexed_db/indexed_db_transaction.cc
|
| +++ b/content/browser/indexed_db/indexed_db_transaction.cc
|
| @@ -288,7 +288,6 @@ 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.
|
| @@ -462,9 +461,11 @@ void IndexedDBTransaction::ProcessTaskQueue() {
|
| // never requests further activity. Read-only transactions don't
|
| // block other transactions, so don't time those out.
|
| if (mode_ != blink::kWebIDBTransactionModeReadOnly) {
|
| - timeout_timer_.Start(
|
| - FROM_HERE, GetInactivityTimeout(),
|
| - base::Bind(&IndexedDBTransaction::Timeout, ptr_factory_.GetWeakPtr()));
|
| + // TODO(dmurph): Get this back in before submitting.
|
| + // timeout_timer_.Start(
|
| + // FROM_HERE, GetInactivityTimeout(),
|
| + // base::Bind(&IndexedDBTransaction::Timeout,
|
| + // ptr_factory_.GetWeakPtr()));
|
| }
|
| processing_event_queue_ = false;
|
| }
|
| @@ -474,6 +475,7 @@ base::TimeDelta IndexedDBTransaction::GetInactivityTimeout() const {
|
| }
|
|
|
| void IndexedDBTransaction::Timeout() {
|
| + LOG(ERROR) << "timout";
|
| Abort(IndexedDBDatabaseError(
|
| blink::kWebIDBDatabaseExceptionTimeoutError,
|
| base::ASCIIToUTF16("Transaction timed out due to inactivity.")));
|
|
|