| Index: Source/modules/webdatabase/SQLTransactionBackend.cpp
|
| diff --git a/Source/modules/webdatabase/SQLTransactionBackend.cpp b/Source/modules/webdatabase/SQLTransactionBackend.cpp
|
| index 377e9fdd8d5a187f6ab0de06814ff61d0c7ccbcb..f5389572aebe04a6fdb9c53c0a3b23268c5e52a1 100644
|
| --- a/Source/modules/webdatabase/SQLTransactionBackend.cpp
|
| +++ b/Source/modules/webdatabase/SQLTransactionBackend.cpp
|
| @@ -32,7 +32,6 @@
|
| #include "platform/Logging.h"
|
| #include "modules/webdatabase/sqlite/SQLValue.h"
|
| #include "modules/webdatabase/sqlite/SQLiteTransaction.h"
|
| -#include "modules/webdatabase/AbstractSQLTransaction.h"
|
| #include "modules/webdatabase/Database.h" // FIXME: Should only be used in the frontend.
|
| #include "modules/webdatabase/DatabaseAuthorizer.h"
|
| #include "modules/webdatabase/DatabaseBackend.h"
|
| @@ -41,6 +40,7 @@
|
| #include "modules/webdatabase/DatabaseTracker.h"
|
| #include "modules/webdatabase/SQLError.h"
|
| #include "modules/webdatabase/SQLStatementBackend.h"
|
| +#include "modules/webdatabase/SQLTransaction.h"
|
| #include "modules/webdatabase/SQLTransactionClient.h"
|
| #include "modules/webdatabase/SQLTransactionCoordinator.h"
|
| #include "wtf/StdLibExtras.h"
|
| @@ -341,7 +341,7 @@
|
| namespace blink {
|
|
|
| PassRefPtrWillBeRawPtr<SQLTransactionBackend> SQLTransactionBackend::create(DatabaseBackend* db,
|
| - PassRefPtrWillBeRawPtr<AbstractSQLTransaction> frontend,
|
| + PassRefPtrWillBeRawPtr<SQLTransaction> frontend,
|
| PassRefPtrWillBeRawPtr<SQLTransactionWrapper> wrapper,
|
| bool readOnly)
|
| {
|
| @@ -349,7 +349,7 @@ PassRefPtrWillBeRawPtr<SQLTransactionBackend> SQLTransactionBackend::create(Data
|
| }
|
|
|
| SQLTransactionBackend::SQLTransactionBackend(DatabaseBackend* db,
|
| - PassRefPtrWillBeRawPtr<AbstractSQLTransaction> frontend,
|
| + PassRefPtrWillBeRawPtr<SQLTransaction> frontend,
|
| PassRefPtrWillBeRawPtr<SQLTransactionWrapper> wrapper,
|
| bool readOnly)
|
| : m_frontend(frontend)
|
| @@ -381,7 +381,6 @@ void SQLTransactionBackend::trace(Visitor* visitor)
|
| visitor->trace(m_database);
|
| visitor->trace(m_wrapper);
|
| visitor->trace(m_statementQueue);
|
| - AbstractSQLTransactionBackend::trace(visitor);
|
| }
|
|
|
| void SQLTransactionBackend::doCleanup()
|
| @@ -434,7 +433,7 @@ void SQLTransactionBackend::doCleanup()
|
| m_wrapper = nullptr;
|
| }
|
|
|
| -AbstractSQLStatement* SQLTransactionBackend::currentStatement()
|
| +SQLStatement* SQLTransactionBackend::currentStatement()
|
| {
|
| return m_currentStatementBackend->frontend();
|
| }
|
| @@ -526,7 +525,7 @@ void SQLTransactionBackend::performNextStep()
|
| runStateMachine();
|
| }
|
|
|
| -void SQLTransactionBackend::executeSQL(PassOwnPtrWillBeRawPtr<AbstractSQLStatement> statement,
|
| +void SQLTransactionBackend::executeSQL(PassOwnPtrWillBeRawPtr<SQLStatement> statement,
|
| const String& sqlStatement, const Vector<SQLValue>& arguments, int permissions)
|
| {
|
| enqueueStatementBackend(SQLStatementBackend::create(statement, sqlStatement, arguments, permissions));
|
|
|