Index: Source/modules/webdatabase/SQLTransactionBackend.h |
diff --git a/Source/modules/webdatabase/SQLTransactionBackend.h b/Source/modules/webdatabase/SQLTransactionBackend.h |
index 33c7d3b0aba1738b5194d4d26397d555df78d7b0..54ba940d569dafe95b0a47cf144912fb4192238c 100644 |
--- a/Source/modules/webdatabase/SQLTransactionBackend.h |
+++ b/Source/modules/webdatabase/SQLTransactionBackend.h |
@@ -57,12 +57,13 @@ public: |
virtual void handleCommitFailedAfterPostflight(SQLTransactionBackend*) = 0; |
}; |
-class SQLTransactionBackend FINAL : public SQLTransactionStateMachine<SQLTransactionBackend>, public AbstractSQLTransactionBackend { |
+class SQLTransactionBackend FINAL : public AbstractSQLTransactionBackend, public SQLTransactionStateMachine<SQLTransactionBackend> { |
public: |
- static PassRefPtr<SQLTransactionBackend> create(DatabaseBackend*, |
+ static PassRefPtrWillBeRawPtr<SQLTransactionBackend> create(DatabaseBackend*, |
PassRefPtrWillBeRawPtr<AbstractSQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly); |
virtual ~SQLTransactionBackend(); |
+ virtual void trace(Visitor*) OVERRIDE; |
void lockAcquired(); |
void performNextStep(); |
@@ -108,10 +109,10 @@ private: |
void getNextStatement(); |
- RefPtrWillBeCrossThreadPersistent<AbstractSQLTransaction> m_frontend; // Has a reference cycle, and will break in doCleanup(). |
+ RefPtrWillBeMember<AbstractSQLTransaction> m_frontend; // Has a reference cycle, and will break in doCleanup(). |
RefPtr<SQLStatementBackend> m_currentStatementBackend; |
- RefPtrWillBeCrossThreadPersistent<DatabaseBackend> m_database; |
+ RefPtrWillBeMember<DatabaseBackend> m_database; |
RefPtr<SQLTransactionWrapper> m_wrapper; |
RefPtr<SQLError> m_transactionError; |