webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 13 insertions, 14 deletions

diff --git a/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h b/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h
index b3544aa98..fff11a8ce 100644
--- a/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h
+++ b/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h
@@ -26,6 +26,8 @@
 #ifndef SQLTransactionStateMachine_h
 #define SQLTransactionStateMachine_h
 
+#if ENABLE(SQL_DATABASE)
+
 #include "SQLTransactionState.h"
 #include <wtf/ThreadSafeRefCounted.h>
 
@@ -39,7 +41,7 @@ public:
 protected:
     SQLTransactionStateMachine();
 
-    typedef void (T::*StateFunction)();
+    typedef SQLTransactionState (T::* StateFunction)();
     virtual StateFunction stateFunctionFor(SQLTransactionState) = 0;
 
     void setStateToRequestedState();
@@ -90,24 +92,21 @@ template<typename T>
 void SQLTransactionStateMachine<T>::runStateMachine()
 {
     ASSERT(SQLTransactionState::End < SQLTransactionState::Idle);
-
-    if (m_nextState <= SQLTransactionState::Idle)
-        return;
-
-    ASSERT(m_nextState < SQLTransactionState::NumberOfStates);
-
-    StateFunction stateFunction = stateFunctionFor(m_nextState);
-    ASSERT(stateFunction);
+    while (m_nextState > SQLTransactionState::Idle) {
+        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
-
-    (static_cast<T*>(this)->*stateFunction)();
-    m_nextState = SQLTransactionState::Idle;
+        m_nextState = (static_cast<T*>(this)->*stateFunction)();
+    }
 }
 
 } // namespace WebCore
 
+#endif // ENABLE(SQL_DATABASE)
+
 #endif // SQLTransactionStateMachine_h