Diff
Modified: trunk/Source/WebCore/ChangeLog (178295 => 178296)
--- trunk/Source/WebCore/ChangeLog 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/ChangeLog 2015-01-12 21:58:08 UTC (rev 178296)
@@ -1,3 +1,44 @@
+2015-01-12 Anders Carlsson <ander...@apple.com>
+
+ Move DatabaseBackend functions back to Database
+ https://bugs.webkit.org/show_bug.cgi?id=140368
+
+ Reviewed by Sam Weinig.
+
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::openAndVerifyVersion):
+ (WebCore::Database::close):
+ (WebCore::Database::performOpenAndVerify):
+ (WebCore::Database::scheduleTransaction):
+ (WebCore::Database::runTransaction):
+ (WebCore::Database::scheduleTransactionStep):
+ (WebCore::Database::inProgressTransactionCompleted):
+ (WebCore::Database::transactionClient):
+ (WebCore::Database::transactionCoordinator):
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/DatabaseBackend.cpp:
+ (WebCore::DatabaseBackend::openAndVerifyVersion): Deleted.
+ (WebCore::DatabaseBackend::performOpenAndVerify): Deleted.
+ (WebCore::DatabaseBackend::close): Deleted.
+ (WebCore::DatabaseBackend::runTransaction): Deleted.
+ (WebCore::DatabaseBackend::inProgressTransactionCompleted): Deleted.
+ (WebCore::DatabaseBackend::scheduleTransaction): Deleted.
+ (WebCore::DatabaseBackend::scheduleTransactionStep): Deleted.
+ (WebCore::DatabaseBackend::transactionClient): Deleted.
+ (WebCore::DatabaseBackend::transactionCoordinator): Deleted.
+ * Modules/webdatabase/DatabaseBackend.h:
+ * Modules/webdatabase/DatabaseThread.cpp:
+ (WebCore::DatabaseThread::recordDatabaseOpen):
+ (WebCore::DatabaseThread::recordDatabaseClosed):
+ (WebCore::SameDatabasePredicate::SameDatabasePredicate):
+ (WebCore::DatabaseThread::unscheduleDatabaseTasks):
+ * Modules/webdatabase/DatabaseThread.h:
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ (WebCore::SQLTransactionBackend::create):
+ (WebCore::SQLTransactionBackend::SQLTransactionBackend):
+ * Modules/webdatabase/SQLTransactionBackend.h:
+ (WebCore::SQLTransactionBackend::database):
+
2015-01-12 Myles C. Maxfield <mmaxfi...@apple.com>
Addressing post-review comment after r178292
Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (178295 => 178296)
--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-01-12 21:58:08 UTC (rev 178296)
@@ -32,6 +32,7 @@
#if ENABLE(SQL_DATABASE)
#include "ChangeVersionData.h"
+#include "ChangeVersionWrapper.h"
#include "DatabaseCallback.h"
#include "DatabaseContext.h"
#include "DatabaseManager.h"
@@ -96,6 +97,128 @@
}
}
+bool Database::openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
+{
+ DatabaseTaskSynchronizer synchronizer;
+ if (!databaseContext()->databaseThread() || databaseContext()->databaseThread()->terminationRequested(&synchronizer))
+ return false;
+
+ bool success = false;
+ auto task = DatabaseOpenTask::create(this, setVersionInNewDatabase, &synchronizer, error, errorMessage, success);
+ databaseContext()->databaseThread()->scheduleImmediateTask(WTF::move(task));
+ synchronizer.waitForTaskCompletion();
+
+ return success;
+}
+
+void Database::close()
+{
+ ASSERT(databaseContext()->databaseThread());
+ ASSERT(currentThread() == databaseContext()->databaseThread()->getThreadID());
+
+ {
+ MutexLocker locker(m_transactionInProgressMutex);
+
+ // Clean up transactions that have not been scheduled yet:
+ // Transaction phase 1 cleanup. See comment on "What happens if a
+ // transaction is interrupted?" at the top of SQLTransactionBackend.cpp.
+ RefPtr<SQLTransactionBackend> transaction;
+ while (!m_transactionQueue.isEmpty()) {
+ transaction = m_transactionQueue.takeFirst();
+ transaction->notifyDatabaseThreadIsShuttingDown();
+ }
+
+ m_isTransactionQueueEnabled = false;
+ m_transactionInProgress = false;
+ }
+
+ closeDatabase();
+
+ // DatabaseThread keeps databases alive by referencing them in its
+ // m_openDatabaseSet. DatabaseThread::recordDatabaseClose() will remove
+ // this database from that set (which effectively deref's it). We hold on
+ // to it with a local pointer here for a liitle longer, so that we can
+ // unschedule any DatabaseTasks that refer to it before the database gets
+ // deleted.
+ Ref<DatabaseBackend> protect(*this);
+ databaseContext()->databaseThread()->recordDatabaseClosed(this);
+ databaseContext()->databaseThread()->unscheduleDatabaseTasks(this);
+}
+
+bool Database::performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
+{
+ if (DatabaseBackendBase::performOpenAndVerify(setVersionInNewDatabase, error, errorMessage)) {
+ if (databaseContext()->databaseThread())
+ databaseContext()->databaseThread()->recordDatabaseOpen(this);
+
+ return true;
+ }
+
+ return false;
+}
+
+void Database::scheduleTransaction()
+{
+ ASSERT(!m_transactionInProgressMutex.tryLock()); // Locked by caller.
+ RefPtr<SQLTransactionBackend> transaction;
+
+ if (m_isTransactionQueueEnabled && !m_transactionQueue.isEmpty())
+ transaction = m_transactionQueue.takeFirst();
+
+ if (transaction && databaseContext()->databaseThread()) {
+ auto task = DatabaseTransactionTask::create(transaction);
+ LOG(StorageAPI, "Scheduling DatabaseTransactionTask %p for transaction %p\n", task.get(), task->transaction());
+ m_transactionInProgress = true;
+ databaseContext()->databaseThread()->scheduleTask(WTF::move(task));
+ } else
+ m_transactionInProgress = false;
+}
+
+PassRefPtr<SQLTransactionBackend> Database::runTransaction(PassRefPtr<SQLTransaction> transaction, bool readOnly, const ChangeVersionData* data)
+{
+ MutexLocker locker(m_transactionInProgressMutex);
+ if (!m_isTransactionQueueEnabled)
+ return 0;
+
+ RefPtr<SQLTransactionWrapper> wrapper;
+ if (data)
+ wrapper = ChangeVersionWrapper::create(data->oldVersion(), data->newVersion());
+
+ RefPtr<SQLTransactionBackend> transactionBackend = SQLTransactionBackend::create(this, transaction, wrapper, readOnly);
+ m_transactionQueue.append(transactionBackend);
+ if (!m_transactionInProgress)
+ scheduleTransaction();
+
+ return transactionBackend;
+}
+
+void Database::scheduleTransactionStep(SQLTransactionBackend* transaction)
+{
+ if (!databaseContext()->databaseThread())
+ return;
+
+ auto task = DatabaseTransactionTask::create(transaction);
+ LOG(StorageAPI, "Scheduling DatabaseTransactionTask %p for the transaction step\n", task.get());
+ databaseContext()->databaseThread()->scheduleTask(WTF::move(task));
+}
+
+void Database::inProgressTransactionCompleted()
+{
+ MutexLocker locker(m_transactionInProgressMutex);
+ m_transactionInProgress = false;
+ scheduleTransaction();
+}
+
+SQLTransactionClient* Database::transactionClient() const
+{
+ return databaseContext()->databaseThread()->transactionClient();
+}
+
+SQLTransactionCoordinator* Database::transactionCoordinator() const
+{
+ return databaseContext()->databaseThread()->transactionCoordinator();
+}
+
Database* Database::from(DatabaseBackend* backend)
{
return static_cast<Database*>(backend->m_frontend);
@@ -164,7 +287,7 @@
{
RefPtr<SQLTransaction> transaction = SQLTransaction::create(*this, WTF::move(callback), WTF::move(successCallback), errorCallback.copyRef(), readOnly);
- RefPtr<SQLTransactionBackend> transactionBackend = backend()->runTransaction(transaction.release(), readOnly, changeVersionData);
+ RefPtr<SQLTransactionBackend> transactionBackend = runTransaction(transaction.release(), readOnly, changeVersionData);
if (!transactionBackend && errorCallback) {
WTF::RefPtr<SQLTransactionErrorCallback> errorCallbackProtector = WTF::move(errorCallback);
m_scriptExecutionContext->postTask([errorCallbackProtector](ScriptExecutionContext&) {
Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (178295 => 178296)
--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-01-12 21:58:08 UTC (rev 178296)
@@ -49,10 +49,20 @@
class SQLTransactionErrorCallback;
class VoidCallback;
-class Database : public DatabaseBackend {
+class Database final : public DatabaseBackend {
public:
virtual ~Database();
+ virtual bool openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
+ void close();
+
+ PassRefPtr<SQLTransactionBackend> runTransaction(PassRefPtr<SQLTransaction>, bool readOnly, const ChangeVersionData*);
+ void scheduleTransactionStep(SQLTransactionBackend*);
+ void inProgressTransactionCompleted();
+
+ SQLTransactionClient* transactionClient() const;
+ SQLTransactionCoordinator* transactionCoordinator() const;
+
// Direct support for the DOM API
virtual String version() const;
void changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionCallback>,
@@ -84,6 +94,10 @@
PassRefPtr<DatabaseBackend> backend();
static PassRefPtr<Database> create(ScriptExecutionContext*, PassRefPtr<DatabaseBackendBase>);
+ virtual bool performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
+
+ void scheduleTransaction();
+
void runTransaction(RefPtr<SQLTransactionCallback>&&, RefPtr<SQLTransactionErrorCallback>&&, RefPtr<VoidCallback>&& successCallback, bool readOnly, const ChangeVersionData* = nullptr);
Vector<String> performGetTableNames();
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp (178295 => 178296)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2015-01-12 21:58:08 UTC (rev 178296)
@@ -54,129 +54,6 @@
{
}
-bool DatabaseBackend::openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
-{
- DatabaseTaskSynchronizer synchronizer;
- if (!databaseContext()->databaseThread() || databaseContext()->databaseThread()->terminationRequested(&synchronizer))
- return false;
-
- bool success = false;
- auto task = DatabaseOpenTask::create(this, setVersionInNewDatabase, &synchronizer, error, errorMessage, success);
- databaseContext()->databaseThread()->scheduleImmediateTask(WTF::move(task));
- synchronizer.waitForTaskCompletion();
-
- return success;
-}
-
-bool DatabaseBackend::performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
-{
- if (DatabaseBackendBase::performOpenAndVerify(setVersionInNewDatabase, error, errorMessage)) {
- if (databaseContext()->databaseThread())
- databaseContext()->databaseThread()->recordDatabaseOpen(this);
-
- return true;
- }
-
- return false;
-}
-
-void DatabaseBackend::close()
-{
- ASSERT(databaseContext()->databaseThread());
- ASSERT(currentThread() == databaseContext()->databaseThread()->getThreadID());
-
- {
- MutexLocker locker(m_transactionInProgressMutex);
-
- // Clean up transactions that have not been scheduled yet:
- // Transaction phase 1 cleanup. See comment on "What happens if a
- // transaction is interrupted?" at the top of SQLTransactionBackend.cpp.
- RefPtr<SQLTransactionBackend> transaction;
- while (!m_transactionQueue.isEmpty()) {
- transaction = m_transactionQueue.takeFirst();
- transaction->notifyDatabaseThreadIsShuttingDown();
- }
-
- m_isTransactionQueueEnabled = false;
- m_transactionInProgress = false;
- }
-
- closeDatabase();
-
- // DatabaseThread keeps databases alive by referencing them in its
- // m_openDatabaseSet. DatabaseThread::recordDatabaseClose() will remove
- // this database from that set (which effectively deref's it). We hold on
- // to it with a local pointer here for a liitle longer, so that we can
- // unschedule any DatabaseTasks that refer to it before the database gets
- // deleted.
- Ref<DatabaseBackend> protect(*this);
- databaseContext()->databaseThread()->recordDatabaseClosed(this);
- databaseContext()->databaseThread()->unscheduleDatabaseTasks(this);
-}
-
-PassRefPtr<SQLTransactionBackend> DatabaseBackend::runTransaction(PassRefPtr<SQLTransaction> transaction,
- bool readOnly, const ChangeVersionData* data)
-{
- MutexLocker locker(m_transactionInProgressMutex);
- if (!m_isTransactionQueueEnabled)
- return 0;
-
- RefPtr<SQLTransactionWrapper> wrapper;
- if (data)
- wrapper = ChangeVersionWrapper::create(data->oldVersion(), data->newVersion());
-
- RefPtr<SQLTransactionBackend> transactionBackend = SQLTransactionBackend::create(this, transaction, wrapper, readOnly);
- m_transactionQueue.append(transactionBackend);
- if (!m_transactionInProgress)
- scheduleTransaction();
-
- return transactionBackend;
-}
-
-void DatabaseBackend::inProgressTransactionCompleted()
-{
- MutexLocker locker(m_transactionInProgressMutex);
- m_transactionInProgress = false;
- scheduleTransaction();
-}
-
-void DatabaseBackend::scheduleTransaction()
-{
- ASSERT(!m_transactionInProgressMutex.tryLock()); // Locked by caller.
- RefPtr<SQLTransactionBackend> transaction;
-
- if (m_isTransactionQueueEnabled && !m_transactionQueue.isEmpty())
- transaction = m_transactionQueue.takeFirst();
-
- if (transaction && databaseContext()->databaseThread()) {
- auto task = DatabaseTransactionTask::create(transaction);
- LOG(StorageAPI, "Scheduling DatabaseTransactionTask %p for transaction %p\n", task.get(), task->transaction());
- m_transactionInProgress = true;
- databaseContext()->databaseThread()->scheduleTask(WTF::move(task));
- } else
- m_transactionInProgress = false;
-}
-
-void DatabaseBackend::scheduleTransactionStep(SQLTransactionBackend* transaction)
-{
- if (!databaseContext()->databaseThread())
- return;
-
- auto task = DatabaseTransactionTask::create(transaction);
- LOG(StorageAPI, "Scheduling DatabaseTransactionTask %p for the transaction step\n", task.get());
- databaseContext()->databaseThread()->scheduleTask(WTF::move(task));
-}
-
-SQLTransactionClient* DatabaseBackend::transactionClient() const
-{
- return databaseContext()->databaseThread()->transactionClient();
-}
-
-SQLTransactionCoordinator* DatabaseBackend::transactionCoordinator() const
-{
- return databaseContext()->databaseThread()->transactionCoordinator();
-}
-
} // namespace WebCore
#endif // ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h (178295 => 178296)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2015-01-12 21:58:08 UTC (rev 178296)
@@ -52,26 +52,12 @@
public:
DatabaseBackend(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
- virtual bool openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
- void close();
-
- PassRefPtr<SQLTransactionBackend> runTransaction(PassRefPtr<SQLTransaction>, bool readOnly, const ChangeVersionData*);
- void scheduleTransactionStep(SQLTransactionBackend*);
- void inProgressTransactionCompleted();
-
- SQLTransactionClient* transactionClient() const;
- SQLTransactionCoordinator* transactionCoordinator() const;
-
private:
class DatabaseOpenTask;
class DatabaseCloseTask;
class DatabaseTransactionTask;
class DatabaseTableNamesTask;
- virtual bool performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
-
- void scheduleTransaction();
-
Deque<RefPtr<SQLTransactionBackend>> m_transactionQueue;
Mutex m_transactionInProgressMutex;
bool m_transactionInProgress;
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp (178295 => 178296)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp 2015-01-12 21:58:08 UTC (rev 178296)
@@ -227,7 +227,7 @@
cleanupSync->taskCompleted();
}
-void DatabaseThread::recordDatabaseOpen(DatabaseBackend* database)
+void DatabaseThread::recordDatabaseOpen(Database* database)
{
ASSERT(currentThread() == m_threadID);
ASSERT(database);
@@ -235,7 +235,7 @@
m_openDatabaseSet.add(database);
}
-void DatabaseThread::recordDatabaseClosed(DatabaseBackend* database)
+void DatabaseThread::recordDatabaseClosed(Database* database)
{
ASSERT(currentThread() == m_threadID);
ASSERT(database);
@@ -257,13 +257,13 @@
class SameDatabasePredicate {
public:
- SameDatabasePredicate(const DatabaseBackend* database) : m_database(database) { }
+ SameDatabasePredicate(const Database* database) : m_database(database) { }
bool operator()(const DatabaseTask& task) const { return task.database() == m_database; }
private:
- const DatabaseBackend* m_database;
+ const Database* m_database;
};
-void DatabaseThread::unscheduleDatabaseTasks(DatabaseBackend* database)
+void DatabaseThread::unscheduleDatabaseTasks(Database* database)
{
// Note that the thread loop is running, so some tasks for the database
// may still be executed. This is unavoidable.
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h (178295 => 178296)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h 2015-01-12 21:58:08 UTC (rev 178296)
@@ -40,7 +40,7 @@
namespace WebCore {
-class DatabaseBackend;
+class Database;
class DatabaseTask;
class DatabaseTaskSynchronizer;
class Document;
@@ -58,10 +58,10 @@
void scheduleTask(std::unique_ptr<DatabaseTask>);
void scheduleImmediateTask(std::unique_ptr<DatabaseTask>); // This just adds the task to the front of the queue - the caller needs to be extremely careful not to create deadlocks when waiting for completion.
- void unscheduleDatabaseTasks(DatabaseBackend*);
+ void unscheduleDatabaseTasks(Database*);
- void recordDatabaseOpen(DatabaseBackend*);
- void recordDatabaseClosed(DatabaseBackend*);
+ void recordDatabaseOpen(Database*);
+ void recordDatabaseClosed(Database*);
ThreadIdentifier getThreadID() { return m_threadID; }
SQLTransactionClient* transactionClient() { return m_transactionClient.get(); }
@@ -90,7 +90,7 @@
#endif
// This set keeps track of the open databases that have been used on this thread.
- typedef HashSet<RefPtr<DatabaseBackend>> DatabaseSet;
+ typedef HashSet<RefPtr<Database>> DatabaseSet;
DatabaseSet m_openDatabaseSet;
std::unique_ptr<SQLTransactionClient> m_transactionClient;
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (178295 => 178296)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-01-12 21:58:08 UTC (rev 178296)
@@ -346,12 +346,12 @@
namespace WebCore {
-PassRefPtr<SQLTransactionBackend> SQLTransactionBackend::create(DatabaseBackend* db, PassRefPtr<SQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly)
+PassRefPtr<SQLTransactionBackend> SQLTransactionBackend::create(Database* db, PassRefPtr<SQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly)
{
return adoptRef(new SQLTransactionBackend(db, frontend, wrapper, readOnly));
}
-SQLTransactionBackend::SQLTransactionBackend(DatabaseBackend* db, PassRefPtr<SQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly)
+SQLTransactionBackend::SQLTransactionBackend(Database* db, PassRefPtr<SQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly)
: m_frontend(frontend)
, m_database(db)
, m_wrapper(wrapper)
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h (178295 => 178296)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-01-12 21:58:08 UTC (rev 178296)
@@ -40,7 +40,7 @@
namespace WebCore {
-class DatabaseBackend;
+class Database;
class OriginLock;
class SQLError;
class SQLiteTransaction;
@@ -61,7 +61,7 @@
class SQLTransactionBackend : public ThreadSafeRefCounted<SQLTransactionBackend>, public SQLTransactionStateMachine<SQLTransactionBackend> {
public:
- static PassRefPtr<SQLTransactionBackend> create(DatabaseBackend*, PassRefPtr<SQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly);
+ static PassRefPtr<SQLTransactionBackend> create(Database*, PassRefPtr<SQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly);
virtual ~SQLTransactionBackend();
@@ -72,7 +72,7 @@
bool shouldPerformWhilePaused() const;
#endif
- DatabaseBackend* database() { return m_database.get(); }
+ Database* database() { return m_database.get(); }
bool isReadOnly() { return m_readOnly; }
void notifyDatabaseThreadIsShuttingDown();
@@ -84,7 +84,7 @@
void executeSQL(std::unique_ptr<SQLStatement>, const String& statement, const Vector<SQLValue>& arguments, int permissions);
private:
- SQLTransactionBackend(DatabaseBackend*, PassRefPtr<SQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly);
+ SQLTransactionBackend(Database*, PassRefPtr<SQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly);
void doCleanup();
@@ -117,7 +117,7 @@
RefPtr<SQLTransaction> m_frontend; // Has a reference cycle, and will break in doCleanup().
RefPtr<SQLStatementBackend> m_currentStatementBackend;
- RefPtr<DatabaseBackend> m_database;
+ RefPtr<Database> m_database;
RefPtr<SQLTransactionWrapper> m_wrapper;
RefPtr<SQLError> m_transactionError;
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp (178295 => 178296)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp 2015-01-12 21:41:18 UTC (rev 178295)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp 2015-01-12 21:58:08 UTC (rev 178296)
@@ -34,7 +34,7 @@
#if ENABLE(SQL_DATABASE)
-#include "DatabaseBackend.h"
+#include "Database.h"
#include "SQLTransactionBackend.h"
#include "SecurityOrigin.h"
#include <wtf/Deque.h>
@@ -46,7 +46,7 @@
static String getDatabaseIdentifier(SQLTransactionBackend* transaction)
{
- DatabaseBackend* database = transaction->database();
+ Database* database = transaction->database();
ASSERT(database);
return database->securityOrigin()->databaseIdentifier();
}
