diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/storage/SQLStatement.h | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/storage/SQLStatement.h')
-rw-r--r-- | Source/WebCore/storage/SQLStatement.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/WebCore/storage/SQLStatement.h b/Source/WebCore/storage/SQLStatement.h index afd605a..1d81eb2 100644 --- a/Source/WebCore/storage/SQLStatement.h +++ b/Source/WebCore/storage/SQLStatement.h @@ -31,6 +31,7 @@ #if ENABLE(DATABASE) #include "PlatformString.h" +#include "SQLCallbackWrapper.h" #include "SQLResultSet.h" #include "SQLValue.h" #include <wtf/Forward.h> @@ -44,15 +45,15 @@ class SQLStatementCallback; class SQLStatementErrorCallback; class SQLTransaction; -class SQLStatement : public ThreadSafeShared<SQLStatement> { +class SQLStatement : public ThreadSafeRefCounted<SQLStatement> { public: - static PassRefPtr<SQLStatement> create(const String&, const Vector<SQLValue>&, PassRefPtr<SQLStatementCallback>, PassRefPtr<SQLStatementErrorCallback>, int permissions); + static PassRefPtr<SQLStatement> create(Database*, const String&, const Vector<SQLValue>&, PassRefPtr<SQLStatementCallback>, PassRefPtr<SQLStatementErrorCallback>, int permissions); bool execute(Database*); bool lastExecutionFailedDueToQuota() const; - bool hasStatementCallback() const { return m_statementCallback; } - bool hasStatementErrorCallback() const { return m_statementErrorCallback; } + bool hasStatementCallback() const { return m_statementCallbackWrapper.hasCallback(); } + bool hasStatementErrorCallback() const { return m_statementErrorCallbackWrapper.hasCallback(); } void setDatabaseDeletedError(); void setVersionMismatchedError(); @@ -61,15 +62,15 @@ public: SQLError* sqlError() const { return m_error.get(); } private: - SQLStatement(const String& statement, const Vector<SQLValue>& arguments, PassRefPtr<SQLStatementCallback>, PassRefPtr<SQLStatementErrorCallback>, int permissions); + SQLStatement(Database*, const String& statement, const Vector<SQLValue>& arguments, PassRefPtr<SQLStatementCallback>, PassRefPtr<SQLStatementErrorCallback>, int permissions); void setFailureDueToQuota(); void clearFailureDueToQuota(); String m_statement; Vector<SQLValue> m_arguments; - RefPtr<SQLStatementCallback> m_statementCallback; - RefPtr<SQLStatementErrorCallback> m_statementErrorCallback; + SQLCallbackWrapper<SQLStatementCallback> m_statementCallbackWrapper; + SQLCallbackWrapper<SQLStatementErrorCallback> m_statementErrorCallbackWrapper; RefPtr<SQLError> m_error; RefPtr<SQLResultSet> m_resultSet; |