webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 15 insertions, 17 deletions

diff --git a/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h b/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h
index fff11a8ce..b30fa28d8 100644
--- a/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h
+++ b/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h
@@ -23,10 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef SQLTransactionStateMachine_h
-#define SQLTransactionStateMachine_h
-
-#if ENABLE(SQL_DATABASE)
+#pragma once
 
 #include "SQLTransactionState.h"
 #include <wtf/ThreadSafeRefCounted.h>
@@ -41,7 +38,7 @@ public:
 protected:
     SQLTransactionStateMachine();
 
-    typedef SQLTransactionState (T::* StateFunction)();
+    typedef void (T::*StateFunction)();
     virtual StateFunction stateFunctionFor(SQLTransactionState) = 0;
 
     void setStateToRequestedState();
@@ -92,21 +89,22 @@ template<typename T>
 void SQLTransactionStateMachine<T>::runStateMachine()
 {
     ASSERT(SQLTransactionState::End < SQLTransactionState::Idle);
-    while (m_nextState > SQLTransactionState::Idle) {
-        ASSERT(m_nextState < SQLTransactionState::NumberOfStates);
-        StateFunction stateFunction = stateFunctionFor(m_nextState);
-        ASSERT(stateFunction);
+
+    if (m_nextState <= SQLTransactionState::Idle)
+        return;
+
+    ASSERT(m_nextState < SQLTransactionState::NumberOfStates);
+
+    StateFunction stateFunction = stateFunctionFor(m_nextState);
+    ASSERT(stateFunction);
 
 #ifndef NDEBUG
-        m_stateAuditTrail[m_nextStateAuditEntry] = m_nextState;
-        m_nextStateAuditEntry = (m_nextStateAuditEntry + 1) % s_sizeOfStateAuditTrail;
+    m_stateAuditTrail[m_nextStateAuditEntry] = m_nextState;
+    m_nextStateAuditEntry = (m_nextStateAuditEntry + 1) % s_sizeOfStateAuditTrail;
 #endif
-        m_nextState = (static_cast<T*>(this)->*stateFunction)();
-    }
+
+    (static_cast<T*>(this)->*stateFunction)();
+    m_nextState = SQLTransactionState::Idle;
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
-
-#endif // SQLTransactionStateMachine_h