<!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>[204338] 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/204338">204338</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-08-10 11:41:33 -0700 (Wed, 10 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make SQLTransactionBackend a member of SQLTransaction
https://bugs.webkit.org/show_bug.cgi?id=160741
Reviewed by Tim Horton.
This is another step towards merging SQLTransaction and SQLTransactionBackend.
* Modules/webdatabase/Database.cpp:
(WebCore::Database::performClose):
(WebCore::Database::scheduleTransaction):
(WebCore::Database::scheduleTransactionStep):
(WebCore::Database::runTransaction):
* Modules/webdatabase/Database.h:
* Modules/webdatabase/DatabaseTask.cpp:
(WebCore::DatabaseTransactionTask::DatabaseTransactionTask):
(WebCore::DatabaseTransactionTask::~DatabaseTransactionTask):
(WebCore::DatabaseTransactionTask::doPerformTask):
* Modules/webdatabase/DatabaseTask.h:
(WebCore::DatabaseTransactionTask::transaction):
* Modules/webdatabase/DatabaseThread.cpp:
* Modules/webdatabase/SQLTransaction.cpp:
(WebCore::SQLTransaction::SQLTransaction):
(WebCore::SQLTransaction::deliverTransactionCallback):
(WebCore::SQLTransaction::deliverTransactionErrorCallback):
(WebCore::SQLTransaction::deliverStatementCallback):
(WebCore::SQLTransaction::deliverQuotaIncreaseCallback):
(WebCore::SQLTransaction::deliverSuccessCallback):
(WebCore::SQLTransaction::executeSQL):
(WebCore::SQLTransaction::computeNextStateAndCleanupIfNeeded):
(WebCore::SQLTransaction::setBackend): Deleted.
* Modules/webdatabase/SQLTransaction.h:
(WebCore::SQLTransaction::backend):
* Modules/webdatabase/SQLTransactionBackend.cpp:
(WebCore::SQLTransactionBackend::SQLTransactionBackend):
(WebCore::SQLTransactionBackend::doCleanup):
(WebCore::SQLTransactionBackend::computeNextStateAndCleanupIfNeeded):
(WebCore::SQLTransactionBackend::acquireLock):
(WebCore::SQLTransactionBackend::lockAcquired):
(WebCore::SQLTransactionBackend::openTransactionAndPreflight):
(WebCore::SQLTransactionBackend::runCurrentStatement):
(WebCore::SQLTransactionBackend::handleCurrentStatementError):
(WebCore::SQLTransactionBackend::handleTransactionError):
(WebCore::SQLTransactionBackend::postflightAndCommit):
(WebCore::SQLTransactionBackend::requestTransitToState):
(WebCore::SQLTransactionBackend::create): Deleted.
* Modules/webdatabase/SQLTransactionBackend.h:
* Modules/webdatabase/SQLTransactionCoordinator.cpp:
(WebCore::getDatabaseIdentifier):
(WebCore::SQLTransactionCoordinator::processPendingTransactions):
(WebCore::SQLTransactionCoordinator::acquireLock):
(WebCore::SQLTransactionCoordinator::releaseLock):
(WebCore::SQLTransactionCoordinator::shutdown):
* Modules/webdatabase/SQLTransactionCoordinator.h:</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="#trunkSourceWebCoreModuleswebdatabaseDatabaseTaskcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTaskh">trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionh">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.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>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionCoordinatorh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/ChangeLog 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -1,3 +1,59 @@
</span><ins>+2016-08-10 Anders Carlsson <andersca@apple.com>
+
+ Make SQLTransactionBackend a member of SQLTransaction
+ https://bugs.webkit.org/show_bug.cgi?id=160741
+
+ Reviewed by Tim Horton.
+
+ This is another step towards merging SQLTransaction and SQLTransactionBackend.
+
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::performClose):
+ (WebCore::Database::scheduleTransaction):
+ (WebCore::Database::scheduleTransactionStep):
+ (WebCore::Database::runTransaction):
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/DatabaseTask.cpp:
+ (WebCore::DatabaseTransactionTask::DatabaseTransactionTask):
+ (WebCore::DatabaseTransactionTask::~DatabaseTransactionTask):
+ (WebCore::DatabaseTransactionTask::doPerformTask):
+ * Modules/webdatabase/DatabaseTask.h:
+ (WebCore::DatabaseTransactionTask::transaction):
+ * Modules/webdatabase/DatabaseThread.cpp:
+ * Modules/webdatabase/SQLTransaction.cpp:
+ (WebCore::SQLTransaction::SQLTransaction):
+ (WebCore::SQLTransaction::deliverTransactionCallback):
+ (WebCore::SQLTransaction::deliverTransactionErrorCallback):
+ (WebCore::SQLTransaction::deliverStatementCallback):
+ (WebCore::SQLTransaction::deliverQuotaIncreaseCallback):
+ (WebCore::SQLTransaction::deliverSuccessCallback):
+ (WebCore::SQLTransaction::executeSQL):
+ (WebCore::SQLTransaction::computeNextStateAndCleanupIfNeeded):
+ (WebCore::SQLTransaction::setBackend): Deleted.
+ * Modules/webdatabase/SQLTransaction.h:
+ (WebCore::SQLTransaction::backend):
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ (WebCore::SQLTransactionBackend::SQLTransactionBackend):
+ (WebCore::SQLTransactionBackend::doCleanup):
+ (WebCore::SQLTransactionBackend::computeNextStateAndCleanupIfNeeded):
+ (WebCore::SQLTransactionBackend::acquireLock):
+ (WebCore::SQLTransactionBackend::lockAcquired):
+ (WebCore::SQLTransactionBackend::openTransactionAndPreflight):
+ (WebCore::SQLTransactionBackend::runCurrentStatement):
+ (WebCore::SQLTransactionBackend::handleCurrentStatementError):
+ (WebCore::SQLTransactionBackend::handleTransactionError):
+ (WebCore::SQLTransactionBackend::postflightAndCommit):
+ (WebCore::SQLTransactionBackend::requestTransitToState):
+ (WebCore::SQLTransactionBackend::create): Deleted.
+ * Modules/webdatabase/SQLTransactionBackend.h:
+ * Modules/webdatabase/SQLTransactionCoordinator.cpp:
+ (WebCore::getDatabaseIdentifier):
+ (WebCore::SQLTransactionCoordinator::processPendingTransactions):
+ (WebCore::SQLTransactionCoordinator::acquireLock):
+ (WebCore::SQLTransactionCoordinator::releaseLock):
+ (WebCore::SQLTransactionCoordinator::shutdown):
+ * Modules/webdatabase/SQLTransactionCoordinator.h:
+
</ins><span class="cx"> 2016-08-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> child-transform-with-anchor-point-expected.html renders incorrectly
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> // transaction is interrupted?" at the top of SQLTransactionBackend.cpp.
</span><span class="cx"> while (!m_transactionQueue.isEmpty()) {
</span><span class="cx"> auto transaction = m_transactionQueue.takeFirst();
</span><del>- transaction->notifyDatabaseThreadIsShuttingDown();
</del><ins>+ transaction->backend().notifyDatabaseThreadIsShuttingDown();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_isTransactionQueueEnabled = false;
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> void Database::scheduleTransaction()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_transactionInProgressMutex.tryLock()); // Locked by caller.
</span><del>- RefPtr<SQLTransactionBackend> transaction;
</del><ins>+ RefPtr<SQLTransaction> transaction;
</ins><span class="cx">
</span><span class="cx"> if (m_isTransactionQueueEnabled && !m_transactionQueue.isEmpty())
</span><span class="cx"> transaction = m_transactionQueue.takeFirst();
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> m_transactionInProgress = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Database::scheduleTransactionStep(SQLTransactionBackend& transaction)
</del><ins>+void Database::scheduleTransactionStep(SQLTransaction& transaction)
</ins><span class="cx"> {
</span><span class="cx"> if (!databaseContext()->databaseThread())
</span><span class="cx"> return;
</span><span class="lines">@@ -736,7 +736,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto transaction = SQLTransaction::create(*this, WTFMove(callback), WTFMove(successCallback), errorCallback.copyRef(), WTFMove(wrapper), readOnly);
</span><del>- m_transactionQueue.append(&transaction->backend());
</del><ins>+ m_transactionQueue.append(transaction.ptr());
</ins><span class="cx"> if (!m_transactionInProgress)
</span><span class="cx"> scheduleTransaction();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned long long maximumSize() const;
</span><span class="cx">
</span><del>- void scheduleTransactionStep(SQLTransactionBackend&);
</del><ins>+ void scheduleTransactionStep(SQLTransaction&);
</ins><span class="cx"> void inProgressTransactionCompleted();
</span><span class="cx">
</span><span class="cx"> bool hasPendingTransaction();
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<DatabaseAuthorizer> m_databaseAuthorizer;
</span><span class="cx">
</span><del>- Deque<RefPtr<SQLTransactionBackend>> m_transactionQueue;
</del><ins>+ Deque<RefPtr<SQLTransaction>> m_transactionQueue;
</ins><span class="cx"> Lock m_transactionInProgressMutex;
</span><span class="cx"> bool m_transactionInProgress;
</span><span class="cx"> bool m_isTransactionQueueEnabled;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -145,8 +145,8 @@
</span><span class="cx"> // *** DatabaseTransactionTask ***
</span><span class="cx"> // Starts a transaction that will report its results via a callback.
</span><span class="cx">
</span><del>-DatabaseTransactionTask::DatabaseTransactionTask(RefPtr<SQLTransactionBackend>&& transaction)
- : DatabaseTask(*transaction->database(), 0)
</del><ins>+DatabaseTransactionTask::DatabaseTransactionTask(RefPtr<SQLTransaction>&& transaction)
+ : DatabaseTask(transaction->database(), 0)
</ins><span class="cx"> , m_transaction(WTFMove(transaction))
</span><span class="cx"> , m_didPerformTask(false)
</span><span class="cx"> {
</span><span class="lines">@@ -163,12 +163,12 @@
</span><span class="cx"> // transaction is interrupted?" at the top of SQLTransactionBackend.cpp.
</span><span class="cx">
</span><span class="cx"> if (!m_didPerformTask)
</span><del>- m_transaction->notifyDatabaseThreadIsShuttingDown();
</del><ins>+ m_transaction->backend().notifyDatabaseThreadIsShuttingDown();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseTransactionTask::doPerformTask()
</span><span class="cx"> {
</span><del>- m_transaction->performNextStep();
</del><ins>+ m_transaction->backend().performNextStep();
</ins><span class="cx"> m_didPerformTask = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -122,10 +122,10 @@
</span><span class="cx">
</span><span class="cx"> class DatabaseTransactionTask : public DatabaseTask {
</span><span class="cx"> public:
</span><del>- explicit DatabaseTransactionTask(RefPtr<SQLTransactionBackend>&&);
</del><ins>+ explicit DatabaseTransactionTask(RefPtr<SQLTransaction>&&);
</ins><span class="cx"> virtual ~DatabaseTransactionTask();
</span><span class="cx">
</span><del>- SQLTransactionBackend* transaction() const { return m_transaction.get(); }
</del><ins>+ SQLTransaction* transaction() const { return m_transaction.get(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void doPerformTask() override;
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> const char* debugTaskName() const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- RefPtr<SQLTransactionBackend> m_transaction;
</del><ins>+ RefPtr<SQLTransaction> m_transaction;
</ins><span class="cx"> bool m_didPerformTask;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseTask.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "SQLTransaction.h"
</ins><span class="cx"> #include "SQLTransactionClient.h"
</span><span class="cx"> #include "SQLTransactionCoordinator.h"
</span><span class="cx"> #include <wtf/AutodrainedPool.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -60,9 +60,8 @@
</span><span class="cx"> , m_errorCallbackWrapper(WTFMove(errorCallback), m_database->scriptExecutionContext())
</span><span class="cx"> , m_executeSqlAllowed(false)
</span><span class="cx"> , m_readOnly(readOnly)
</span><ins>+ , m_backend(m_database.ptr(), *this, WTFMove(wrapper), readOnly)
</ins><span class="cx"> {
</span><del>- // This will end up assigning to m_frontend.
- SQLTransactionBackend::create(m_database.ptr(), this, WTFMove(wrapper), readOnly);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SQLTransaction::~SQLTransaction()
</span><span class="lines">@@ -84,12 +83,6 @@
</span><span class="cx"> return m_errorCallbackWrapper.hasCallback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SQLTransaction::setBackend(SQLTransactionBackend* backend)
-{
- ASSERT(!m_backend);
- m_backend = backend;
-}
-
</del><span class="cx"> SQLTransaction::StateFunction SQLTransaction::stateFunctionFor(SQLTransactionState state)
</span><span class="cx"> {
</span><span class="cx"> static const StateFunction stateFunctions[] = {
</span><span class="lines">@@ -142,7 +135,7 @@
</span><span class="cx"> return deliverTransactionErrorCallback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_backend->requestTransitToState(SQLTransactionState::RunStatements);
</del><ins>+ m_backend.requestTransitToState(SQLTransactionState::RunStatements);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::deliverTransactionErrorCallback()
</span><span class="lines">@@ -156,7 +149,7 @@
</span><span class="cx"> // Hence, it's thread safe to fetch the backend transactionError without
</span><span class="cx"> // a lock.
</span><span class="cx"> if (!m_transactionError)
</span><del>- m_transactionError = m_backend->transactionError();
</del><ins>+ m_transactionError = m_backend.transactionError();
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_transactionError);
</span><span class="cx"> errorCallback->handleEvent(m_transactionError.get());
</span><span class="lines">@@ -167,7 +160,7 @@
</span><span class="cx"> clearCallbackWrappers();
</span><span class="cx">
</span><span class="cx"> // Spec 4.3.2.10: Rollback the transaction.
</span><del>- m_backend->requestTransitToState(SQLTransactionState::CleanupAfterTransactionErrorCallback);
</del><ins>+ m_backend.requestTransitToState(SQLTransactionState::CleanupAfterTransactionErrorCallback);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::deliverStatementCallback()
</span><span class="lines">@@ -176,7 +169,7 @@
</span><span class="cx"> // Otherwise, continue to loop through the statement queue
</span><span class="cx"> m_executeSqlAllowed = true;
</span><span class="cx">
</span><del>- SQLStatement* currentStatement = m_backend->currentStatement();
</del><ins>+ SQLStatement* currentStatement = m_backend.currentStatement();
</ins><span class="cx"> ASSERT(currentStatement);
</span><span class="cx">
</span><span class="cx"> bool result = currentStatement->performCallback(this);
</span><span class="lines">@@ -191,21 +184,21 @@
</span><span class="cx">
</span><span class="cx"> // No error callback, so fast-forward to:
</span><span class="cx"> // Transaction Step 11 - Rollback the transaction.
</span><del>- m_backend->requestTransitToState(SQLTransactionState::CleanupAfterTransactionErrorCallback);
</del><ins>+ m_backend.requestTransitToState(SQLTransactionState::CleanupAfterTransactionErrorCallback);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_backend->requestTransitToState(SQLTransactionState::RunStatements);
</del><ins>+ m_backend.requestTransitToState(SQLTransactionState::RunStatements);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::deliverQuotaIncreaseCallback()
</span><span class="cx"> {
</span><del>- ASSERT(m_backend->currentStatement());
</del><ins>+ ASSERT(m_backend.currentStatement());
</ins><span class="cx">
</span><span class="cx"> bool shouldRetryCurrentStatement = m_database->transactionClient()->didExceedQuota(&database());
</span><del>- m_backend->setShouldRetryCurrentStatement(shouldRetryCurrentStatement);
</del><ins>+ m_backend.setShouldRetryCurrentStatement(shouldRetryCurrentStatement);
</ins><span class="cx">
</span><del>- m_backend->requestTransitToState(SQLTransactionState::RunStatements);
</del><ins>+ m_backend.requestTransitToState(SQLTransactionState::RunStatements);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::deliverSuccessCallback()
</span><span class="lines">@@ -219,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> // Schedule a "post-success callback" step to return control to the database thread in case there
</span><span class="cx"> // are further transactions queued up for this Database
</span><del>- m_backend->requestTransitToState(SQLTransactionState::CleanupAndTerminate);
</del><ins>+ m_backend.requestTransitToState(SQLTransactionState::CleanupAndTerminate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This state function is used as a stub function to plug unimplemented states
</span><span class="lines">@@ -250,7 +243,7 @@
</span><span class="cx"> permissions |= DatabaseAuthorizer::ReadOnlyMask;
</span><span class="cx">
</span><span class="cx"> auto statement = std::make_unique<SQLStatement>(m_database, sqlStatement, arguments, WTFMove(callback), WTFMove(callbackError), permissions);
</span><del>- m_backend->executeSQL(WTFMove(statement));
</del><ins>+ m_backend.executeSQL(WTFMove(statement));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::computeNextStateAndCleanupIfNeeded()
</span><span class="lines">@@ -271,7 +264,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> clearCallbackWrappers();
</span><del>- m_backend->requestTransitToState(SQLTransactionState::CleanupAndTerminate);
</del><ins>+ m_backend.requestTransitToState(SQLTransactionState::CleanupAndTerminate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::clearCallbackWrappers()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "SQLCallbackWrapper.h"
</span><ins>+#include "SQLTransactionBackend.h"
</ins><span class="cx"> #include "SQLTransactionStateMachine.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx"> void performPendingCallback();
</span><span class="cx">
</span><span class="cx"> Database& database() { return m_database; }
</span><del>- SQLTransactionBackend& backend() { return *m_backend; }
</del><ins>+ SQLTransactionBackend& backend() { return m_backend; }
</ins><span class="cx">
</span><span class="cx"> // APIs called from the backend published via SQLTransaction:
</span><span class="cx"> void requestTransitToState(SQLTransactionState);
</span><span class="lines">@@ -73,7 +74,6 @@
</span><span class="cx"> bool hasCallback() const;
</span><span class="cx"> bool hasSuccessCallback() const;
</span><span class="cx"> bool hasErrorCallback() const;
</span><del>- void setBackend(SQLTransactionBackend*);
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SQLTransaction(Ref<Database>&&, RefPtr<SQLTransactionCallback>&&, RefPtr<VoidCallback>&& successCallback, RefPtr<SQLTransactionErrorCallback>&&, RefPtr<SQLTransactionWrapper>&&, bool readOnly);
</span><span class="lines">@@ -94,7 +94,6 @@
</span><span class="cx"> NO_RETURN_DUE_TO_ASSERT void unreachableState();
</span><span class="cx">
</span><span class="cx"> Ref<Database> m_database;
</span><del>- RefPtr<SQLTransactionBackend> m_backend;
</del><span class="cx"> SQLCallbackWrapper<SQLTransactionCallback> m_callbackWrapper;
</span><span class="cx"> SQLCallbackWrapper<VoidCallback> m_successCallbackWrapper;
</span><span class="cx"> SQLCallbackWrapper<SQLTransactionErrorCallback> m_errorCallbackWrapper;
</span><span class="lines">@@ -103,6 +102,8 @@
</span><span class="cx"> RefPtr<SQLError> m_transactionError;
</span><span class="cx">
</span><span class="cx"> bool m_readOnly;
</span><ins>+
+ SQLTransactionBackend m_backend;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -343,18 +343,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<SQLTransactionBackend> SQLTransactionBackend::create(Database* db, RefPtr<SQLTransaction>&& frontend, RefPtr<SQLTransactionWrapper>&& wrapper, bool readOnly)
-{
- return adoptRef(*new SQLTransactionBackend(db, WTFMove(frontend), WTFMove(wrapper), readOnly));
-}
-
-SQLTransactionBackend::SQLTransactionBackend(Database* db, RefPtr<SQLTransaction>&& frontend, RefPtr<SQLTransactionWrapper>&& wrapper, bool readOnly)
- : m_frontend(WTFMove(frontend))
</del><ins>+SQLTransactionBackend::SQLTransactionBackend(Database* db, SQLTransaction& frontend, RefPtr<SQLTransactionWrapper>&& wrapper, bool readOnly)
+ : m_frontend(frontend)
</ins><span class="cx"> , m_database(db)
</span><span class="cx"> , m_wrapper(WTFMove(wrapper))
</span><del>- , m_hasCallback(m_frontend->hasCallback())
- , m_hasSuccessCallback(m_frontend->hasSuccessCallback())
- , m_hasErrorCallback(m_frontend->hasErrorCallback())
</del><ins>+ , m_hasCallback(m_frontend.hasCallback())
+ , m_hasSuccessCallback(m_frontend.hasSuccessCallback())
+ , m_hasErrorCallback(m_frontend.hasErrorCallback())
</ins><span class="cx"> , m_shouldRetryCurrentStatement(false)
</span><span class="cx"> , m_modifiedDatabase(false)
</span><span class="cx"> , m_lockAcquired(false)
</span><span class="lines">@@ -362,7 +357,6 @@
</span><span class="cx"> , m_hasVersionMismatch(false)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_database);
</span><del>- m_frontend->setBackend(this);
</del><span class="cx"> m_requestedState = SQLTransactionState::AcquireLock;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -373,10 +367,6 @@
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::doCleanup()
</span><span class="cx"> {
</span><del>- if (!m_frontend)
- return;
- m_frontend = nullptr; // Break the reference cycle. See comment about the life-cycle above.
-
</del><span class="cx"> ASSERT(currentThread() == database()->databaseContext()->databaseThread()->getThreadID());
</span><span class="cx">
</span><span class="cx"> releaseOriginLockIfNeeded();
</span><span class="lines">@@ -395,7 +385,7 @@
</span><span class="cx">
</span><span class="cx"> // Release the lock on this database
</span><span class="cx"> if (m_lockAcquired)
</span><del>- m_database->transactionCoordinator()->releaseLock(this);
</del><ins>+ m_database->transactionCoordinator()->releaseLock(m_frontend);
</ins><span class="cx">
</span><span class="cx"> // Do some aggresive clean up here except for m_database.
</span><span class="cx"> //
</span><span class="lines">@@ -503,7 +493,7 @@
</span><span class="cx"> // Terminate the frontend state machine. This also gets the frontend to
</span><span class="cx"> // call computeNextStateAndCleanupIfNeeded() and clear its wrappers
</span><span class="cx"> // if needed.
</span><del>- m_frontend->requestTransitToState(SQLTransactionState::End);
</del><ins>+ m_frontend.requestTransitToState(SQLTransactionState::End);
</ins><span class="cx">
</span><span class="cx"> // Redirect to the end state to abort, clean up, and end the transaction.
</span><span class="cx"> doCleanup();
</span><span class="lines">@@ -537,7 +527,7 @@
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::acquireLock()
</span><span class="cx"> {
</span><del>- m_database->transactionCoordinator()->acquireLock(this);
</del><ins>+ m_database->transactionCoordinator()->acquireLock(m_frontend);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::lockAcquired()
</span><span class="lines">@@ -546,7 +536,7 @@
</span><span class="cx">
</span><span class="cx"> m_requestedState = SQLTransactionState::OpenTransactionAndPreflight;
</span><span class="cx"> ASSERT(m_requestedState != SQLTransactionState::End);
</span><del>- m_database->scheduleTransactionStep(*this);
</del><ins>+ m_database->scheduleTransactionStep(m_frontend);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::openTransactionAndPreflight()
</span><span class="lines">@@ -621,7 +611,7 @@
</span><span class="cx">
</span><span class="cx"> // Spec 4.3.2.4: Invoke the transaction callback with the new SQLTransaction object
</span><span class="cx"> if (m_hasCallback) {
</span><del>- m_frontend->requestTransitToState(SQLTransactionState::DeliverTransactionCallback);
</del><ins>+ m_frontend.requestTransitToState(SQLTransactionState::DeliverTransactionCallback);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -694,7 +684,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_currentStatementBackend->hasStatementCallback()) {
</span><del>- m_frontend->requestTransitToState(SQLTransactionState::DeliverStatementCallback);
</del><ins>+ m_frontend.requestTransitToState(SQLTransactionState::DeliverStatementCallback);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -704,7 +694,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_currentStatementBackend->lastExecutionFailedDueToQuota()) {
</span><del>- m_frontend->requestTransitToState(SQLTransactionState::DeliverQuotaIncreaseCallback);
</del><ins>+ m_frontend.requestTransitToState(SQLTransactionState::DeliverQuotaIncreaseCallback);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -717,7 +707,7 @@
</span><span class="cx"> // Spec 4.3.2.6.6: error - Call the statement's error callback, but if there was no error callback,
</span><span class="cx"> // or the transaction was rolled back, jump to the transaction error callback
</span><span class="cx"> if (m_currentStatementBackend->hasStatementErrorCallback() && !m_sqliteTransaction->wasRolledBackBySqlite()) {
</span><del>- m_frontend->requestTransitToState(SQLTransactionState::DeliverStatementCallback);
</del><ins>+ m_frontend.requestTransitToState(SQLTransactionState::DeliverStatementCallback);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -732,7 +722,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_transactionError);
</span><span class="cx"> if (m_hasErrorCallback) {
</span><del>- m_frontend->requestTransitToState(SQLTransactionState::DeliverTransactionErrorCallback);
</del><ins>+ m_frontend.requestTransitToState(SQLTransactionState::DeliverTransactionErrorCallback);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -784,7 +774,7 @@
</span><span class="cx"> m_database->transactionClient()->didCommitWriteTransaction(database());
</span><span class="cx">
</span><span class="cx"> // Spec 4.3.2.8: Deliver success callback, if there is one.
</span><del>- m_frontend->requestTransitToState(SQLTransactionState::DeliverSuccessCallback);
</del><ins>+ m_frontend.requestTransitToState(SQLTransactionState::DeliverSuccessCallback);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::cleanupAndTerminate()
</span><span class="lines">@@ -830,7 +820,7 @@
</span><span class="cx"> LOG(StorageAPI, "Scheduling %s for transaction %p\n", nameForSQLTransactionState(nextState), this);
</span><span class="cx"> m_requestedState = nextState;
</span><span class="cx"> ASSERT(m_requestedState != SQLTransactionState::End);
</span><del>- m_database->scheduleTransactionStep(*this);
</del><ins>+ m_database->scheduleTransactionStep(m_frontend);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This state function is used as a stub function to plug unimplemented states
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -47,12 +47,11 @@
</span><span class="cx"> class SQLTransactionWrapper;
</span><span class="cx"> class SQLValue;
</span><span class="cx">
</span><del>-class SQLTransactionBackend : public ThreadSafeRefCounted<SQLTransactionBackend>, public SQLTransactionStateMachine<SQLTransactionBackend> {
</del><ins>+class SQLTransactionBackend : public SQLTransactionStateMachine<SQLTransactionBackend> {
</ins><span class="cx"> public:
</span><del>- static Ref<SQLTransactionBackend> create(Database*, RefPtr<SQLTransaction>&&, RefPtr<SQLTransactionWrapper>&&, bool readOnly);
</del><ins>+ SQLTransactionBackend(Database*, SQLTransaction&, RefPtr<SQLTransactionWrapper>&&, bool readOnly);
+ ~SQLTransactionBackend();
</ins><span class="cx">
</span><del>- virtual ~SQLTransactionBackend();
-
</del><span class="cx"> void lockAcquired();
</span><span class="cx"> void performNextStep();
</span><span class="cx">
</span><span class="lines">@@ -68,7 +67,6 @@
</span><span class="cx"> void executeSQL(std::unique_ptr<SQLStatement>);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SQLTransactionBackend(Database*, RefPtr<SQLTransaction>&&, RefPtr<SQLTransactionWrapper>&&, bool readOnly);
</del><span class="cx">
</span><span class="cx"> void doCleanup();
</span><span class="cx">
</span><span class="lines">@@ -96,7 +94,7 @@
</span><span class="cx"> void acquireOriginLock();
</span><span class="cx"> void releaseOriginLockIfNeeded();
</span><span class="cx">
</span><del>- RefPtr<SQLTransaction> m_frontend; // Has a reference cycle, and will break in doCleanup().
</del><ins>+ SQLTransaction& m_frontend;
</ins><span class="cx"> std::unique_ptr<SQLStatement> m_currentStatementBackend;
</span><span class="cx">
</span><span class="cx"> RefPtr<Database> m_database;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "SQLTransactionCoordinator.h"
</span><span class="cx">
</span><span class="cx"> #include "Database.h"
</span><del>-#include "SQLTransactionBackend.h"
</del><ins>+#include "SQLTransaction.h"
</ins><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -42,11 +42,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static String getDatabaseIdentifier(SQLTransactionBackend* transaction)
</del><ins>+static String getDatabaseIdentifier(SQLTransaction& transaction)
</ins><span class="cx"> {
</span><del>- Database* database = transaction->database();
- ASSERT(database);
- return database->securityOrigin()->databaseIdentifier();
</del><ins>+ return transaction.database().securityOrigin()->databaseIdentifier();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SQLTransactionCoordinator::SQLTransactionCoordinator()
</span><span class="lines">@@ -59,21 +57,21 @@
</span><span class="cx"> if (info.activeWriteTransaction || info.pendingTransactions.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<SQLTransactionBackend> firstPendingTransaction = info.pendingTransactions.first();
- if (firstPendingTransaction->isReadOnly()) {
</del><ins>+ RefPtr<SQLTransaction> firstPendingTransaction = info.pendingTransactions.first();
+ if (firstPendingTransaction->backend().isReadOnly()) {
</ins><span class="cx"> do {
</span><span class="cx"> firstPendingTransaction = info.pendingTransactions.takeFirst();
</span><span class="cx"> info.activeReadTransactions.add(firstPendingTransaction);
</span><del>- firstPendingTransaction->lockAcquired();
- } while (!info.pendingTransactions.isEmpty() && info.pendingTransactions.first()->isReadOnly());
</del><ins>+ firstPendingTransaction->backend().lockAcquired();
+ } while (!info.pendingTransactions.isEmpty() && info.pendingTransactions.first()->backend().isReadOnly());
</ins><span class="cx"> } else if (info.activeReadTransactions.isEmpty()) {
</span><span class="cx"> info.pendingTransactions.removeFirst();
</span><span class="cx"> info.activeWriteTransaction = firstPendingTransaction;
</span><del>- firstPendingTransaction->lockAcquired();
</del><ins>+ firstPendingTransaction->backend().lockAcquired();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SQLTransactionCoordinator::acquireLock(SQLTransactionBackend* transaction)
</del><ins>+void SQLTransactionCoordinator::acquireLock(SQLTransaction& transaction)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isShuttingDown);
</span><span class="cx">
</span><span class="lines">@@ -86,11 +84,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CoordinationInfo& info = coordinationInfoIterator->value;
</span><del>- info.pendingTransactions.append(transaction);
</del><ins>+ info.pendingTransactions.append(&transaction);
</ins><span class="cx"> processPendingTransactions(info);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SQLTransactionCoordinator::releaseLock(SQLTransactionBackend* transaction)
</del><ins>+void SQLTransactionCoordinator::releaseLock(SQLTransaction& transaction)
</ins><span class="cx"> {
</span><span class="cx"> if (m_isShuttingDown)
</span><span class="cx"> return;
</span><span class="lines">@@ -101,11 +99,11 @@
</span><span class="cx"> ASSERT(coordinationInfoIterator != m_coordinationInfoMap.end());
</span><span class="cx"> CoordinationInfo& info = coordinationInfoIterator->value;
</span><span class="cx">
</span><del>- if (transaction->isReadOnly()) {
- ASSERT(info.activeReadTransactions.contains(transaction));
- info.activeReadTransactions.remove(transaction);
</del><ins>+ if (transaction.backend().isReadOnly()) {
+ ASSERT(info.activeReadTransactions.contains(&transaction));
+ info.activeReadTransactions.remove(&transaction);
</ins><span class="cx"> } else {
</span><del>- ASSERT(info.activeWriteTransaction == transaction);
</del><ins>+ ASSERT(info.activeWriteTransaction == &transaction);
</ins><span class="cx"> info.activeWriteTransaction = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -124,16 +122,16 @@
</span><span class="cx"> // Transaction phase 4 cleanup. See comment on "What happens if a
</span><span class="cx"> // transaction is interrupted?" at the top of SQLTransactionBackend.cpp.
</span><span class="cx"> if (info.activeWriteTransaction)
</span><del>- info.activeWriteTransaction->notifyDatabaseThreadIsShuttingDown();
</del><ins>+ info.activeWriteTransaction->backend().notifyDatabaseThreadIsShuttingDown();
</ins><span class="cx"> for (auto& transaction : info.activeReadTransactions)
</span><del>- transaction->notifyDatabaseThreadIsShuttingDown();
</del><ins>+ transaction->backend().notifyDatabaseThreadIsShuttingDown();
</ins><span class="cx">
</span><span class="cx"> // Clean up transactions that have NOT reached "lockAcquired":
</span><span class="cx"> // Transaction phase 3 cleanup. See comment on "What happens if a
</span><span class="cx"> // transaction is interrupted?" at the top of SQLTransactionBackend.cpp.
</span><span class="cx"> while (!info.pendingTransactions.isEmpty()) {
</span><del>- RefPtr<SQLTransactionBackend> transaction = info.pendingTransactions.first();
- transaction->notifyDatabaseThreadIsShuttingDown();
</del><ins>+ RefPtr<SQLTransaction> transaction = info.pendingTransactions.first();
+ transaction->backend().notifyDatabaseThreadIsShuttingDown();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h (204337 => 204338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h 2016-08-10 17:37:49 UTC (rev 204337)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h 2016-08-10 18:41:33 UTC (rev 204338)
</span><span class="lines">@@ -40,21 +40,21 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class SQLTransactionBackend;
</del><ins>+class SQLTransaction;
</ins><span class="cx">
</span><span class="cx"> class SQLTransactionCoordinator {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(SQLTransactionCoordinator); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> SQLTransactionCoordinator();
</span><del>- void acquireLock(SQLTransactionBackend*);
- void releaseLock(SQLTransactionBackend*);
</del><ins>+ void acquireLock(SQLTransaction&);
+ void releaseLock(SQLTransaction&);
</ins><span class="cx"> void shutdown();
</span><span class="cx"> private:
</span><del>- typedef Deque<RefPtr<SQLTransactionBackend>> TransactionsQueue;
</del><ins>+ typedef Deque<RefPtr<SQLTransaction>> TransactionsQueue;
</ins><span class="cx"> struct CoordinationInfo {
</span><span class="cx"> TransactionsQueue pendingTransactions;
</span><del>- HashSet<RefPtr<SQLTransactionBackend>> activeReadTransactions;
- RefPtr<SQLTransactionBackend> activeWriteTransaction;
</del><ins>+ HashSet<RefPtr<SQLTransaction>> activeReadTransactions;
+ RefPtr<SQLTransaction> activeWriteTransaction;
</ins><span class="cx"> };
</span><span class="cx"> // Maps database names to information about pending transactions
</span><span class="cx"> typedef HashMap<String, CoordinationInfo> CoordinationInfoMap;
</span></span></pre>
</div>
</div>
</body>
</html>