Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (187973 => 187974)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-05 19:31:35 UTC (rev 187974)
@@ -1003,7 +1003,6 @@
Modules/webdatabase/DOMWindowWebDatabase.cpp
Modules/webdatabase/Database.cpp
Modules/webdatabase/DatabaseAuthorizer.cpp
- Modules/webdatabase/DatabaseBackend.cpp
Modules/webdatabase/DatabaseBackendBase.cpp
Modules/webdatabase/DatabaseContext.cpp
Modules/webdatabase/DatabaseManager.cpp
Modified: trunk/Source/WebCore/ChangeLog (187973 => 187974)
--- trunk/Source/WebCore/ChangeLog 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 19:31:35 UTC (rev 187974)
@@ -1,3 +1,65 @@
+2015-08-05 Anders Carlsson <ander...@apple.com>
+
+ Get rid of DatabaseBackend as another step towards merging Database and DatabaseBackendBase
+ https://bugs.webkit.org/show_bug.cgi?id=147687
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * Modules/webdatabase/ChangeVersionWrapper.cpp:
+ (WebCore::ChangeVersionWrapper::performPreflight):
+ (WebCore::ChangeVersionWrapper::performPostflight):
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::Database):
+ (WebCore::Database::close):
+ (WebCore::Database::from): Deleted.
+ (WebCore::Database::backend): Deleted.
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/DatabaseBackend.cpp: Removed.
+ (WebCore::DatabaseBackend::DatabaseBackend): Deleted.
+ * Modules/webdatabase/DatabaseBackend.h: Removed.
+ * Modules/webdatabase/DatabaseManager.cpp:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ * Modules/webdatabase/DatabaseTask.cpp:
+ (WebCore::DatabaseTask::DatabaseTask):
+ (WebCore::DatabaseOpenTask::DatabaseOpenTask):
+ (WebCore::DatabaseOpenTask::doPerformTask):
+ (WebCore::DatabaseOpenTask::debugTaskName):
+ (WebCore::DatabaseCloseTask::DatabaseCloseTask):
+ (WebCore::DatabaseCloseTask::doPerformTask):
+ (WebCore::DatabaseCloseTask::debugTaskName):
+ (WebCore::DatabaseTransactionTask::DatabaseTransactionTask):
+ (WebCore::DatabaseTransactionTask::~DatabaseTransactionTask):
+ (WebCore::DatabaseTransactionTask::doPerformTask):
+ (WebCore::DatabaseTransactionTask::debugTaskName):
+ (WebCore::DatabaseTableNamesTask::DatabaseTableNamesTask):
+ (WebCore::DatabaseTableNamesTask::doPerformTask):
+ (WebCore::DatabaseTableNamesTask::debugTaskName):
+ (WebCore::DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseOpenTask::doPerformTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseOpenTask::debugTaskName): Deleted.
+ (WebCore::DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseCloseTask::doPerformTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseCloseTask::debugTaskName): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTransactionTask::~DatabaseTransactionTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTransactionTask::doPerformTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTransactionTask::debugTaskName): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTableNamesTask::doPerformTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTableNamesTask::debugTaskName): Deleted.
+ * Modules/webdatabase/DatabaseTask.h:
+ (WebCore::DatabaseTask::database):
+ * Modules/webdatabase/SQLStatementBackend.cpp:
+ (WebCore::SQLStatementBackend::execute):
+ * Modules/webdatabase/SQLStatementBackend.h:
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ (WebCore::SQLTransactionBackend::executeSQL):
+ (WebCore::SQLTransactionBackend::openTransactionAndPreflight):
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+
2015-08-04 Filip Pizlo <fpi...@apple.com>
Rename Mutex to DeprecatedMutex
Modified: trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp 2015-08-05 19:31:35 UTC (rev 187974)
@@ -45,7 +45,7 @@
{
ASSERT(transaction && transaction->database());
- DatabaseBackend* database = transaction->database();
+ Database* database = transaction->database();
String actualVersion;
if (!database->getVersionFromDatabase(actualVersion)) {
@@ -67,7 +67,7 @@
{
ASSERT(transaction && transaction->database());
- DatabaseBackend* database = transaction->database();
+ Database* database = transaction->database();
if (!database->setVersionInDatabase(m_newVersion)) {
int sqliteError = database->sqliteDatabase().lastError();
Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-05 19:31:35 UTC (rev 187974)
@@ -70,7 +70,9 @@
}
Database::Database(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
- : DatabaseBackend(databaseContext.get(), name, expectedVersion, displayName, estimatedSize)
+ : DatabaseBackendBase(databaseContext.get(), name, expectedVersion, displayName, estimatedSize)
+ , m_transactionInProgress(false)
+ , m_isTransactionQueueEnabled(true)
, m_scriptExecutionContext(databaseContext->scriptExecutionContext())
, m_databaseContext(databaseContext)
, m_deleted(false)
@@ -138,7 +140,7 @@
// 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);
+ Ref<Database> protect(*this);
databaseContext()->databaseThread()->recordDatabaseClosed(this);
databaseContext()->databaseThread()->unscheduleDatabaseTasks(this);
}
@@ -223,16 +225,6 @@
return databaseContext()->databaseThread()->transactionCoordinator();
}
-Database* Database::from(DatabaseBackend* backend)
-{
- return static_cast<Database*>(backend->m_frontend);
-}
-
-PassRefPtr<DatabaseBackend> Database::backend()
-{
- return this;
-}
-
String Database::version() const
{
if (m_deleted)
Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-05 19:31:35 UTC (rev 187974)
@@ -29,9 +29,10 @@
#ifndef Database_h
#define Database_h
-#include "DatabaseBackend.h"
+#include "DatabaseBackendBase.h"
#include "DatabaseBasicTypes.h"
#include "DatabaseError.h"
+#include <wtf/Deque.h>
#include <wtf/text/WTFString.h>
namespace WebCore {
@@ -44,10 +45,12 @@
class SQLTransaction;
class SQLTransactionBackend;
class SQLTransactionCallback;
+class SQLTransactionClient;
+class SQLTransactionCoordinator;
class SQLTransactionErrorCallback;
class VoidCallback;
-class Database final : public DatabaseBackend {
+class Database final : public DatabaseBackendBase {
public:
virtual ~Database();
@@ -74,7 +77,6 @@
void readTransaction(PassRefPtr<SQLTransactionCallback>, PassRefPtr<SQLTransactionErrorCallback>, PassRefPtr<VoidCallback> successCallback);
// Internal engine support
- static Database* from(DatabaseBackend*);
DatabaseContext* databaseContext() const { return m_databaseContext.get(); }
ScriptExecutionContext* scriptExecutionContext() { return m_scriptExecutionContext.get(); }
@@ -89,19 +91,22 @@
void scheduleTransactionCallback(SQLTransaction*);
+ virtual bool performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
+ Vector<String> performGetTableNames();
+
private:
Database(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
- 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();
+ Deque<RefPtr<SQLTransactionBackend>> m_transactionQueue;
+ DeprecatedMutex m_transactionInProgressMutex;
+ bool m_transactionInProgress;
+ bool m_isTransactionQueueEnabled;
RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
RefPtr<SecurityOrigin> m_databaseThreadSecurityOrigin;
@@ -112,7 +117,6 @@
friend class DatabaseManager;
friend class DatabaseServer; // FIXME: remove this when the backend has been split out.
- friend class DatabaseBackend; // FIXME: remove this when the backend has been split out.
friend class SQLStatement;
friend class SQLTransaction;
};
Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2015-08-05 19:31:35 UTC (rev 187974)
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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 "DatabaseBackend.h"
-
-#include "ChangeVersionData.h"
-#include "ChangeVersionWrapper.h"
-#include "Database.h"
-#include "DatabaseContext.h"
-#include "DatabaseTask.h"
-#include "DatabaseThread.h"
-#include "DatabaseTracker.h"
-#include "Logging.h"
-#include "SQLError.h"
-#include "SQLTransaction.h"
-#include "SQLTransactionBackend.h"
-#include "SQLTransactionCallback.h"
-#include "SQLTransactionClient.h"
-#include "SQLTransactionCoordinator.h"
-#include "SQLTransactionErrorCallback.h"
-#include "VoidCallback.h"
-
-namespace WebCore {
-
-DatabaseBackend::DatabaseBackend(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
- : DatabaseBackendBase(databaseContext, name, expectedVersion, displayName, estimatedSize)
- , m_transactionInProgress(false)
- , m_isTransactionQueueEnabled(true)
-{
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2015-08-05 19:31:35 UTC (rev 187974)
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DatabaseBackend_h
-#define DatabaseBackend_h
-
-#include "DatabaseBackendBase.h"
-#include <wtf/Deque.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class ChangeVersionData;
-class Database;
-class DatabaseServer;
-class SQLTransaction;
-class SQLTransactionBackend;
-class SQLTransactionClient;
-class SQLTransactionCoordinator;
-
-// FIXME: This implementation of DatabaseBackend is only a place holder
-// for the split out of the Database backend to be done later. This
-// place holder is needed to allow other code that need to reference the
-// DatabaseBackend to do so before the proper backend split is
-// available. This should be replaced with the actual implementation later.
-
-class DatabaseBackend : public DatabaseBackendBase {
-public:
- DatabaseBackend(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
-
-private:
- class DatabaseOpenTask;
- class DatabaseCloseTask;
- class DatabaseTransactionTask;
- class DatabaseTableNamesTask;
-
- Deque<RefPtr<SQLTransactionBackend>> m_transactionQueue;
- DeprecatedMutex m_transactionInProgressMutex;
- bool m_transactionInProgress;
- bool m_isTransactionQueueEnabled;
-
- friend class Database;
-};
-
-} // namespace WebCore
-
-#endif // DatabaseBackend_h
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-08-05 19:31:35 UTC (rev 187974)
@@ -28,7 +28,6 @@
#include "AbstractDatabaseServer.h"
#include "Database.h"
-#include "DatabaseBackend.h"
#include "DatabaseBackendBase.h"
#include "DatabaseCallback.h"
#include "DatabaseContext.h"
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-08-05 19:31:35 UTC (rev 187974)
@@ -27,7 +27,6 @@
#include "DatabaseServer.h"
#include "Database.h"
-#include "DatabaseBackend.h"
#include "DatabaseContext.h"
#include "DatabaseTracker.h"
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp 2015-08-05 19:31:35 UTC (rev 187974)
@@ -29,7 +29,6 @@
#include "DatabaseTask.h"
#include "Database.h"
-#include "DatabaseBackend.h"
#include "Logging.h"
namespace WebCore {
@@ -58,7 +57,7 @@
m_synchronousMutex.unlock();
}
-DatabaseTask::DatabaseTask(DatabaseBackend& database, DatabaseTaskSynchronizer* synchronizer)
+DatabaseTask::DatabaseTask(Database& database, DatabaseTaskSynchronizer* synchronizer)
: m_database(database)
, m_synchronizer(synchronizer)
#if !LOG_DISABLED
@@ -98,7 +97,7 @@
// *** DatabaseOpenTask ***
// Opens the database file and verifies the version matches the expected version.
-DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask(DatabaseBackend& database, bool setVersionInNewDatabase, DatabaseTaskSynchronizer& synchronizer, DatabaseError& error, String& errorMessage, bool& success)
+DatabaseOpenTask::DatabaseOpenTask(Database& database, bool setVersionInNewDatabase, DatabaseTaskSynchronizer& synchronizer, DatabaseError& error, String& errorMessage, bool& success)
: DatabaseTask(database, &synchronizer)
, m_setVersionInNewDatabase(setVersionInNewDatabase)
, m_error(error)
@@ -107,7 +106,7 @@
{
}
-void DatabaseBackend::DatabaseOpenTask::doPerformTask()
+void DatabaseOpenTask::doPerformTask()
{
String errorMessage;
m_success = database().performOpenAndVerify(m_setVersionInNewDatabase, m_error, errorMessage);
@@ -116,7 +115,7 @@
}
#if !LOG_DISABLED
-const char* DatabaseBackend::DatabaseOpenTask::debugTaskName() const
+const char* DatabaseOpenTask::debugTaskName() const
{
return "DatabaseOpenTask";
}
@@ -125,18 +124,18 @@
// *** DatabaseCloseTask ***
// Closes the database.
-DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask(DatabaseBackend& database, DatabaseTaskSynchronizer& synchronizer)
+DatabaseCloseTask::DatabaseCloseTask(Database& database, DatabaseTaskSynchronizer& synchronizer)
: DatabaseTask(database, &synchronizer)
{
}
-void DatabaseBackend::DatabaseCloseTask::doPerformTask()
+void DatabaseCloseTask::doPerformTask()
{
- Database::from(&database())->close();
+ database().close();
}
#if !LOG_DISABLED
-const char* DatabaseBackend::DatabaseCloseTask::debugTaskName() const
+const char* DatabaseCloseTask::debugTaskName() const
{
return "DatabaseCloseTask";
}
@@ -145,14 +144,14 @@
// *** DatabaseTransactionTask ***
// Starts a transaction that will report its results via a callback.
-DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend> transaction)
- : DatabaseTask(*Database::from(transaction->database()), 0)
+DatabaseTransactionTask::DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend> transaction)
+ : DatabaseTask(*transaction->database(), 0)
, m_transaction(transaction)
, m_didPerformTask(false)
{
}
-DatabaseBackend::DatabaseTransactionTask::~DatabaseTransactionTask()
+DatabaseTransactionTask::~DatabaseTransactionTask()
{
// If the task is being destructed without the transaction ever being run,
// then we must either have an error or an interruption. Give the
@@ -166,14 +165,14 @@
m_transaction->notifyDatabaseThreadIsShuttingDown();
}
-void DatabaseBackend::DatabaseTransactionTask::doPerformTask()
+void DatabaseTransactionTask::doPerformTask()
{
m_transaction->performNextStep();
m_didPerformTask = true;
}
#if !LOG_DISABLED
-const char* DatabaseBackend::DatabaseTransactionTask::debugTaskName() const
+const char* DatabaseTransactionTask::debugTaskName() const
{
return "DatabaseTransactionTask";
}
@@ -182,19 +181,19 @@
// *** DatabaseTableNamesTask ***
// Retrieves a list of all tables in the database - for WebInspector support.
-DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask(DatabaseBackend& database, DatabaseTaskSynchronizer& synchronizer, Vector<String>& names)
+DatabaseTableNamesTask::DatabaseTableNamesTask(Database& database, DatabaseTaskSynchronizer& synchronizer, Vector<String>& names)
: DatabaseTask(database, &synchronizer)
, m_tableNames(names)
{
}
-void DatabaseBackend::DatabaseTableNamesTask::doPerformTask()
+void DatabaseTableNamesTask::doPerformTask()
{
- m_tableNames = Database::from(&database())->performGetTableNames();
+ m_tableNames = database().performGetTableNames();
}
#if !LOG_DISABLED
-const char* DatabaseBackend::DatabaseTableNamesTask::debugTaskName() const
+const char* DatabaseTableNamesTask::debugTaskName() const
{
return "DatabaseTableNamesTask";
}
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2015-08-05 19:31:35 UTC (rev 187974)
@@ -28,7 +28,6 @@
#ifndef DatabaseTask_h
#define DatabaseTask_h
-#include "DatabaseBackend.h"
#include "DatabaseBasicTypes.h"
#include "DatabaseError.h"
#include "SQLTransactionBackend.h"
@@ -73,19 +72,19 @@
void performTask();
- DatabaseBackend& database() const { return m_database; }
+ Database& database() const { return m_database; }
#ifndef NDEBUG
bool hasSynchronizer() const { return m_synchronizer; }
bool hasCheckedForTermination() const { return m_synchronizer->hasCheckedForTermination(); }
#endif
protected:
- DatabaseTask(DatabaseBackend&, DatabaseTaskSynchronizer*);
+ DatabaseTask(Database&, DatabaseTaskSynchronizer*);
private:
virtual void doPerformTask() = 0;
- DatabaseBackend& m_database;
+ Database& m_database;
DatabaseTaskSynchronizer* m_synchronizer;
#if !LOG_DISABLED
@@ -94,9 +93,9 @@
#endif
};
-class DatabaseBackend::DatabaseOpenTask : public DatabaseTask {
+class DatabaseOpenTask : public DatabaseTask {
public:
- DatabaseOpenTask(DatabaseBackend&, bool setVersionInNewDatabase, DatabaseTaskSynchronizer&, DatabaseError&, String& errorMessage, bool& success);
+ DatabaseOpenTask(Database&, bool setVersionInNewDatabase, DatabaseTaskSynchronizer&, DatabaseError&, String& errorMessage, bool& success);
private:
virtual void doPerformTask() override;
@@ -110,9 +109,9 @@
bool& m_success;
};
-class DatabaseBackend::DatabaseCloseTask : public DatabaseTask {
+class DatabaseCloseTask : public DatabaseTask {
public:
- DatabaseCloseTask(DatabaseBackend&, DatabaseTaskSynchronizer&);
+ DatabaseCloseTask(Database&, DatabaseTaskSynchronizer&);
private:
virtual void doPerformTask() override;
@@ -121,7 +120,7 @@
#endif
};
-class DatabaseBackend::DatabaseTransactionTask : public DatabaseTask {
+class DatabaseTransactionTask : public DatabaseTask {
public:
explicit DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend>);
virtual ~DatabaseTransactionTask();
@@ -138,9 +137,9 @@
bool m_didPerformTask;
};
-class DatabaseBackend::DatabaseTableNamesTask : public DatabaseTask {
+class DatabaseTableNamesTask : public DatabaseTask {
public:
- DatabaseTableNamesTask(DatabaseBackend&, DatabaseTaskSynchronizer&, Vector<String>& names);
+ DatabaseTableNamesTask(Database&, DatabaseTaskSynchronizer&, Vector<String>& names);
private:
virtual void doPerformTask() override;
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-05 19:31:35 UTC (rev 187974)
@@ -28,7 +28,7 @@
#include "config.h"
#include "SQLStatementBackend.h"
-#include "DatabaseBackend.h"
+#include "Database.h"
#include "Logging.h"
#include "SQLError.h"
#include "SQLResultSet.h"
@@ -112,7 +112,7 @@
return m_resultSet;
}
-bool SQLStatementBackend::execute(DatabaseBackend& db)
+bool SQLStatementBackend::execute(Database& db)
{
ASSERT(!m_resultSet);
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-08-05 19:31:35 UTC (rev 187974)
@@ -35,7 +35,7 @@
namespace WebCore {
-class DatabaseBackend;
+class Database;
class SQLError;
class SQLResultSet;
class SQLStatement;
@@ -47,7 +47,7 @@
const String& sqlStatement, const Vector<SQLValue>& arguments, int permissions);
virtual ~SQLStatementBackend();
- bool execute(DatabaseBackend&);
+ bool execute(Database&);
bool lastExecutionFailedDueToQuota() const;
bool hasStatementCallback() const { return m_hasCallback; }
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (187973 => 187974)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-05 19:31:35 UTC (rev 187974)
@@ -29,9 +29,8 @@
#include "config.h"
#include "SQLTransactionBackend.h"
-#include "Database.h" // FIXME: Should only be used in the frontend.
+#include "Database.h"
#include "DatabaseAuthorizer.h"
-#include "DatabaseBackend.h"
#include "DatabaseContext.h"
#include "DatabaseThread.h"
#include "DatabaseTracker.h"
@@ -529,7 +528,7 @@
RefPtr<SQLStatementBackend> statementBackend;
statementBackend = SQLStatementBackend::create(WTF::move(statement), sqlStatement, arguments, permissions);
- if (Database::from(m_database.get())->deleted())
+ if (m_database->deleted())
statementBackend->setDatabaseDeletedError();
enqueueStatementBackend(statementBackend);
@@ -567,7 +566,7 @@
LOG(StorageAPI, "Opening and preflighting transaction %p", this);
// If the database was deleted, jump to the error callback
- if (Database::from(m_database.get())->deleted()) {
+ if (m_database->deleted()) {
m_transactionError = SQLError::create(SQLError::UNKNOWN_ERR, "unable to open a transaction, because the user deleted the database");
return nextStateForTransactionError();
}
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (187973 => 187974)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-05 19:31:35 UTC (rev 187974)
@@ -6808,7 +6808,6 @@
<ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp" />
<ClCompile Include="..\Modules\webdatabase\Database.cpp" />
<ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp" />
- <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp" />
<ClCompile Include="..\Modules\webdatabase\DatabaseBackendBase.cpp" />
<ClCompile Include="..\Modules\webdatabase\DatabaseContext.cpp" />
<ClCompile Include="..\Modules\webdatabase\DatabaseManager.cpp" />
@@ -20548,7 +20547,6 @@
<ClInclude Include="..\Modules\webdatabase\ChangeVersionWrapper.h" />
<ClInclude Include="..\Modules\webdatabase\Database.h" />
<ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h" />
- <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h" />
<ClInclude Include="..\Modules\webdatabase\DatabaseBackendBase.h" />
<ClInclude Include="..\Modules\webdatabase\DatabaseBasicTypes.h" />
<ClInclude Include="..\Modules\webdatabase\DatabaseCallback.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (187973 => 187974)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-05 19:31:35 UTC (rev 187974)
@@ -483,9 +483,6 @@
<ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp">
<Filter>Modules\webdatabase</Filter>
</ClCompile>
- <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp">
- <Filter>Modules\webdatabase</Filter>
- </ClCompile>
<ClCompile Include="..\Modules\webdatabase\DatabaseBackendBase.cpp">
<Filter>Modules\webdatabase</Filter>
</ClCompile>
@@ -7448,9 +7445,6 @@
<ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h">
<Filter>Modules\webdatabase</Filter>
</ClInclude>
- <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
<ClInclude Include="..\Modules\webdatabase\DatabaseBackendBase.h">
<Filter>Modules\webdatabase</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (187973 => 187974)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-05 19:31:35 UTC (rev 187974)
@@ -6818,8 +6818,6 @@
FE0D84E910484348001A179E /* WebEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = FE0D84E810484348001A179E /* WebEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE0D84EB1048436E001A179E /* WebEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = FE0D84EA1048436E001A179E /* WebEvent.mm */; };
FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */ = {isa = PBXBuildFile; fileRef = FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */; settings = {ATTRIBUTES = (Private, ); }; };
- FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */; };
- FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */ = {isa = PBXBuildFile; fileRef = FE36FD1116C7826400F887C1 /* ChangeVersionData.h */; };
FE36FD1616C7826500F887C1 /* SQLTransactionStateMachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE36FD1216C7826400F887C1 /* SQLTransactionStateMachine.cpp */; };
@@ -14585,8 +14583,6 @@
FE0D84E810484348001A179E /* WebEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEvent.h; sourceTree = "<group>"; };
FE0D84EA1048436E001A179E /* WebEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebEvent.mm; sourceTree = "<group>"; };
FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractDatabaseServer.h; sourceTree = "<group>"; };
- FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseBackend.cpp; sourceTree = "<group>"; };
- FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBackend.h; sourceTree = "<group>"; };
FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBasicTypes.h; sourceTree = "<group>"; };
FE36FD1116C7826400F887C1 /* ChangeVersionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeVersionData.h; sourceTree = "<group>"; };
FE36FD1216C7826400F887C1 /* SQLTransactionStateMachine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionStateMachine.cpp; sourceTree = "<group>"; };
@@ -18783,8 +18779,6 @@
97BC69E01505F081001B74AC /* Database.idl */,
97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */,
97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */,
- FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */,
- FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */,
97BC69D61505F076001B74AC /* DatabaseBackendBase.cpp */,
97BC69D71505F076001B74AC /* DatabaseBackendBase.h */,
FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */,
@@ -24366,7 +24360,6 @@
26F756B01B3B65AC0005DD79 /* MutableRange.h in Headers */,
97BC6A211505F081001B74AC /* Database.h in Headers */,
97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */,
- FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend.h in Headers */,
97BC69DB1505F076001B74AC /* DatabaseBackendBase.h in Headers */,
FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */,
97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */,
@@ -28124,7 +28117,6 @@
62CD32591157E57C0063B0A7 /* CustomEvent.cpp in Sources */,
97BC6A201505F081001B74AC /* Database.cpp in Sources */,
97BC6A231505F081001B74AC /* DatabaseAuthorizer.cpp in Sources */,
- FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend.cpp in Sources */,
97BC69DA1505F076001B74AC /* DatabaseBackendBase.cpp in Sources */,
97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */,
FE456F181677D74E005EDDF9 /* DatabaseManager.cpp in Sources */,
