Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234

1 files changed, 18 insertions, 5 deletions

diff --git a/WebCore/storage/DatabaseTracker.cpp b/WebCore/storage/DatabaseTracker.cpp
index 8e2e3f3..752dbe6 100644
--- a/WebCore/storage/DatabaseTracker.cpp
+++ b/WebCore/storage/DatabaseTracker.cpp
@@ -57,15 +57,30 @@ static WebCore::OriginQuotaManager& originQuotaManager()
 
 namespace WebCore {
 
+static DatabaseTracker* staticTracker = 0;
+
+void DatabaseTracker::initializeTracker(const String& databasePath)
+{
+    ASSERT(!staticTracker);
+    if (staticTracker)
+        return;
+
+    staticTracker = new DatabaseTracker(databasePath);
+}
+
 DatabaseTracker& DatabaseTracker::tracker()
 {
-    DEFINE_STATIC_LOCAL(DatabaseTracker, tracker, ());
-    return tracker;
+    if (!staticTracker)
+        staticTracker = new DatabaseTracker("");
+
+    return *staticTracker;
 }
 
-DatabaseTracker::DatabaseTracker()
+DatabaseTracker::DatabaseTracker(const String& databasePath)
     : m_client(0)
 {
+    setDatabaseDirectoryPath(databasePath);
+    
     SQLiteFileSystem::registerSQLiteVFS();
 
     MutexLocker lockDatabase(m_databaseGuard);
@@ -126,7 +141,6 @@ bool DatabaseTracker::canEstablishDatabase(ScriptExecutionContext* context, cons
     ProposedDatabase details;
 
     unsigned long long requirement;
-    unsigned long long tempUsage;
     {
         MutexLocker lockDatabase(m_databaseGuard);
         Locker<OriginQuotaManager> quotaManagerLocker(originQuotaManager());
@@ -146,7 +160,6 @@ bool DatabaseTracker::canEstablishDatabase(ScriptExecutionContext* context, cons
 
         // If the database will fit, allow its creation.
         requirement = usage + max(1UL, estimatedSize);
-        tempUsage = usage;
         if (requirement < usage) {
             doneCreatingDatabase(origin, name);
             return false; // If the estimated size is so big it causes an overflow, don't allow creation.