| Index: third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteTransaction.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteTransaction.cpp b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteTransaction.cpp
|
| index e9bf7279c6698d9ef9e4199cf0889a741577b543..7d4b2678b3427193b2974960d0f8e0cb76a94ea1 100644
|
| --- a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteTransaction.cpp
|
| +++ b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteTransaction.cpp
|
| @@ -64,10 +64,11 @@ void SQLiteTransaction::commit() {
|
| }
|
|
|
| void SQLiteTransaction::rollback() {
|
| - // We do not use the 'm_inProgress = m_db.executeCommand("ROLLBACK")' construct here,
|
| - // because m_inProgress should always be set to false after a ROLLBACK, and
|
| - // m_db.executeCommand("ROLLBACK") can sometimes harmlessly fail, thus returning
|
| - // a non-zero/true result (http://www.sqlite.org/lang_transaction.html).
|
| + // We do not use the 'm_inProgress = m_db.executeCommand("ROLLBACK")'
|
| + // construct here, because m_inProgress should always be set to false after a
|
| + // ROLLBACK, and m_db.executeCommand("ROLLBACK") can sometimes harmlessly
|
| + // fail, thus returning a non-zero/true result
|
| + // (http://www.sqlite.org/lang_transaction.html).
|
| if (m_inProgress) {
|
| ASSERT(m_db.m_transactionInProgress);
|
| m_db.executeCommand("ROLLBACK");
|
|
|