| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2013 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 permissions |= DatabaseAuthorizer::ReadOnlyMask; | 281 permissions |= DatabaseAuthorizer::ReadOnlyMask; |
| 282 | 282 |
| 283 OwnPtrWillBeRawPtr<SQLStatement> statement = SQLStatement::create(m_database
.get(), callback, callbackError); | 283 OwnPtrWillBeRawPtr<SQLStatement> statement = SQLStatement::create(m_database
.get(), callback, callbackError); |
| 284 m_backend->executeSQL(statement.release(), sqlStatement, arguments, permissi
ons); | 284 m_backend->executeSQL(statement.release(), sqlStatement, arguments, permissi
ons); |
| 285 } | 285 } |
| 286 | 286 |
| 287 bool SQLTransaction::computeNextStateAndCleanupIfNeeded() | 287 bool SQLTransaction::computeNextStateAndCleanupIfNeeded() |
| 288 { | 288 { |
| 289 // Only honor the requested state transition if we're not supposed to be | 289 // Only honor the requested state transition if we're not supposed to be |
| 290 // cleaning up and shutting down: | 290 // cleaning up and shutting down: |
| 291 if (m_database->opened() && !m_database->isInterrupted()) { | 291 if (m_database->opened()) { |
| 292 setStateToRequestedState(); | 292 setStateToRequestedState(); |
| 293 ASSERT(m_nextState == SQLTransactionState::End | 293 ASSERT(m_nextState == SQLTransactionState::End |
| 294 || m_nextState == SQLTransactionState::DeliverTransactionCallback | 294 || m_nextState == SQLTransactionState::DeliverTransactionCallback |
| 295 || m_nextState == SQLTransactionState::DeliverTransactionErrorCallba
ck | 295 || m_nextState == SQLTransactionState::DeliverTransactionErrorCallba
ck |
| 296 || m_nextState == SQLTransactionState::DeliverStatementCallback | 296 || m_nextState == SQLTransactionState::DeliverStatementCallback |
| 297 || m_nextState == SQLTransactionState::DeliverQuotaIncreaseCallback | 297 || m_nextState == SQLTransactionState::DeliverQuotaIncreaseCallback |
| 298 || m_nextState == SQLTransactionState::DeliverSuccessCallback); | 298 || m_nextState == SQLTransactionState::DeliverSuccessCallback); |
| 299 | 299 |
| 300 WTF_LOG(StorageAPI, "Callback %s\n", nameForSQLTransactionState(m_nextSt
ate)); | 300 WTF_LOG(StorageAPI, "Callback %s\n", nameForSQLTransactionState(m_nextSt
ate)); |
| 301 return false; | 301 return false; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 314 m_successCallbackWrapper.clear(); | 314 m_successCallbackWrapper.clear(); |
| 315 m_errorCallbackWrapper.clear(); | 315 m_errorCallbackWrapper.clear(); |
| 316 } | 316 } |
| 317 | 317 |
| 318 PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> SQLTransaction::releaseError
Callback() | 318 PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> SQLTransaction::releaseError
Callback() |
| 319 { | 319 { |
| 320 return m_errorCallbackWrapper.unwrap(); | 320 return m_errorCallbackWrapper.unwrap(); |
| 321 } | 321 } |
| 322 | 322 |
| 323 } // namespace blink | 323 } // namespace blink |
| OLD | NEW |