webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 7 insertions, 14 deletions

diff --git a/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h b/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h
index ce87e055e..f9c89d812 100644
--- a/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h
+++ b/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h
@@ -29,10 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SQLTransactionCoordinator_h
-#define SQLTransactionCoordinator_h
-
-#if ENABLE(SQL_DATABASE)
+#pragma once
 
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
@@ -42,21 +39,21 @@
 
 namespace WebCore {
 
-class SQLTransactionBackend;
+class SQLTransaction;
 
 class SQLTransactionCoordinator {
     WTF_MAKE_NONCOPYABLE(SQLTransactionCoordinator); WTF_MAKE_FAST_ALLOCATED;
 public:
     SQLTransactionCoordinator();
-    void acquireLock(SQLTransactionBackend*);
-    void releaseLock(SQLTransactionBackend*);
+    void acquireLock(SQLTransaction&);
+    void releaseLock(SQLTransaction&);
     void shutdown();
 private:
-    typedef Deque<RefPtr<SQLTransactionBackend>> TransactionsQueue;
+    typedef Deque<RefPtr<SQLTransaction>> TransactionsQueue;
     struct CoordinationInfo {
         TransactionsQueue pendingTransactions;
-        HashSet<RefPtr<SQLTransactionBackend>> activeReadTransactions;
-        RefPtr<SQLTransactionBackend> activeWriteTransaction;
+        HashSet<RefPtr<SQLTransaction>> activeReadTransactions;
+        RefPtr<SQLTransaction> activeWriteTransaction;
     };
     // Maps database names to information about pending transactions
     typedef HashMap<String, CoordinationInfo> CoordinationInfoMap;
@@ -67,7 +64,3 @@ private:
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
-
-#endif // SQLTransactionCoordinator_h