Remove some iOS #ifdefs by adding SQLiteDatabaseTracker to all the builds

[WebKit-https.git] / Source / WebCore / storage / StorageTracker.cpp

diff --git a/Source/WebCore/storage/StorageTracker.cpp b/Source/WebCore/storage/StorageTracker.cpp
index 976dcda..dc236c3 100644 (file)
--- a/Source/WebCore/storage/StorageTracker.cpp
+++ b/Source/WebCore/storage/StorageTracker.cpp
@@ -28,12 +28,13 @@
 
 #include "DatabaseThread.h"
 #include "FileSystem.h"
-#include "StorageThread.h"
 #include "Logging.h"
 #include "PageGroup.h"
+#include "SQLiteDatabaseTracker.h"
 #include "SQLiteFileSystem.h"
 #include "SQLiteStatement.h"
 #include "SecurityOrigin.h"
+#include "StorageThread.h"
 #include "StorageTrackerClient.h"
 #include "TextEncoding.h"
 #include <wtf/Functional.h>
@@ -42,10 +43,6 @@
 #include <wtf/Vector.h>
 #include <wtf/text/CString.h>
 
-#if PLATFORM(IOS)
-#include "SQLiteDatabaseTracker.h"
-#endif
-
 namespace WebCore {
 
 static StorageTracker* storageTracker = 0;
@@ -136,9 +133,9 @@ void StorageTracker::openTrackerDatabase(bool createIfDoesNotExist)
 {
     ASSERT(m_isActive);
     ASSERT(!isMainThread());
-#if PLATFORM(IOS)
+
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     ASSERT(!m_databaseMutex.tryLock());
 
     if (m_database.isOpen())
@@ -199,9 +196,8 @@ void StorageTracker::syncImportOriginIdentifiers()
         openTrackerDatabase(false);
 
         if (m_database.isOpen()) {
-#if PLATFORM(IOS)
             SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
             SQLiteStatement statement(m_database, "SELECT origin FROM Origins");
             if (statement.prepare() != SQLResultOk) {
                 LOG_ERROR("Failed to prepare statement.");
@@ -242,9 +238,9 @@ void StorageTracker::syncImportOriginIdentifiers()
 void StorageTracker::syncFileSystemAndTrackerDatabase()
 {
     ASSERT(!isMainThread());
-#if PLATFORM(IOS)
+
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     ASSERT(m_isActive);
 
     Vector<String> paths;
@@ -317,9 +313,8 @@ void StorageTracker::setOriginDetails(const String& originIdentifier, const Stri
 void StorageTracker::syncSetOriginDetails(const String& originIdentifier, const String& databaseFile)
 {
     ASSERT(!isMainThread());
-#if PLATFORM(IOS)
+
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
 
     MutexLocker locker(m_databaseMutex);
 
@@ -389,9 +384,8 @@ void StorageTracker::deleteAllOrigins()
 void StorageTracker::syncDeleteAllOrigins()
 {
     ASSERT(!isMainThread());
-#if PLATFORM(IOS)
+
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
     
     MutexLocker locker(m_databaseMutex);
     
@@ -486,9 +480,8 @@ void StorageTracker::deleteOrigin(SecurityOrigin* origin)
 void StorageTracker::syncDeleteOrigin(const String& originIdentifier)
 {
     ASSERT(!isMainThread());
-#if PLATFORM(IOS)
+
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
 
     MutexLocker locker(m_databaseMutex);
     
@@ -601,9 +594,7 @@ String StorageTracker::databasePathForOrigin(const String& originIdentifier)
     if (!m_database.isOpen())
         return String();
 
-#if PLATFORM(IOS)
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
 
     SQLiteStatement pathStatement(m_database, "SELECT path FROM Origins WHERE origin=?");
     if (pathStatement.prepare() != SQLResultOk) {