<!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>[188865] 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/188865">188865</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-24 10:16:47 -0700 (Mon, 24 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused return values from SQLTransaction state functions
https://bugs.webkit.org/show_bug.cgi?id=148344
Reviewed by Tim Horton.
* Modules/webdatabase/SQLTransaction.cpp:
(WebCore::SQLTransaction::deliverTransactionCallback):
(WebCore::SQLTransaction::deliverTransactionErrorCallback):
(WebCore::SQLTransaction::deliverStatementCallback):
(WebCore::SQLTransaction::deliverQuotaIncreaseCallback):
(WebCore::SQLTransaction::deliverSuccessCallback):
(WebCore::SQLTransaction::unreachableState):
* Modules/webdatabase/SQLTransaction.h:
* Modules/webdatabase/SQLTransactionBackend.cpp:
(WebCore::SQLTransactionBackend::acquireLock):
(WebCore::SQLTransactionBackend::openTransactionAndPreflight):
(WebCore::SQLTransactionBackend::runStatements):
(WebCore::SQLTransactionBackend::cleanupAndTerminate):
(WebCore::SQLTransactionBackend::cleanupAfterTransactionErrorCallback):
(WebCore::SQLTransactionBackend::unreachableState):
* Modules/webdatabase/SQLTransactionBackend.h:
* Modules/webdatabase/SQLTransactionStateMachine.h:
(WebCore::SQLTransactionStateMachine<T>::runStateMachine):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionStateMachineh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188864 => 188865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-24 17:13:06 UTC (rev 188864)
+++ trunk/Source/WebCore/ChangeLog 2015-08-24 17:16:47 UTC (rev 188865)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-08-21 Anders Carlsson <andersca@apple.com>
+
+ Remove unused return values from SQLTransaction state functions
+ https://bugs.webkit.org/show_bug.cgi?id=148344
+
+ Reviewed by Tim Horton.
+
+ * Modules/webdatabase/SQLTransaction.cpp:
+ (WebCore::SQLTransaction::deliverTransactionCallback):
+ (WebCore::SQLTransaction::deliverTransactionErrorCallback):
+ (WebCore::SQLTransaction::deliverStatementCallback):
+ (WebCore::SQLTransaction::deliverQuotaIncreaseCallback):
+ (WebCore::SQLTransaction::deliverSuccessCallback):
+ (WebCore::SQLTransaction::unreachableState):
+ * Modules/webdatabase/SQLTransaction.h:
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ (WebCore::SQLTransactionBackend::acquireLock):
+ (WebCore::SQLTransactionBackend::openTransactionAndPreflight):
+ (WebCore::SQLTransactionBackend::runStatements):
+ (WebCore::SQLTransactionBackend::cleanupAndTerminate):
+ (WebCore::SQLTransactionBackend::cleanupAfterTransactionErrorCallback):
+ (WebCore::SQLTransactionBackend::unreachableState):
+ * Modules/webdatabase/SQLTransactionBackend.h:
+ * Modules/webdatabase/SQLTransactionStateMachine.h:
+ (WebCore::SQLTransactionStateMachine<T>::runStateMachine):
+
</ins><span class="cx"> 2015-08-24 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix build after r188860
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (188864 => 188865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2015-08-24 17:13:06 UTC (rev 188864)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2015-08-24 17:16:47 UTC (rev 188865)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> m_database->scheduleTransactionCallback(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransaction::deliverTransactionCallback()
</del><ins>+void SQLTransaction::deliverTransactionCallback()
</ins><span class="cx"> {
</span><span class="cx"> bool shouldDeliverErrorCallback = false;
</span><span class="cx">
</span><span class="lines">@@ -141,10 +141,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_backend->requestTransitToState(SQLTransactionState::RunStatements);
</span><del>- return SQLTransactionState::Idle;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransaction::deliverTransactionErrorCallback()
</del><ins>+void SQLTransaction::deliverTransactionErrorCallback()
</ins><span class="cx"> {
</span><span class="cx"> // Spec 4.3.2.10: If exists, invoke error callback with the last
</span><span class="cx"> // error to have occurred in this transaction.
</span><span class="lines">@@ -167,10 +166,9 @@
</span><span class="cx">
</span><span class="cx"> // Spec 4.3.2.10: Rollback the transaction.
</span><span class="cx"> m_backend->requestTransitToState(SQLTransactionState::CleanupAfterTransactionErrorCallback);
</span><del>- return SQLTransactionState::Idle;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransaction::deliverStatementCallback()
</del><ins>+void SQLTransaction::deliverStatementCallback()
</ins><span class="cx"> {
</span><span class="cx"> // Spec 4.3.2.6.6 and 4.3.2.6.3: If the statement callback went wrong, jump to the transaction error callback
</span><span class="cx"> // Otherwise, continue to loop through the statement queue
</span><span class="lines">@@ -192,14 +190,13 @@
</span><span class="cx"> // No error callback, so fast-forward to:
</span><span class="cx"> // Transaction Step 11 - Rollback the transaction.
</span><span class="cx"> m_backend->requestTransitToState(SQLTransactionState::CleanupAfterTransactionErrorCallback);
</span><del>- return SQLTransactionState::Idle;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_backend->requestTransitToState(SQLTransactionState::RunStatements);
</span><del>- return SQLTransactionState::Idle;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransaction::deliverQuotaIncreaseCallback()
</del><ins>+void SQLTransaction::deliverQuotaIncreaseCallback()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_backend->currentStatement());
</span><span class="cx">
</span><span class="lines">@@ -207,10 +204,9 @@
</span><span class="cx"> m_backend->setShouldRetryCurrentStatement(shouldRetryCurrentStatement);
</span><span class="cx">
</span><span class="cx"> m_backend->requestTransitToState(SQLTransactionState::RunStatements);
</span><del>- return SQLTransactionState::Idle;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransaction::deliverSuccessCallback()
</del><ins>+void SQLTransaction::deliverSuccessCallback()
</ins><span class="cx"> {
</span><span class="cx"> // Spec 4.3.2.8: Deliver success callback.
</span><span class="cx"> RefPtr<VoidCallback> successCallback = m_successCallbackWrapper.unwrap();
</span><span class="lines">@@ -222,16 +218,14 @@
</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><span class="cx"> m_backend->requestTransitToState(SQLTransactionState::CleanupAndTerminate);
</span><del>- return SQLTransactionState::Idle;
</del><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="cx"> // in the state dispatch table. They are unimplemented because they should
</span><span class="cx"> // never be reached in the course of correct execution.
</span><del>-SQLTransactionState SQLTransaction::unreachableState()
</del><ins>+void SQLTransaction::unreachableState()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return SQLTransactionState::End;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::performPendingCallback()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h (188864 => 188865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2015-08-24 17:13:06 UTC (rev 188864)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2015-08-24 17:16:47 UTC (rev 188865)
</span><span class="lines">@@ -76,13 +76,13 @@
</span><span class="cx"> void computeNextStateAndCleanupIfNeeded();
</span><span class="cx">
</span><span class="cx"> // State functions:
</span><del>- SQLTransactionState deliverTransactionCallback();
- SQLTransactionState deliverTransactionErrorCallback();
- SQLTransactionState deliverStatementCallback();
- SQLTransactionState deliverQuotaIncreaseCallback();
- SQLTransactionState deliverSuccessCallback();
</del><ins>+ void deliverTransactionCallback();
+ void deliverTransactionErrorCallback();
+ void deliverStatementCallback();
+ void deliverQuotaIncreaseCallback();
+ void deliverSuccessCallback();
</ins><span class="cx">
</span><del>- SQLTransactionState unreachableState();
</del><ins>+ NO_RETURN_DUE_TO_ASSERT void unreachableState();
</ins><span class="cx">
</span><span class="cx"> Ref<Database> m_database;
</span><span class="cx"> RefPtr<SQLTransactionBackend> m_backend;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (188864 => 188865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-24 17:13:06 UTC (rev 188864)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-24 17:16:47 UTC (rev 188865)
</span><span class="lines">@@ -535,10 +535,9 @@
</span><span class="cx"> doCleanup();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransactionBackend::acquireLock()
</del><ins>+void SQLTransactionBackend::acquireLock()
</ins><span class="cx"> {
</span><span class="cx"> m_database->transactionCoordinator()->acquireLock(this);
</span><del>- return SQLTransactionState::Idle;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::lockAcquired()
</span><span class="lines">@@ -550,7 +549,7 @@
</span><span class="cx"> m_database->scheduleTransactionStep(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransactionBackend::openTransactionAndPreflight()
</del><ins>+void SQLTransactionBackend::openTransactionAndPreflight()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_database->sqliteDatabase().transactionInProgress());
</span><span class="cx"> ASSERT(m_lockAcquired);
</span><span class="lines">@@ -562,7 +561,7 @@
</span><span class="cx"> m_transactionError = SQLError::create(SQLError::UNKNOWN_ERR, "unable to open a transaction, because the user deleted the database");
</span><span class="cx">
</span><span class="cx"> handleTransactionError();
</span><del>- return SQLTransactionState::Idle;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Set the maximum usage for this transaction if this transactions is not read-only
</span><span class="lines">@@ -587,7 +586,7 @@
</span><span class="cx"> m_sqliteTransaction = nullptr;
</span><span class="cx">
</span><span class="cx"> handleTransactionError();
</span><del>- return SQLTransactionState::Idle;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Note: We intentionally retrieve the actual version even with an empty expected version.
</span><span class="lines">@@ -602,7 +601,7 @@
</span><span class="cx"> m_database->enableAuthorizer();
</span><span class="cx">
</span><span class="cx"> handleTransactionError();
</span><del>- return SQLTransactionState::Idle;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_hasVersionMismatch = !m_database->expectedVersion().isEmpty() && (m_database->expectedVersion() != actualVersion);
</span><span class="lines">@@ -617,20 +616,20 @@
</span><span class="cx"> m_transactionError = SQLError::create(SQLError::UNKNOWN_ERR, "unknown error occurred during transaction preflight");
</span><span class="cx">
</span><span class="cx"> handleTransactionError();
</span><del>- return SQLTransactionState::Idle;
</del><ins>+ return;
</ins><span class="cx"> }
</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><span class="cx"> m_frontend->requestTransitToState(SQLTransactionState::DeliverTransactionCallback);
</span><del>- return SQLTransactionState::Idle;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we have no callback to make, skip pass to the state after:
</span><del>- return runStatements();
</del><ins>+ runStatements();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransactionBackend::runStatements()
</del><ins>+void SQLTransactionBackend::runStatements()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_lockAcquired);
</span><span class="cx">
</span><span class="lines">@@ -665,8 +664,6 @@
</span><span class="cx"> // the callback or performed any other additional work so we can return.
</span><span class="cx"> if (!m_currentStatementBackend)
</span><span class="cx"> postflightAndCommit();
</span><del>-
- return SQLTransactionState::Idle;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::getNextStatement()
</span><span class="lines">@@ -790,7 +787,7 @@
</span><span class="cx"> m_frontend->requestTransitToState(SQLTransactionState::DeliverSuccessCallback);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransactionBackend::cleanupAndTerminate()
</del><ins>+void SQLTransactionBackend::cleanupAndTerminate()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_lockAcquired);
</span><span class="cx">
</span><span class="lines">@@ -801,10 +798,9 @@
</span><span class="cx"> // Phase 5 cleanup. See comment on the SQLTransaction life-cycle above.
</span><span class="cx"> doCleanup();
</span><span class="cx"> m_database->inProgressTransactionCompleted();
</span><del>- return SQLTransactionState::End;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-SQLTransactionState SQLTransactionBackend::cleanupAfterTransactionErrorCallback()
</del><ins>+void SQLTransactionBackend::cleanupAfterTransactionErrorCallback()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_lockAcquired);
</span><span class="cx">
</span><span class="lines">@@ -823,7 +819,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_database->sqliteDatabase().transactionInProgress());
</span><span class="cx">
</span><del>- return cleanupAndTerminate();
</del><ins>+ cleanupAndTerminate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // requestTransitToState() can be called from the frontend. Hence, it should
</span><span class="lines">@@ -840,10 +836,9 @@
</span><span class="cx"> // This state function is used as a stub function to plug unimplemented states
</span><span class="cx"> // in the state dispatch table. They are unimplemented because they should
</span><span class="cx"> // never be reached in the course of correct execution.
</span><del>-SQLTransactionState SQLTransactionBackend::unreachableState()
</del><ins>+void SQLTransactionBackend::unreachableState()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return SQLTransactionState::End;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::acquireOriginLock()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h (188864 => 188865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-08-24 17:13:06 UTC (rev 188864)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-08-24 17:16:47 UTC (rev 188865)
</span><span class="lines">@@ -88,13 +88,13 @@
</span><span class="cx"> void computeNextStateAndCleanupIfNeeded();
</span><span class="cx">
</span><span class="cx"> // State functions:
</span><del>- SQLTransactionState acquireLock();
- SQLTransactionState openTransactionAndPreflight();
- SQLTransactionState runStatements();
- SQLTransactionState cleanupAndTerminate();
- SQLTransactionState cleanupAfterTransactionErrorCallback();
</del><ins>+ void acquireLock();
+ void openTransactionAndPreflight();
+ void runStatements();
+ void cleanupAndTerminate();
+ void cleanupAfterTransactionErrorCallback();
</ins><span class="cx">
</span><del>- SQLTransactionState unreachableState();
</del><ins>+ NO_RETURN_DUE_TO_ASSERT void unreachableState();
</ins><span class="cx">
</span><span class="cx"> void getNextStatement();
</span><span class="cx"> bool runCurrentStatement();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionStateMachineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h (188864 => 188865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h 2015-08-24 17:13:06 UTC (rev 188864)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h 2015-08-24 17:16:47 UTC (rev 188865)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> SQLTransactionStateMachine();
</span><span class="cx">
</span><del>- typedef SQLTransactionState (T::* StateFunction)();
</del><ins>+ typedef void (T::*StateFunction)();
</ins><span class="cx"> virtual StateFunction stateFunctionFor(SQLTransactionState) = 0;
</span><span class="cx">
</span><span class="cx"> void setStateToRequestedState();
</span><span class="lines">@@ -90,17 +90,20 @@
</span><span class="cx"> void SQLTransactionStateMachine<T>::runStateMachine()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(SQLTransactionState::End < SQLTransactionState::Idle);
</span><del>- while (m_nextState > SQLTransactionState::Idle) {
- ASSERT(m_nextState < SQLTransactionState::NumberOfStates);
- StateFunction stateFunction = stateFunctionFor(m_nextState);
- ASSERT(stateFunction);
</del><span class="cx">
</span><ins>+ ASSERT(m_nextState > SQLTransactionState::Idle);
+ ASSERT(m_nextState < SQLTransactionState::NumberOfStates);
+
+ StateFunction stateFunction = stateFunctionFor(m_nextState);
+ ASSERT(stateFunction);
+
</ins><span class="cx"> #ifndef NDEBUG
</span><del>- m_stateAuditTrail[m_nextStateAuditEntry] = m_nextState;
- m_nextStateAuditEntry = (m_nextStateAuditEntry + 1) % s_sizeOfStateAuditTrail;
</del><ins>+ m_stateAuditTrail[m_nextStateAuditEntry] = m_nextState;
+ m_nextStateAuditEntry = (m_nextStateAuditEntry + 1) % s_sizeOfStateAuditTrail;
</ins><span class="cx"> #endif
</span><del>- m_nextState = (static_cast<T*>(this)->*stateFunction)();
- }
</del><ins>+
+ (static_cast<T*>(this)->*stateFunction)();
+ m_nextState = SQLTransactionState::Idle;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>