Changeset 143489 in webkit

Timestamp:

Feb 20, 2013 1:10:18 PM (11 years ago)

Author:

mark.lam@apple.com

Message:

Cleanup the SQLTransaction and SQLTransactionBackend state dispatch
to only honor a state transition request if the associated database
hasn't been interrupted.
​https://bugs.webkit.org/show_bug.cgi?id=110247.

Reviewed by Antti Koivisto.

No new tests.

• Modules/webdatabase/SQLTransaction.cpp:

(WebCore::SQLTransaction::performPendingCallback):
(WebCore::SQLTransaction::computeNextStateAndCleanupIfNeeded):

• Modules/webdatabase/SQLTransaction.h:
• Modules/webdatabase/SQLTransactionBackend.cpp:

(WebCore::SQLTransactionBackend::computeNextStateAndCleanupIfNeeded):
(WebCore::SQLTransactionBackend::performNextStep):

• Modules/webdatabase/SQLTransactionBackend.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webdatabase/SQLTransaction.cpp (modified) (2 diffs)
• Modules/webdatabase/SQLTransaction.h (modified) (2 diffs)
• Modules/webdatabase/SQLTransactionBackend.cpp (modified) (3 diffs)
• Modules/webdatabase/SQLTransactionBackend.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-20  Mark Lam  <mark.lam@apple.com>
+
+        Cleanup the SQLTransaction and SQLTransactionBackend state dispatch
+        to only honor a state transition request if the associated database
+        hasn't been interrupted.
+        https://bugs.webkit.org/show_bug.cgi?id=110247.
+
+        Reviewed by Antti Koivisto.
+
+        No new tests.
+
+        * Modules/webdatabase/SQLTransaction.cpp:
+        (WebCore::SQLTransaction::performPendingCallback):
+        (WebCore::SQLTransaction::computeNextStateAndCleanupIfNeeded):
+        * Modules/webdatabase/SQLTransaction.h:
+        * Modules/webdatabase/SQLTransactionBackend.cpp:
+        (WebCore::SQLTransactionBackend::computeNextStateAndCleanupIfNeeded):
+        (WebCore::SQLTransactionBackend::performNextStep):
+        * Modules/webdatabase/SQLTransactionBackend.h:
+
 2013-02-20  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp

@@ -248 +248 @@
 void SQLTransaction::performPendingCallback()
 {
-    LOG(StorageAPI, "Callback %s\n", nameForSQLTransactionState(m_nextState));
-
-    setStateToRequestedState();
-    ASSERT(m_nextState == SQLTransactionState::End
-        || m_nextState == SQLTransactionState::DeliverTransactionCallback
-        || m_nextState == SQLTransactionState::DeliverTransactionErrorCallback
-        || m_nextState == SQLTransactionState::DeliverStatementCallback
-        || m_nextState == SQLTransactionState::DeliverQuotaIncreaseCallback
-        || m_nextState == SQLTransactionState::DeliverSuccessCallback);
-
-    checkAndHandleClosedOrInterruptedDatabase();
+    computeNextStateAndCleanupIfNeeded();
     runStateMachine();
 }
@@ -279 +269 @@
 }
 
-bool SQLTransaction::checkAndHandleClosedOrInterruptedDatabase()
-{
-    if (m_database->opened() && !m_database->isInterrupted())
+bool SQLTransaction::computeNextStateAndCleanupIfNeeded()
+{
+    // Only honor the requested state transition if we're not supposed to be
+    // cleaning up and shutting down:
+    if (m_database->opened() && !m_database->isInterrupted()) {
+        setStateToRequestedState();
+        ASSERT(m_nextState == SQLTransactionState::End
+            || m_nextState == SQLTransactionState::DeliverTransactionCallback
+            || m_nextState == SQLTransactionState::DeliverTransactionErrorCallback
+            || m_nextState == SQLTransactionState::DeliverStatementCallback
+            || m_nextState == SQLTransactionState::DeliverQuotaIncreaseCallback
+            || m_nextState == SQLTransactionState::DeliverSuccessCallback);
+
+        LOG(StorageAPI, "Callback %s\n", nameForSQLTransactionState(m_nextState));
         return false;
+    }
 
     clearCallbackWrappers();

trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h

@@ -69 +69 @@
         bool readOnly);
 
-    bool checkAndHandleClosedOrInterruptedDatabase();
     void clearCallbackWrappers();
 
@@ -81 +80 @@
     // State Machine functions:
     virtual StateFunction stateFunctionFor(SQLTransactionState) OVERRIDE;
+    bool computeNextStateAndCleanupIfNeeded();
 
     // State functions:

trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp

@@ -466 +466 @@
 }
 
-void SQLTransactionBackend::checkAndHandleClosedOrInterruptedDatabase()
-{
-    if (m_database->opened() && !m_database->isInterrupted())
+void SQLTransactionBackend::computeNextStateAndCleanupIfNeeded()
+{
+    // Only honor the requested state transition if we're not supposed to be
+    // cleaning up and shutting down:
+    if (m_database->opened() && !m_database->isInterrupted()) {
+        setStateToRequestedState();
+        ASSERT(m_nextState == SQLTransactionState::AcquireLock
+            || m_nextState == SQLTransactionState::OpenTransactionAndPreflight
+            || m_nextState == SQLTransactionState::RunStatements
+            || m_nextState == SQLTransactionState::PostflightAndCommit
+            || m_nextState == SQLTransactionState::CleanupAndTerminate
+            || m_nextState == SQLTransactionState::CleanupAfterTransactionErrorCallback);
+
+        LOG(StorageAPI, "State %s\n", nameForSQLTransactionState(m_nextState));
         return;
+    }
+
+    if (m_nextState == SQLTransactionState::End)
+        return;
+    m_nextState = SQLTransactionState::End;
 
     // If the database was stopped, don't do anything and cancel queued work
@@ -481 +497 @@
 
     // Terminate the frontend state machine. This also gets the frontend to
-    // call checkAndHandleClosedOrInterruptedDatabase() and clear its wrappers
+    // call computeNextStateAndCleanupIfNeeded() and clear its wrappers
     // if needed.
     m_frontend->requestTransitToState(SQLTransactionState::End);
@@ -487 +503 @@
     // Redirect to the end state to abort, clean up, and end the transaction.
     doCleanup();
-    m_nextState = SQLTransactionState::End;
 }
 
 void SQLTransactionBackend::performNextStep()
 {
-    LOG(StorageAPI, "State %s\n", nameForSQLTransactionState(m_nextState));
-
-    setStateToRequestedState();
-    ASSERT(m_nextState == SQLTransactionState::AcquireLock
-        || m_nextState == SQLTransactionState::OpenTransactionAndPreflight
-        || m_nextState == SQLTransactionState::RunStatements
-        || m_nextState == SQLTransactionState::PostflightAndCommit
-        || m_nextState == SQLTransactionState::CleanupAndTerminate
-        || m_nextState == SQLTransactionState::CleanupAfterTransactionErrorCallback);
-
-    checkAndHandleClosedOrInterruptedDatabase();
+    computeNextStateAndCleanupIfNeeded();
     runStateMachine();
 }

trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h

@@ -88 +88 @@
     void enqueueStatementBackend(PassRefPtr<SQLStatementBackend>);
 
-    void checkAndHandleClosedOrInterruptedDatabase();
-
     // State Machine functions:
     virtual StateFunction stateFunctionFor(SQLTransactionState) OVERRIDE;
+    void computeNextStateAndCleanupIfNeeded();
 
     // State functions: