Changeset 143551 in webkit
- Timestamp:
- Feb 20, 2013 6:36:26 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 24 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r143471 r143551 940 940 Modules/webdatabase/Database.cpp 941 941 Modules/webdatabase/DatabaseAuthorizer.cpp 942 Modules/webdatabase/DatabaseBackend Async.cpp942 Modules/webdatabase/DatabaseBackend.cpp 943 943 Modules/webdatabase/DatabaseBackendBase.cpp 944 944 Modules/webdatabase/DatabaseBackendContext.cpp -
trunk/Source/WebCore/ChangeLog
r143550 r143551 1 \2013-02-20 Mark Lam <mark.lam@apple.com> 2 3 Rename DatabaseBackendAsync to DatabaseBackend. 4 https://bugs.webkit.org/show_bug.cgi?id=110422. 5 6 Reviewed by Geoffrey Garen. 7 8 This is a purely cosmetic change to make the naming consistent with 9 the front-end Database. 10 11 No new tests. 12 13 * CMakeLists.txt: 14 * GNUmakefile.list.am: 15 * Modules/webdatabase/ChangeVersionWrapper.cpp: 16 (WebCore::ChangeVersionWrapper::performPreflight): 17 (WebCore::ChangeVersionWrapper::performPostflight): 18 * Modules/webdatabase/Database.cpp: 19 (WebCore::Database::Database): 20 (WebCore::Database::from): 21 (WebCore::Database::backend): 22 * Modules/webdatabase/Database.h: 23 * Modules/webdatabase/DatabaseBackend.cpp: Copied from Source/WebCore/Modules/webdatabase/DatabaseBackendAsync.cpp. 24 (WebCore::DatabaseBackend::DatabaseBackend): 25 (WebCore::DatabaseBackend::openAndVerifyVersion): 26 (WebCore::DatabaseBackend::performOpenAndVerify): 27 (WebCore::DatabaseBackend::close): 28 (WebCore::DatabaseBackend::runTransaction): 29 (WebCore::DatabaseBackend::inProgressTransactionCompleted): 30 (WebCore::DatabaseBackend::scheduleTransaction): 31 (WebCore::DatabaseBackend::scheduleTransactionStep): 32 (WebCore::DatabaseBackend::transactionClient): 33 (WebCore::DatabaseBackend::transactionCoordinator): 34 * Modules/webdatabase/DatabaseBackend.h: Copied from Source/WebCore/Modules/webdatabase/DatabaseBackendAsync.h. 35 * Modules/webdatabase/DatabaseBackendAsync.cpp: Removed. 36 * Modules/webdatabase/DatabaseBackendAsync.h: Removed. 37 * Modules/webdatabase/DatabaseBackendBase.cpp: 38 (WebCore::DatabaseBackendBase::~DatabaseBackendBase): 39 * Modules/webdatabase/DatabaseManager.cpp: 40 * Modules/webdatabase/DatabaseServer.cpp: 41 * Modules/webdatabase/DatabaseTask.cpp: 42 (WebCore::DatabaseTask::DatabaseTask): 43 (WebCore::DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask): 44 (WebCore::DatabaseBackend::DatabaseOpenTask::doPerformTask): 45 (WebCore::DatabaseBackend::DatabaseOpenTask::debugTaskName): 46 (WebCore::DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask): 47 (WebCore::DatabaseBackend::DatabaseCloseTask::doPerformTask): 48 (WebCore::DatabaseBackend::DatabaseCloseTask::debugTaskName): 49 (WebCore::DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask): 50 (WebCore::DatabaseBackend::DatabaseTransactionTask::~DatabaseTransactionTask): 51 (WebCore::DatabaseBackend::DatabaseTransactionTask::doPerformTask): 52 (WebCore::DatabaseBackend::DatabaseTransactionTask::debugTaskName): 53 (WebCore::DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask): 54 (WebCore::DatabaseBackend::DatabaseTableNamesTask::doPerformTask): 55 (WebCore::DatabaseBackend::DatabaseTableNamesTask::debugTaskName): 56 * Modules/webdatabase/DatabaseTask.h: 57 (WebCore::DatabaseTask::database): 58 (DatabaseTask): 59 (WebCore::DatabaseBackend::DatabaseOpenTask::create): 60 (DatabaseBackend::DatabaseOpenTask): 61 (WebCore::DatabaseBackend::DatabaseCloseTask::create): 62 (DatabaseBackend::DatabaseCloseTask): 63 (WebCore::DatabaseBackend::DatabaseTableNamesTask::create): 64 (DatabaseBackend::DatabaseTableNamesTask): 65 * Modules/webdatabase/DatabaseThread.cpp: 66 (WebCore::DatabaseThread::recordDatabaseOpen): 67 (WebCore::DatabaseThread::recordDatabaseClosed): 68 (WebCore::SameDatabasePredicate::SameDatabasePredicate): 69 (SameDatabasePredicate): 70 (WebCore::DatabaseThread::unscheduleDatabaseTasks): 71 * Modules/webdatabase/DatabaseThread.h: 72 * Modules/webdatabase/SQLStatementBackend.cpp: 73 (WebCore::SQLStatementBackend::execute): 74 (WebCore::SQLStatementBackend::setDatabaseDeletedError): 75 (WebCore::SQLStatementBackend::setVersionMismatchedError): 76 (WebCore::SQLStatementBackend::setFailureDueToQuota): 77 * Modules/webdatabase/SQLStatementBackend.h: 78 * Modules/webdatabase/SQLTransactionBackend.cpp: 79 (WebCore::SQLTransactionBackend::create): 80 (WebCore::SQLTransactionBackend::SQLTransactionBackend): 81 * Modules/webdatabase/SQLTransactionBackend.h: 82 (WebCore::SQLTransactionBackend::database): 83 * Modules/webdatabase/SQLTransactionCoordinator.cpp: 84 (WebCore::getDatabaseIdentifier): 85 * Target.pri: 86 * WebCore.gypi: 87 * WebCore.vcproj/WebCore.vcproj: 88 * WebCore.vcxproj/WebCore.vcxproj: 89 * WebCore.vcxproj/WebCore.vcxproj.filters: 90 * WebCore.xcodeproj/project.pbxproj: 91 1 92 2013-02-20 David Kilzer <ddkilzer@apple.com> 2 93 -
trunk/Source/WebCore/GNUmakefile.list.am
r143471 r143551 2112 2112 Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.cpp \ 2113 2113 Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.h \ 2114 Source/WebCore/Modules/webdatabase/DatabaseBackend Async.cpp \2115 Source/WebCore/Modules/webdatabase/DatabaseBackend Async.h \2114 Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp \ 2115 Source/WebCore/Modules/webdatabase/DatabaseBackend.h \ 2116 2116 Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp \ 2117 2117 Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h \ -
trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp
r142921 r143551 48 48 ASSERT(transaction && transaction->database()); 49 49 50 DatabaseBackend Async* database = transaction->database();50 DatabaseBackend* database = transaction->database(); 51 51 52 52 String actualVersion; … … 72 72 ASSERT(transaction && transaction->database()); 73 73 74 DatabaseBackend Async* database = transaction->database();74 DatabaseBackend* database = transaction->database(); 75 75 76 76 if (!database->setVersionInDatabase(m_newVersion)) { -
trunk/Source/WebCore/Modules/webdatabase/Database.cpp
r143471 r143551 78 78 const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize) 79 79 : DatabaseBase(databaseContext->scriptExecutionContext()) 80 , DatabaseBackend Async(databaseContext, name, expectedVersion, displayName, estimatedSize)81 , m_databaseContext(DatabaseBackend Async::databaseContext()->frontend())80 , DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize) 81 , m_databaseContext(DatabaseBackend::databaseContext()->frontend()) 82 82 , m_deleted(false) 83 83 { … … 124 124 } 125 125 126 Database* Database::from(DatabaseBackend Async* backend)126 Database* Database::from(DatabaseBackend* backend) 127 127 { 128 128 return static_cast<Database*>(backend->m_frontend); 129 129 } 130 130 131 PassRefPtr<DatabaseBackend Async> Database::backend()131 PassRefPtr<DatabaseBackend> Database::backend() 132 132 { 133 133 return this; -
trunk/Source/WebCore/Modules/webdatabase/Database.h
r143471 r143551 32 32 #if ENABLE(SQL_DATABASE) 33 33 34 #include "DatabaseBackend Async.h"34 #include "DatabaseBackend.h" 35 35 #include "DatabaseBase.h" 36 36 #include "DatabaseBasicTypes.h" … … 50 50 class VoidCallback; 51 51 52 class Database : public DatabaseBase, public DatabaseBackend Async{52 class Database : public DatabaseBase, public DatabaseBackend { 53 53 public: 54 54 virtual ~Database(); … … 62 62 63 63 // Internal engine support 64 static Database* from(DatabaseBackend Async*);64 static Database* from(DatabaseBackend*); 65 65 DatabaseContext* databaseContext() const { return m_databaseContext.get(); } 66 66 … … 82 82 Database(PassRefPtr<DatabaseBackendContext>, const String& name, 83 83 const String& expectedVersion, const String& displayName, unsigned long estimatedSize); 84 PassRefPtr<DatabaseBackend Async> backend();84 PassRefPtr<DatabaseBackend> backend(); 85 85 static PassRefPtr<Database> create(ScriptExecutionContext*, PassRefPtr<DatabaseBackendBase>); 86 86 … … 105 105 friend class DatabaseManager; 106 106 friend class DatabaseServer; // FIXME: remove this when the backend has been split out. 107 friend class DatabaseBackend Async; // FIXME: remove this when the backend has been split out.107 friend class DatabaseBackend; // FIXME: remove this when the backend has been split out. 108 108 friend class SQLStatement; 109 109 friend class SQLTransaction; -
trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp
r143471 r143551 25 25 26 26 #include "config.h" 27 #include "DatabaseBackend Async.h"27 #include "DatabaseBackend.h" 28 28 29 29 #if ENABLE(SQL_DATABASE) … … 43 43 namespace WebCore { 44 44 45 DatabaseBackend Async::DatabaseBackendAsync(PassRefPtr<DatabaseBackendContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)45 DatabaseBackend::DatabaseBackend(PassRefPtr<DatabaseBackendContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize) 46 46 : DatabaseBackendBase(databaseContext, name, expectedVersion, displayName, estimatedSize, DatabaseType::Async) 47 47 , m_transactionInProgress(false) … … 50 50 } 51 51 52 bool DatabaseBackend Async::openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)52 bool DatabaseBackend::openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage) 53 53 { 54 54 DatabaseTaskSynchronizer synchronizer; … … 67 67 } 68 68 69 bool DatabaseBackend Async::performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)69 bool DatabaseBackend::performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage) 70 70 { 71 71 if (DatabaseBackendBase::performOpenAndVerify(setVersionInNewDatabase, error, errorMessage)) { … … 79 79 } 80 80 81 void DatabaseBackend Async::close()81 void DatabaseBackend::close() 82 82 { 83 83 ASSERT(databaseContext()->databaseThread()); … … 108 108 // unschedule any DatabaseTasks that refer to it before the database gets 109 109 // deleted. 110 RefPtr<DatabaseBackend Async> protect = this;110 RefPtr<DatabaseBackend> protect = this; 111 111 databaseContext()->databaseThread()->recordDatabaseClosed(this); 112 112 databaseContext()->databaseThread()->unscheduleDatabaseTasks(this); 113 113 } 114 114 115 PassRefPtr<SQLTransactionBackend> DatabaseBackend Async::runTransaction(PassRefPtr<SQLTransaction> transaction,115 PassRefPtr<SQLTransactionBackend> DatabaseBackend::runTransaction(PassRefPtr<SQLTransaction> transaction, 116 116 bool readOnly, const ChangeVersionData* data) 117 117 { … … 132 132 } 133 133 134 void DatabaseBackend Async::inProgressTransactionCompleted()134 void DatabaseBackend::inProgressTransactionCompleted() 135 135 { 136 136 MutexLocker locker(m_transactionInProgressMutex); … … 139 139 } 140 140 141 void DatabaseBackend Async::scheduleTransaction()141 void DatabaseBackend::scheduleTransaction() 142 142 { 143 143 ASSERT(!m_transactionInProgressMutex.tryLock()); // Locked by caller. … … 156 156 } 157 157 158 void DatabaseBackend Async::scheduleTransactionStep(SQLTransactionBackend* transaction)158 void DatabaseBackend::scheduleTransactionStep(SQLTransactionBackend* transaction) 159 159 { 160 160 if (!databaseContext()->databaseThread()) … … 166 166 } 167 167 168 SQLTransactionClient* DatabaseBackend Async::transactionClient() const168 SQLTransactionClient* DatabaseBackend::transactionClient() const 169 169 { 170 170 return databaseContext()->databaseThread()->transactionClient(); 171 171 } 172 172 173 SQLTransactionCoordinator* DatabaseBackend Async::transactionCoordinator() const173 SQLTransactionCoordinator* DatabaseBackend::transactionCoordinator() const 174 174 { 175 175 return databaseContext()->databaseThread()->transactionCoordinator(); -
trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h
r143471 r143551 24 24 */ 25 25 26 #ifndef DatabaseBackend Async_h27 #define DatabaseBackend Async_h26 #ifndef DatabaseBackend_h 27 #define DatabaseBackend_h 28 28 29 29 #if ENABLE(SQL_DATABASE) … … 43 43 class SQLTransactionCoordinator; 44 44 45 // FIXME: This implementation of DatabaseBackend Asyncis only a place holder45 // FIXME: This implementation of DatabaseBackend is only a place holder 46 46 // for the split out of the Database backend to be done later. This 47 47 // place holder is needed to allow other code that need to reference the 48 // DatabaseBackend Asyncto do so before the proper backend split is48 // DatabaseBackend to do so before the proper backend split is 49 49 // available. This should be replaced with the actual implementation later. 50 50 51 class DatabaseBackend Async: public DatabaseBackendBase {51 class DatabaseBackend : public DatabaseBackendBase { 52 52 public: 53 DatabaseBackend Async(PassRefPtr<DatabaseBackendContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);53 DatabaseBackend(PassRefPtr<DatabaseBackendContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize); 54 54 55 55 virtual bool openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage); … … 85 85 #endif // ENABLE(SQL_DATABASE) 86 86 87 #endif // DatabaseBackend Async_h87 #endif // DatabaseBackend_h -
trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp
r143471 r143551 245 245 // on a single thread at a time. 246 246 // 247 // For DatabaseBackend Async, we open the SQLite database on the DatabaseThread,247 // For DatabaseBackend, we open the SQLite database on the DatabaseThread, 248 248 // and hence we should also close it on that same thread. This means that the 249 249 // SQLite database need to be closed by another mechanism (see -
trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp
r143471 r143551 31 31 #include "AbstractDatabaseServer.h" 32 32 #include "Database.h" 33 #include "DatabaseBackend Async.h"33 #include "DatabaseBackend.h" 34 34 #include "DatabaseBackendBase.h" 35 35 #include "DatabaseBackendContext.h" -
trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp
r143471 r143551 30 30 31 31 #include "Database.h" 32 #include "DatabaseBackend Async.h"32 #include "DatabaseBackend.h" 33 33 #include "DatabaseBackendContext.h" 34 34 #include "DatabaseBackendSync.h" -
trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp
r143271 r143551 32 32 33 33 #include "Database.h" 34 #include "DatabaseBackend Async.h"34 #include "DatabaseBackend.h" 35 35 #include "Logging.h" 36 36 … … 61 61 } 62 62 63 DatabaseTask::DatabaseTask(DatabaseBackend Async* database, DatabaseTaskSynchronizer* synchronizer)63 DatabaseTask::DatabaseTask(DatabaseBackend* database, DatabaseTaskSynchronizer* synchronizer) 64 64 : m_database(database) 65 65 , m_synchronizer(synchronizer) … … 100 100 // Opens the database file and verifies the version matches the expected version. 101 101 102 DatabaseBackend Async::DatabaseOpenTask::DatabaseOpenTask(DatabaseBackendAsync* database, bool setVersionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success)102 DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask(DatabaseBackend* database, bool setVersionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success) 103 103 : DatabaseTask(database, synchronizer) 104 104 , m_setVersionInNewDatabase(setVersionInNewDatabase) … … 110 110 } 111 111 112 void DatabaseBackend Async::DatabaseOpenTask::doPerformTask()112 void DatabaseBackend::DatabaseOpenTask::doPerformTask() 113 113 { 114 114 String errorMessage; … … 119 119 120 120 #if !LOG_DISABLED 121 const char* DatabaseBackend Async::DatabaseOpenTask::debugTaskName() const121 const char* DatabaseBackend::DatabaseOpenTask::debugTaskName() const 122 122 { 123 123 return "DatabaseOpenTask"; … … 128 128 // Closes the database. 129 129 130 DatabaseBackend Async::DatabaseCloseTask::DatabaseCloseTask(DatabaseBackendAsync* database, DatabaseTaskSynchronizer* synchronizer)130 DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask(DatabaseBackend* database, DatabaseTaskSynchronizer* synchronizer) 131 131 : DatabaseTask(database, synchronizer) 132 132 { 133 133 } 134 134 135 void DatabaseBackend Async::DatabaseCloseTask::doPerformTask()135 void DatabaseBackend::DatabaseCloseTask::doPerformTask() 136 136 { 137 137 Database::from(database())->close(); … … 139 139 140 140 #if !LOG_DISABLED 141 const char* DatabaseBackend Async::DatabaseCloseTask::debugTaskName() const141 const char* DatabaseBackend::DatabaseCloseTask::debugTaskName() const 142 142 { 143 143 return "DatabaseCloseTask"; … … 148 148 // Starts a transaction that will report its results via a callback. 149 149 150 DatabaseBackend Async::DatabaseTransactionTask::DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend> transaction)150 DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend> transaction) 151 151 : DatabaseTask(Database::from(transaction->database()), 0) 152 152 , m_transaction(transaction) … … 155 155 } 156 156 157 DatabaseBackend Async::DatabaseTransactionTask::~DatabaseTransactionTask()157 DatabaseBackend::DatabaseTransactionTask::~DatabaseTransactionTask() 158 158 { 159 159 // If the task is being destructed without the transaction ever being run, … … 169 169 } 170 170 171 void DatabaseBackend Async::DatabaseTransactionTask::doPerformTask()171 void DatabaseBackend::DatabaseTransactionTask::doPerformTask() 172 172 { 173 173 m_transaction->performNextStep(); … … 176 176 177 177 #if !LOG_DISABLED 178 const char* DatabaseBackend Async::DatabaseTransactionTask::debugTaskName() const178 const char* DatabaseBackend::DatabaseTransactionTask::debugTaskName() const 179 179 { 180 180 return "DatabaseTransactionTask"; … … 185 185 // Retrieves a list of all tables in the database - for WebInspector support. 186 186 187 DatabaseBackend Async::DatabaseTableNamesTask::DatabaseTableNamesTask(DatabaseBackendAsync* database, DatabaseTaskSynchronizer* synchronizer, Vector<String>& names)187 DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask(DatabaseBackend* database, DatabaseTaskSynchronizer* synchronizer, Vector<String>& names) 188 188 : DatabaseTask(database, synchronizer) 189 189 , m_tableNames(names) … … 192 192 } 193 193 194 void DatabaseBackend Async::DatabaseTableNamesTask::doPerformTask()194 void DatabaseBackend::DatabaseTableNamesTask::doPerformTask() 195 195 { 196 196 m_tableNames = Database::from(database())->performGetTableNames(); … … 198 198 199 199 #if !LOG_DISABLED 200 const char* DatabaseBackend Async::DatabaseTableNamesTask::debugTaskName() const200 const char* DatabaseBackend::DatabaseTableNamesTask::debugTaskName() const 201 201 { 202 202 return "DatabaseTableNamesTask"; -
trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h
r143271 r143551 31 31 #if ENABLE(SQL_DATABASE) 32 32 33 #include "DatabaseBackend Async.h"33 #include "DatabaseBackend.h" 34 34 #include "DatabaseBasicTypes.h" 35 35 #include "DatabaseError.h" … … 78 78 void performTask(); 79 79 80 DatabaseBackend Async* database() const { return m_database; }80 DatabaseBackend* database() const { return m_database; } 81 81 #ifndef NDEBUG 82 82 bool hasSynchronizer() const { return m_synchronizer; } … … 85 85 86 86 protected: 87 DatabaseTask(DatabaseBackend Async*, DatabaseTaskSynchronizer*);87 DatabaseTask(DatabaseBackend*, DatabaseTaskSynchronizer*); 88 88 89 89 private: 90 90 virtual void doPerformTask() = 0; 91 91 92 DatabaseBackend Async* m_database;92 DatabaseBackend* m_database; 93 93 DatabaseTaskSynchronizer* m_synchronizer; 94 94 … … 99 99 }; 100 100 101 class DatabaseBackend Async::DatabaseOpenTask : public DatabaseTask {101 class DatabaseBackend::DatabaseOpenTask : public DatabaseTask { 102 102 public: 103 static PassOwnPtr<DatabaseOpenTask> create(DatabaseBackend Async* db, bool setVersionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success)103 static PassOwnPtr<DatabaseOpenTask> create(DatabaseBackend* db, bool setVersionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success) 104 104 { 105 105 return adoptPtr(new DatabaseOpenTask(db, setVersionInNewDatabase, synchronizer, error, errorMessage, success)); … … 107 107 108 108 private: 109 DatabaseOpenTask(DatabaseBackend Async*, bool setVersionInNewDatabase, DatabaseTaskSynchronizer*, DatabaseError&, String& errorMessage, bool& success);109 DatabaseOpenTask(DatabaseBackend*, bool setVersionInNewDatabase, DatabaseTaskSynchronizer*, DatabaseError&, String& errorMessage, bool& success); 110 110 111 111 virtual void doPerformTask(); … … 120 120 }; 121 121 122 class DatabaseBackend Async::DatabaseCloseTask : public DatabaseTask {122 class DatabaseBackend::DatabaseCloseTask : public DatabaseTask { 123 123 public: 124 static PassOwnPtr<DatabaseCloseTask> create(DatabaseBackend Async* db, DatabaseTaskSynchronizer* synchronizer)124 static PassOwnPtr<DatabaseCloseTask> create(DatabaseBackend* db, DatabaseTaskSynchronizer* synchronizer) 125 125 { 126 126 return adoptPtr(new DatabaseCloseTask(db, synchronizer)); … … 128 128 129 129 private: 130 DatabaseCloseTask(DatabaseBackend Async*, DatabaseTaskSynchronizer*);130 DatabaseCloseTask(DatabaseBackend*, DatabaseTaskSynchronizer*); 131 131 132 132 virtual void doPerformTask(); … … 136 136 }; 137 137 138 class DatabaseBackend Async::DatabaseTransactionTask : public DatabaseTask {138 class DatabaseBackend::DatabaseTransactionTask : public DatabaseTask { 139 139 public: 140 140 virtual ~DatabaseTransactionTask(); … … 160 160 }; 161 161 162 class DatabaseBackend Async::DatabaseTableNamesTask : public DatabaseTask {162 class DatabaseBackend::DatabaseTableNamesTask : public DatabaseTask { 163 163 public: 164 static PassOwnPtr<DatabaseTableNamesTask> create(DatabaseBackend Async* db, DatabaseTaskSynchronizer* synchronizer, Vector<String>& names)164 static PassOwnPtr<DatabaseTableNamesTask> create(DatabaseBackend* db, DatabaseTaskSynchronizer* synchronizer, Vector<String>& names) 165 165 { 166 166 return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names)); … … 168 168 169 169 private: 170 DatabaseTableNamesTask(DatabaseBackend Async*, DatabaseTaskSynchronizer*, Vector<String>& names);170 DatabaseTableNamesTask(DatabaseBackend*, DatabaseTaskSynchronizer*, Vector<String>& names); 171 171 172 172 virtual void doPerformTask(); -
trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp
r143271 r143551 142 142 } 143 143 144 void DatabaseThread::recordDatabaseOpen(DatabaseBackend Async* database)144 void DatabaseThread::recordDatabaseOpen(DatabaseBackend* database) 145 145 { 146 146 ASSERT(currentThread() == m_threadID); … … 150 150 } 151 151 152 void DatabaseThread::recordDatabaseClosed(DatabaseBackend Async* database)152 void DatabaseThread::recordDatabaseClosed(DatabaseBackend* database) 153 153 { 154 154 ASSERT(currentThread() == m_threadID); … … 172 172 class SameDatabasePredicate { 173 173 public: 174 SameDatabasePredicate(const DatabaseBackend Async* database) : m_database(database) { }174 SameDatabasePredicate(const DatabaseBackend* database) : m_database(database) { } 175 175 bool operator()(DatabaseTask* task) const { return task->database() == m_database; } 176 176 private: 177 const DatabaseBackend Async* m_database;177 const DatabaseBackend* m_database; 178 178 }; 179 179 180 void DatabaseThread::unscheduleDatabaseTasks(DatabaseBackend Async* database)180 void DatabaseThread::unscheduleDatabaseTasks(DatabaseBackend* database) 181 181 { 182 182 // Note that the thread loop is running, so some tasks for the database -
trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h
r141956 r143551 43 43 namespace WebCore { 44 44 45 class DatabaseBackend Async;45 class DatabaseBackend; 46 46 class DatabaseTask; 47 47 class DatabaseTaskSynchronizer; … … 61 61 void scheduleTask(PassOwnPtr<DatabaseTask>); 62 62 void scheduleImmediateTask(PassOwnPtr<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. 63 void unscheduleDatabaseTasks(DatabaseBackend Async*);63 void unscheduleDatabaseTasks(DatabaseBackend*); 64 64 65 void recordDatabaseOpen(DatabaseBackend Async*);66 void recordDatabaseClosed(DatabaseBackend Async*);65 void recordDatabaseOpen(DatabaseBackend*); 66 void recordDatabaseClosed(DatabaseBackend*); 67 67 ThreadIdentifier getThreadID() { return m_threadID; } 68 68 … … 83 83 84 84 // This set keeps track of the open databases that have been used on this thread. 85 typedef HashSet<RefPtr<DatabaseBackend Async> > DatabaseSet;85 typedef HashSet<RefPtr<DatabaseBackend> > DatabaseSet; 86 86 DatabaseSet m_openDatabaseSet; 87 87 -
trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp
r143264 r143551 32 32 33 33 #include "AbstractSQLStatement.h" 34 #include "DatabaseBackend Async.h"34 #include "DatabaseBackend.h" 35 35 #include "Logging.h" 36 36 #include "SQLError.h" … … 108 108 } 109 109 110 bool SQLStatementBackend::execute(DatabaseBackend Async* db)110 bool SQLStatementBackend::execute(DatabaseBackend* db) 111 111 { 112 112 ASSERT(!m_resultSet); … … 212 212 } 213 213 214 void SQLStatementBackend::setDatabaseDeletedError(DatabaseBackend Async* database)214 void SQLStatementBackend::setDatabaseDeletedError(DatabaseBackend* database) 215 215 { 216 216 ASSERT(!m_error && !m_resultSet); … … 219 219 } 220 220 221 void SQLStatementBackend::setVersionMismatchedError(DatabaseBackend Async* database)221 void SQLStatementBackend::setVersionMismatchedError(DatabaseBackend* database) 222 222 { 223 223 ASSERT(!m_error && !m_resultSet); … … 226 226 } 227 227 228 void SQLStatementBackend::setFailureDueToQuota(DatabaseBackend Async* database)228 void SQLStatementBackend::setFailureDueToQuota(DatabaseBackend* database) 229 229 { 230 230 ASSERT(!m_error && !m_resultSet); -
trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h
r143264 r143551 41 41 42 42 class AbstractSQLStatement; 43 class DatabaseBackend Async;43 class DatabaseBackend; 44 44 class SQLError; 45 45 class SQLTransactionBackend; … … 50 50 const String& sqlStatement, const Vector<SQLValue>& arguments, int permissions); 51 51 52 bool execute(DatabaseBackend Async*);52 bool execute(DatabaseBackend*); 53 53 bool lastExecutionFailedDueToQuota() const; 54 54 … … 56 56 bool hasStatementErrorCallback() const { return m_hasErrorCallback; } 57 57 58 void setDatabaseDeletedError(DatabaseBackend Async*);59 void setVersionMismatchedError(DatabaseBackend Async*);58 void setDatabaseDeletedError(DatabaseBackend*); 59 void setVersionMismatchedError(DatabaseBackend*); 60 60 61 61 AbstractSQLStatement* frontend(); … … 67 67 const Vector<SQLValue>& arguments, int permissions); 68 68 69 void setFailureDueToQuota(DatabaseBackend Async*);69 void setFailureDueToQuota(DatabaseBackend*); 70 70 void clearFailureDueToQuota(); 71 71 -
trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp
r143489 r143551 35 35 #include "Database.h" // FIXME: Should only be used in the frontend. 36 36 #include "DatabaseAuthorizer.h" 37 #include "DatabaseBackend Async.h"37 #include "DatabaseBackend.h" 38 38 #include "DatabaseBackendContext.h" 39 39 #include "DatabaseThread.h" … … 234 234 // The RefPtr chain goes something like this: 235 235 // 236 // At birth (in DatabaseBackend Async::runTransaction()):236 // At birth (in DatabaseBackend::runTransaction()): 237 237 // ==================================================== 238 // DatabaseBackend Async// Deque<RefPtr<SQLTransactionBackend> > m_transactionQueue points to ...238 // DatabaseBackend // Deque<RefPtr<SQLTransactionBackend> > m_transactionQueue points to ... 239 239 // --> SQLTransactionBackend // RefPtr<SQLTransaction> m_frontend points to ... 240 240 // --> SQLTransaction // RefPtr<SQLTransactionBackend> m_backend points to ... … … 249 249 // is interrupted?" below for details. 250 250 // 251 // After scheduling the transaction with the DatabaseThread (DatabaseBackend Async::scheduleTransaction()):251 // After scheduling the transaction with the DatabaseThread (DatabaseBackend::scheduleTransaction()): 252 252 // ====================================================================================================== 253 253 // DatabaseThread // MessageQueue<DatabaseTask> m_queue points to ... … … 303 303 // 304 304 // - To clean up, DatabaseThread::databaseThread() will call 305 // DatabaseBackend Async::close() during its shutdown.306 // - DatabaseBackend Async::close() will iterate307 // DatabaseBackend Async::m_transactionQueue and call305 // DatabaseBackend::close() during its shutdown. 306 // - DatabaseBackend::close() will iterate 307 // DatabaseBackend::m_transactionQueue and call 308 308 // notifyDatabaseThreadIsShuttingDown() on each transaction there. 309 309 // … … 349 349 namespace WebCore { 350 350 351 PassRefPtr<SQLTransactionBackend> SQLTransactionBackend::create(DatabaseBackend Async* db,351 PassRefPtr<SQLTransactionBackend> SQLTransactionBackend::create(DatabaseBackend* db, 352 352 PassRefPtr<AbstractSQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly) 353 353 { … … 355 355 } 356 356 357 SQLTransactionBackend::SQLTransactionBackend(DatabaseBackend Async* db,357 SQLTransactionBackend::SQLTransactionBackend(DatabaseBackend* db, 358 358 PassRefPtr<AbstractSQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly) 359 359 : m_frontend(frontend) -
trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h
r143489 r143551 42 42 43 43 class AbstractSQLTransaction; 44 class DatabaseBackend Async;44 class DatabaseBackend; 45 45 class SQLError; 46 46 class SQLiteTransaction; … … 60 60 class SQLTransactionBackend : public SQLTransactionStateMachine<SQLTransactionBackend>, public AbstractSQLTransactionBackend { 61 61 public: 62 static PassRefPtr<SQLTransactionBackend> create(DatabaseBackend Async*,62 static PassRefPtr<SQLTransactionBackend> create(DatabaseBackend*, 63 63 PassRefPtr<AbstractSQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly); 64 64 … … 68 68 void performNextStep(); 69 69 70 DatabaseBackend Async* database() { return m_database.get(); }70 DatabaseBackend* database() { return m_database.get(); } 71 71 bool isReadOnly() { return m_readOnly; } 72 72 void notifyDatabaseThreadIsShuttingDown(); 73 73 74 74 private: 75 SQLTransactionBackend(DatabaseBackend Async*, PassRefPtr<AbstractSQLTransaction>,75 SQLTransactionBackend(DatabaseBackend*, PassRefPtr<AbstractSQLTransaction>, 76 76 PassRefPtr<SQLTransactionWrapper>, bool readOnly); 77 77 … … 112 112 RefPtr<SQLStatementBackend> m_currentStatementBackend; 113 113 114 RefPtr<DatabaseBackend Async> m_database;114 RefPtr<DatabaseBackend> m_database; 115 115 RefPtr<SQLTransactionWrapper> m_wrapper; 116 116 RefPtr<SQLError> m_transactionError; -
trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp
r143271 r143551 35 35 #if ENABLE(SQL_DATABASE) 36 36 37 #include "DatabaseBackend Async.h"37 #include "DatabaseBackend.h" 38 38 #include "SQLTransactionBackend.h" 39 39 #include <wtf/Deque.h> … … 46 46 static String getDatabaseIdentifier(SQLTransactionBackend* transaction) 47 47 { 48 DatabaseBackend Async* database = transaction->database();48 DatabaseBackend* database = transaction->database(); 49 49 ASSERT(database); 50 50 return database->stringIdentifier(); -
trunk/Source/WebCore/Target.pri
r143471 r143551 1465 1465 Modules/webdatabase/DatabaseAuthorizer.h \ 1466 1466 Modules/webdatabase/Database.h \ 1467 Modules/webdatabase/DatabaseBackend Async.h \1467 Modules/webdatabase/DatabaseBackend.h \ 1468 1468 Modules/webdatabase/DatabaseBackendBase.h \ 1469 1469 Modules/webdatabase/DatabaseBackendContext.h \ … … 3064 3064 SOURCES += \ 3065 3065 Modules/webdatabase/ChangeVersionWrapper.cpp \ 3066 Modules/webdatabase/DatabaseBackend Async.cpp \3066 Modules/webdatabase/DatabaseBackend.cpp \ 3067 3067 Modules/webdatabase/DatabaseBackendContext.cpp \ 3068 3068 Modules/webdatabase/DatabaseBackendSync.cpp \ -
trunk/Source/WebCore/WebCore.gypi
r143471 r143551 993 993 'Modules/webdatabase/DatabaseAuthorizer.cpp', 994 994 'Modules/webdatabase/DatabaseAuthorizer.h', 995 'Modules/webdatabase/DatabaseBackend Async.cpp',996 'Modules/webdatabase/DatabaseBackend Async.h',995 'Modules/webdatabase/DatabaseBackend.cpp', 996 'Modules/webdatabase/DatabaseBackend.h', 997 997 'Modules/webdatabase/DatabaseBackendBase.cpp', 998 998 'Modules/webdatabase/DatabaseBackendBase.h', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r143471 r143551 25415 25415 </File> 25416 25416 <File 25417 RelativePath="..\Modules\webdatabase\DatabaseBackend Async.cpp"25418 > 25419 </File> 25420 <File 25421 RelativePath="..\Modules\webdatabase\DatabaseBackend Async.h"25417 RelativePath="..\Modules\webdatabase\DatabaseBackend.cpp" 25418 > 25419 </File> 25420 <File 25421 RelativePath="..\Modules\webdatabase\DatabaseBackend.h" 25422 25422 > 25423 25423 </File> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r143529 r143551 2753 2753 <ClCompile Include="..\Modules\webdatabase\Database.cpp" /> 2754 2754 <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp" /> 2755 <ClCompile Include="..\Modules\webdatabase\DatabaseBackend Async.cpp" />2755 <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp" /> 2756 2756 <ClCompile Include="..\Modules\webdatabase\DatabaseBackendBase.cpp" /> 2757 2757 <ClCompile Include="..\Modules\webdatabase\DatabaseBackendContext.cpp" /> … … 8824 8824 <ClInclude Include="..\Modules\webdatabase\Database.h" /> 8825 8825 <ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h" /> 8826 <ClInclude Include="..\Modules\webdatabase\DatabaseBackend Async.h" />8826 <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h" /> 8827 8827 <ClInclude Include="..\Modules\webdatabase\DatabaseBackendBase.h" /> 8828 8828 <ClInclude Include="..\Modules\webdatabase\DatabaseBackendContext.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r143471 r143551 1837 1837 <Filter>Modules\webdatabase</Filter> 1838 1838 </ClCompile> 1839 <ClCompile Include="..\Modules\webdatabase\DatabaseBackend Async.cpp">1839 <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp"> 1840 1840 <Filter>Modules\webdatabase</Filter> 1841 1841 </ClCompile> … … 8503 8503 <Filter>Modules\webdatabase</Filter> 8504 8504 </ClInclude> 8505 <ClInclude Include="..\Modules\webdatabase\DatabaseBackend Async.h">8505 <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h"> 8506 8506 <Filter>Modules\webdatabase</Filter> 8507 8507 </ClInclude> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r143550 r143551 6780 6780 FE09DB49169E2D6E00622557 /* DatabaseError.h in Headers */ = {isa = PBXBuildFile; fileRef = FE09DB46169E2D6E00622557 /* DatabaseError.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6781 6781 FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */ = {isa = PBXBuildFile; fileRef = FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6782 FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend Async.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackendAsync.cpp */; };6783 FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend Async.h in Headers */ = {isa = PBXBuildFile; fileRef = FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackendAsync.h */; settings = {ATTRIBUTES = (Private, ); }; };6782 FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */; }; 6783 FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6784 6784 FE16CFD5169D1DED00D3A0C7 /* DatabaseBackendSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE16CFD1169D1DEC00D3A0C7 /* DatabaseBackendSync.cpp */; }; 6785 6785 FE16CFD6169D1DED00D3A0C7 /* DatabaseBackendSync.h in Headers */ = {isa = PBXBuildFile; fileRef = FE16CFD2169D1DEC00D3A0C7 /* DatabaseBackendSync.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 14536 14536 FE09DB46169E2D6E00622557 /* DatabaseError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseError.h; path = Modules/webdatabase/DatabaseError.h; sourceTree = "<group>"; }; 14537 14537 FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AbstractDatabaseServer.h; path = Modules/webdatabase/AbstractDatabaseServer.h; sourceTree = "<group>"; }; 14538 FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend Async.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseBackendAsync.cpp; path = Modules/webdatabase/DatabaseBackendAsync.cpp; sourceTree = "<group>"; };14539 FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend Async.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseBackendAsync.h; path = Modules/webdatabase/DatabaseBackendAsync.h; sourceTree = "<group>"; };14538 FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseBackend.cpp; path = Modules/webdatabase/DatabaseBackend.cpp; sourceTree = "<group>"; }; 14539 FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseBackend.h; path = Modules/webdatabase/DatabaseBackend.h; sourceTree = "<group>"; }; 14540 14540 FE16CFD1169D1DEC00D3A0C7 /* DatabaseBackendSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseBackendSync.cpp; path = Modules/webdatabase/DatabaseBackendSync.cpp; sourceTree = "<group>"; }; 14541 14541 FE16CFD2169D1DEC00D3A0C7 /* DatabaseBackendSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseBackendSync.h; path = Modules/webdatabase/DatabaseBackendSync.h; sourceTree = "<group>"; }; … … 18676 18676 97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */, 18677 18677 97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */, 18678 FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend Async.cpp */,18679 FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend Async.h */,18678 FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */, 18679 FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */, 18680 18680 97BC69D61505F076001B74AC /* DatabaseBackendBase.cpp */, 18681 18681 97BC69D71505F076001B74AC /* DatabaseBackendBase.h */, … … 23559 23559 97BC6A211505F081001B74AC /* Database.h in Headers */, 23560 23560 97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */, 23561 FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend Async.h in Headers */,23561 FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend.h in Headers */, 23562 23562 97BC69DB1505F076001B74AC /* DatabaseBackendBase.h in Headers */, 23563 23563 FE6F6AB0169E057500FC30A2 /* DatabaseBackendContext.h in Headers */, … … 27233 27233 97BC6A201505F081001B74AC /* Database.cpp in Sources */, 27234 27234 97BC6A231505F081001B74AC /* DatabaseAuthorizer.cpp in Sources */, 27235 FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend Async.cpp in Sources */,27235 FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend.cpp in Sources */, 27236 27236 97BC69DA1505F076001B74AC /* DatabaseBackendBase.cpp in Sources */, 27237 27237 FE6F6AAF169E057500FC30A2 /* DatabaseBackendContext.cpp in Sources */,
Note: See TracChangeset
for help on using the changeset viewer.