From 41386e9cb918eed93b3f13648cbef387e371e451 Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Wed, 20 May 2015 09:56:07 +0000
Subject: webkitgtk-2.4.9

---
 .../Modules/webdatabase/SQLTransactionClient.cpp        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp')

diff --git a/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp b/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp
index 9b86c99c3..938153eec 100644
--- a/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp
+++ b/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp
@@ -31,8 +31,10 @@
 #include "config.h"
 #include "SQLTransactionClient.h"
 
-#include "Database.h"
-#include "DatabaseContext.h"
+#if ENABLE(SQL_DATABASE)
+
+#include "DatabaseBackendBase.h"
+#include "DatabaseBackendContext.h"
 #include "DatabaseManager.h"
 #include "DatabaseTracker.h"
 #include "ScriptExecutionContext.h"
@@ -40,20 +42,21 @@
 
 namespace WebCore {
 
-void SQLTransactionClient::didCommitWriteTransaction(Database* database)
+void SQLTransactionClient::didCommitWriteTransaction(DatabaseBackendBase* database)
 {
     DatabaseTracker::tracker().scheduleNotifyDatabaseChanged(
         database->securityOrigin(), database->stringIdentifier());
 }
 
-bool SQLTransactionClient::didExceedQuota(Database* database)
+bool SQLTransactionClient::didExceedQuota(DatabaseBackendBase* database)
 {
     ASSERT(database->databaseContext()->scriptExecutionContext()->isContextThread());
-    auto& databaseManager = DatabaseManager::singleton();
-    unsigned long long currentQuota = databaseManager.quotaForOrigin(database->securityOrigin());
+    unsigned long long currentQuota = DatabaseManager::manager().quotaForOrigin(database->securityOrigin());
     database->databaseContext()->databaseExceededQuota(database->stringIdentifier(), database->details());
-    unsigned long long newQuota = databaseManager.quotaForOrigin(database->securityOrigin());
+    unsigned long long newQuota = DatabaseManager::manager().quotaForOrigin(database->securityOrigin());
     return (newQuota > currentQuota);
 }
 
 }
+
+#endif // ENABLE(SQL_DATABASE)
-- 
cgit v1.2.1