<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178296] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178296">178296</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-12 13:58:08 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/Database.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseh">trunk/Source/WebCore/Modules/webdatabase/Database.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseThreadh">trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionCoordinatorcpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-01-12 Anders Carlsson <andersca@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):
+
</ins><span class="cx"> 2015-01-12 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Addressing post-review comment after r178292
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "ChangeVersionData.h"
</span><ins>+#include "ChangeVersionWrapper.h"
</ins><span class="cx"> #include "DatabaseCallback.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx"> #include "DatabaseManager.h"
</span><span class="lines">@@ -96,6 +97,128 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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();
+}
+
</ins><span class="cx"> Database* Database::from(DatabaseBackend* backend)
</span><span class="cx"> {
</span><span class="cx"> return static_cast<Database*>(backend->m_frontend);
</span><span class="lines">@@ -164,7 +287,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SQLTransaction> transaction = SQLTransaction::create(*this, WTF::move(callback), WTF::move(successCallback), errorCallback.copyRef(), readOnly);
</span><span class="cx">
</span><del>- RefPtr<SQLTransactionBackend> transactionBackend = backend()->runTransaction(transaction.release(), readOnly, changeVersionData);
</del><ins>+ RefPtr<SQLTransactionBackend> transactionBackend = runTransaction(transaction.release(), readOnly, changeVersionData);
</ins><span class="cx"> if (!transactionBackend && errorCallback) {
</span><span class="cx"> WTF::RefPtr<SQLTransactionErrorCallback> errorCallbackProtector = WTF::move(errorCallback);
</span><span class="cx"> m_scriptExecutionContext->postTask([errorCallbackProtector](ScriptExecutionContext&) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -49,10 +49,20 @@
</span><span class="cx"> class SQLTransactionErrorCallback;
</span><span class="cx"> class VoidCallback;
</span><span class="cx">
</span><del>-class Database : public DatabaseBackend {
</del><ins>+class Database final : public DatabaseBackend {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~Database();
</span><span class="cx">
</span><ins>+ 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;
+
</ins><span class="cx"> // Direct support for the DOM API
</span><span class="cx"> virtual String version() const;
</span><span class="cx"> void changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionCallback>,
</span><span class="lines">@@ -84,6 +94,10 @@
</span><span class="cx"> PassRefPtr<DatabaseBackend> backend();
</span><span class="cx"> static PassRefPtr<Database> create(ScriptExecutionContext*, PassRefPtr<DatabaseBackendBase>);
</span><span class="cx">
</span><ins>+ virtual bool performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
+
+ void scheduleTransaction();
+
</ins><span class="cx"> void runTransaction(RefPtr<SQLTransactionCallback>&&, RefPtr<SQLTransactionErrorCallback>&&, RefPtr<VoidCallback>&& successCallback, bool readOnly, const ChangeVersionData* = nullptr);
</span><span class="cx">
</span><span class="cx"> Vector<String> performGetTableNames();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -54,129 +54,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(SQL_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -52,26 +52,12 @@
</span><span class="cx"> public:
</span><span class="cx"> DatabaseBackend(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
</span><span class="cx">
</span><del>- 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;
-
</del><span class="cx"> private:
</span><span class="cx"> class DatabaseOpenTask;
</span><span class="cx"> class DatabaseCloseTask;
</span><span class="cx"> class DatabaseTransactionTask;
</span><span class="cx"> class DatabaseTableNamesTask;
</span><span class="cx">
</span><del>- virtual bool performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
-
- void scheduleTransaction();
-
</del><span class="cx"> Deque<RefPtr<SQLTransactionBackend>> m_transactionQueue;
</span><span class="cx"> Mutex m_transactionInProgressMutex;
</span><span class="cx"> bool m_transactionInProgress;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> cleanupSync->taskCompleted();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseThread::recordDatabaseOpen(DatabaseBackend* database)
</del><ins>+void DatabaseThread::recordDatabaseOpen(Database* database)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == m_threadID);
</span><span class="cx"> ASSERT(database);
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> m_openDatabaseSet.add(database);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseThread::recordDatabaseClosed(DatabaseBackend* database)
</del><ins>+void DatabaseThread::recordDatabaseClosed(Database* database)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == m_threadID);
</span><span class="cx"> ASSERT(database);
</span><span class="lines">@@ -257,13 +257,13 @@
</span><span class="cx">
</span><span class="cx"> class SameDatabasePredicate {
</span><span class="cx"> public:
</span><del>- SameDatabasePredicate(const DatabaseBackend* database) : m_database(database) { }
</del><ins>+ SameDatabasePredicate(const Database* database) : m_database(database) { }
</ins><span class="cx"> bool operator()(const DatabaseTask& task) const { return task.database() == m_database; }
</span><span class="cx"> private:
</span><del>- const DatabaseBackend* m_database;
</del><ins>+ const Database* m_database;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-void DatabaseThread::unscheduleDatabaseTasks(DatabaseBackend* database)
</del><ins>+void DatabaseThread::unscheduleDatabaseTasks(Database* database)
</ins><span class="cx"> {
</span><span class="cx"> // Note that the thread loop is running, so some tasks for the database
</span><span class="cx"> // may still be executed. This is unavoidable.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DatabaseBackend;
</del><ins>+class Database;
</ins><span class="cx"> class DatabaseTask;
</span><span class="cx"> class DatabaseTaskSynchronizer;
</span><span class="cx"> class Document;
</span><span class="lines">@@ -58,10 +58,10 @@
</span><span class="cx">
</span><span class="cx"> void scheduleTask(std::unique_ptr<DatabaseTask>);
</span><span class="cx"> 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.
</span><del>- void unscheduleDatabaseTasks(DatabaseBackend*);
</del><ins>+ void unscheduleDatabaseTasks(Database*);
</ins><span class="cx">
</span><del>- void recordDatabaseOpen(DatabaseBackend*);
- void recordDatabaseClosed(DatabaseBackend*);
</del><ins>+ void recordDatabaseOpen(Database*);
+ void recordDatabaseClosed(Database*);
</ins><span class="cx"> ThreadIdentifier getThreadID() { return m_threadID; }
</span><span class="cx">
</span><span class="cx"> SQLTransactionClient* transactionClient() { return m_transactionClient.get(); }
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // This set keeps track of the open databases that have been used on this thread.
</span><del>- typedef HashSet<RefPtr<DatabaseBackend>> DatabaseSet;
</del><ins>+ typedef HashSet<RefPtr<Database>> DatabaseSet;
</ins><span class="cx"> DatabaseSet m_openDatabaseSet;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<SQLTransactionClient> m_transactionClient;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -346,12 +346,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassRefPtr<SQLTransactionBackend> SQLTransactionBackend::create(DatabaseBackend* db, PassRefPtr<SQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly)
</del><ins>+PassRefPtr<SQLTransactionBackend> SQLTransactionBackend::create(Database* db, PassRefPtr<SQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new SQLTransactionBackend(db, frontend, wrapper, readOnly));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionBackend::SQLTransactionBackend(DatabaseBackend* db, PassRefPtr<SQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly)
</del><ins>+SQLTransactionBackend::SQLTransactionBackend(Database* db, PassRefPtr<SQLTransaction> frontend, PassRefPtr<SQLTransactionWrapper> wrapper, bool readOnly)
</ins><span class="cx"> : m_frontend(frontend)
</span><span class="cx"> , m_database(db)
</span><span class="cx"> , m_wrapper(wrapper)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DatabaseBackend;
</del><ins>+class Database;
</ins><span class="cx"> class OriginLock;
</span><span class="cx"> class SQLError;
</span><span class="cx"> class SQLiteTransaction;
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> class SQLTransactionBackend : public ThreadSafeRefCounted<SQLTransactionBackend>, public SQLTransactionStateMachine<SQLTransactionBackend> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<SQLTransactionBackend> create(DatabaseBackend*, PassRefPtr<SQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly);
</del><ins>+ static PassRefPtr<SQLTransactionBackend> create(Database*, PassRefPtr<SQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly);
</ins><span class="cx">
</span><span class="cx"> virtual ~SQLTransactionBackend();
</span><span class="cx">
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> bool shouldPerformWhilePaused() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- DatabaseBackend* database() { return m_database.get(); }
</del><ins>+ Database* database() { return m_database.get(); }
</ins><span class="cx"> bool isReadOnly() { return m_readOnly; }
</span><span class="cx"> void notifyDatabaseThreadIsShuttingDown();
</span><span class="cx">
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> void executeSQL(std::unique_ptr<SQLStatement>, const String& statement, const Vector<SQLValue>& arguments, int permissions);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SQLTransactionBackend(DatabaseBackend*, PassRefPtr<SQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly);
</del><ins>+ SQLTransactionBackend(Database*, PassRefPtr<SQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly);
</ins><span class="cx">
</span><span class="cx"> void doCleanup();
</span><span class="cx">
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> RefPtr<SQLTransaction> m_frontend; // Has a reference cycle, and will break in doCleanup().
</span><span class="cx"> RefPtr<SQLStatementBackend> m_currentStatementBackend;
</span><span class="cx">
</span><del>- RefPtr<DatabaseBackend> m_database;
</del><ins>+ RefPtr<Database> m_database;
</ins><span class="cx"> RefPtr<SQLTransactionWrapper> m_wrapper;
</span><span class="cx"> RefPtr<SQLError> m_transactionError;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp (178295 => 178296)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><del>-#include "DatabaseBackend.h"
</del><ins>+#include "Database.h"
</ins><span class="cx"> #include "SQLTransactionBackend.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> static String getDatabaseIdentifier(SQLTransactionBackend* transaction)
</span><span class="cx"> {
</span><del>- DatabaseBackend* database = transaction->database();
</del><ins>+ Database* database = transaction->database();
</ins><span class="cx"> ASSERT(database);
</span><span class="cx"> return database->securityOrigin()->databaseIdentifier();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>