diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/storage/SQLStatement.cpp | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/storage/SQLStatement.cpp')
| -rw-r--r-- | WebCore/storage/SQLStatement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/storage/SQLStatement.cpp b/WebCore/storage/SQLStatement.cpp index 9dd249a..3973157 100644 --- a/WebCore/storage/SQLStatement.cpp +++ b/WebCore/storage/SQLStatement.cpp @@ -170,9 +170,9 @@ bool SQLStatement::performCallback(SQLTransaction* transaction) // because then we need to jump to the transaction error callback. if (m_error) { ASSERT(m_statementErrorCallback); - callbackError = m_statementErrorCallback->handleEvent(transaction->database()->scriptExecutionContext(), transaction, m_error.get()); + callbackError = m_statementErrorCallback->handleEvent(transaction, m_error.get()); } else if (m_statementCallback) - callbackError = !m_statementCallback->handleEvent(transaction->database()->scriptExecutionContext(), transaction, m_resultSet.get()); + callbackError = !m_statementCallback->handleEvent(transaction, m_resultSet.get()); // Now release our callbacks, to break reference cycles. m_statementCallback = 0; |