Merge WebKit r47420

1 files changed, 3 insertions, 0 deletions

diff --git a/WebCore/storage/SQLTransaction.h b/WebCore/storage/SQLTransaction.h
index e77c183..141cef7 100644
--- a/WebCore/storage/SQLTransaction.h
+++ b/WebCore/storage/SQLTransaction.h
@@ -73,6 +73,7 @@ public:
     void executeSQL(const String& sqlStatement, const Vector<SQLValue>& arguments, 
                     PassRefPtr<SQLStatementCallback> callback, PassRefPtr<SQLStatementErrorCallback> callbackError, ExceptionCode& e);
                                         
+    void lockAcquired();
     bool performNextStep();
     void performPendingCallback();
     
@@ -88,6 +89,7 @@ private:
     
     void checkAndHandleClosedDatabase();
     
+    void acquireLock();
     void openTransactionAndPreflight();
     void deliverTransactionCallback();
     void scheduleToRunStatements();
@@ -120,6 +122,7 @@ private:
     RefPtr<SQLError> m_transactionError;
     bool m_shouldRetryCurrentStatement;
     bool m_modifiedDatabase;
+    bool m_lockAcquired;
     
     Mutex m_statementMutex;
     Deque<RefPtr<SQLStatement> > m_statementQueue;