Web SQL: Remove unnecessary abstraction.

Source/modules/webdatabase/SQLTransactionBackend.cpp

 /*
  * Copyright (C) 2007, 2008, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 14 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/webdatabase/SQLTransactionBackend.h"
 
 #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"
 #include "modules/webdatabase/DatabaseContext.h"
 #include "modules/webdatabase/DatabaseThread.h"
 #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"
 
 
 // How does a SQLTransaction work?
 // ==============================
 // The SQLTransaction is a state machine that executes a series of states / steps.
 //
 // The work of the transaction states are defined in section of 4.3.2 of the
@@ skipping 280 matching lines @@
 //
 //     Phase 5: After state CleanupAndTerminate
 //
 //     - This is how a transaction ends normally.
 //     - state CleanupAndTerminate calls doCleanup().
 
 
 namespace blink {
 
 PassRefPtrWillBeRawPtr<SQLTransactionBackend> SQLTransactionBackend::create(DatabaseBackend* db,
-    PassRefPtrWillBeRawPtr<AbstractSQLTransaction> frontend,
+    PassRefPtrWillBeRawPtr<SQLTransaction> frontend,
     PassRefPtrWillBeRawPtr<SQLTransactionWrapper> wrapper,
     bool readOnly)
 {
     return adoptRefWillBeNoop(new SQLTransactionBackend(db, frontend, wrapper, readOnly));
 }
 
 SQLTransactionBackend::SQLTransactionBackend(DatabaseBackend* db,
-    PassRefPtrWillBeRawPtr<AbstractSQLTransaction> frontend,
+    PassRefPtrWillBeRawPtr<SQLTransaction> frontend,
     PassRefPtrWillBeRawPtr<SQLTransactionWrapper> wrapper,
     bool readOnly)
     : m_frontend(frontend)
     , m_database(db)
     , m_wrapper(wrapper)
     , m_hasCallback(m_frontend->hasCallback())
     , m_hasSuccessCallback(m_frontend->hasSuccessCallback())
     , m_hasErrorCallback(m_frontend->hasErrorCallback())
     , m_shouldRetryCurrentStatement(false)
     , m_modifiedDatabase(false)
@@ skipping 11 matching lines @@
     ASSERT(!m_sqliteTransaction);
 }
 
 void SQLTransactionBackend::trace(Visitor* visitor)
 {
     visitor->trace(m_frontend);
     visitor->trace(m_currentStatementBackend);
     visitor->trace(m_database);
     visitor->trace(m_wrapper);
     visitor->trace(m_statementQueue);
-    AbstractSQLTransactionBackend::trace(visitor);
 }
 
 void SQLTransactionBackend::doCleanup()
 {
     if (!m_frontend)
         return;
     m_frontend = nullptr; // Break the reference cycle. See comment about the life-cycle above.
 
     ASSERT(database()->databaseContext()->databaseThread()->isDatabaseThread());
 
@@ skipping 32 matching lines @@
     // This occurs if requests for transition to those states have already been
     // registered with the frontend just prior to a clean up request arriving.
     //
     // So instead, let our destructor handle their clean up since this
     // SQLTransactionBackend is guaranteed to not destruct until the frontend
     // is also destructing.
 
     m_wrapper = nullptr;
 }
 
-AbstractSQLStatement* SQLTransactionBackend::currentStatement()
+SQLStatement* SQLTransactionBackend::currentStatement()
 {
     return m_currentStatementBackend->frontend();
 }
 
 SQLErrorData* SQLTransactionBackend::transactionError()
 {
     return m_transactionError.get();
 }
 
 void SQLTransactionBackend::setShouldRetryCurrentStatement(bool shouldRetry)
@@ skipping 71 matching lines @@
     // Redirect to the end state to abort, clean up, and end the transaction.
     doCleanup();
 }
 
 void SQLTransactionBackend::performNextStep()
 {
     computeNextStateAndCleanupIfNeeded();
     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));
 }
 
 void SQLTransactionBackend::notifyDatabaseThreadIsShuttingDown()
 {
     ASSERT(database()->databaseContext()->databaseThread()->isDatabaseThread());
 
     // If the transaction is in progress, we should roll it back here, since this
@@ skipping 287 matching lines @@
 }
 
 SQLTransactionState SQLTransactionBackend::sendToFrontendState()
 {
     ASSERT(m_nextState != SQLTransactionState::Idle);
     m_frontend->requestTransitToState(m_nextState);
     return SQLTransactionState::Idle;
 }
 
 } // namespace blink