projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
browser
/
indexed_db
/
indexed_db_transaction.cc
diff --git
a/src/content/browser/indexed_db/indexed_db_transaction.cc
b/src/content/browser/indexed_db/indexed_db_transaction.cc
index
4658ca6
..
61ca274
100644
(file)
--- a/
src/content/browser/indexed_db/indexed_db_transaction.cc
+++ b/
src/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());
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.
// 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);
// alive while executing this method.
scoped_refptr<IndexedDBTransaction> protect(this);
- timeout_timer_.Stop();
-
state_ = FINISHED;
leveldb::Status s;
state_ = FINISHED;
leveldb::Status s;