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

[WebKit-https.git] / Source / WebCore / loader / appcache / ApplicationCacheStorage.cpp

diff --git a/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp b/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp
index b66fb8f..40553ec 100644 (file)
--- a/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp
+++ b/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp
@@ -31,21 +31,18 @@
 #include "ApplicationCacheHost.h"
 #include "ApplicationCacheResource.h"
 #include "FileSystem.h"
-#include "URL.h"
 #include "NotImplemented.h"
+#include "SQLiteDatabaseTracker.h"
 #include "SQLiteStatement.h"
 #include "SQLiteTransaction.h"
 #include "SecurityOrigin.h"
+#include "URL.h"
 #include "UUID.h"
-#include <wtf/text/CString.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/StringExtras.h>
+#include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
-#if PLATFORM(IOS)
-#include "SQLiteDatabaseTracker.h"
-#endif
-
 namespace WebCore {
 
 static const char flatFileSubdirectory[] = "ApplicationCache";
@@ -104,10 +101,8 @@ static unsigned urlHostHash(const URL& url)
 
 ApplicationCacheGroup* ApplicationCacheStorage::loadCacheGroup(const URL& manifestURL)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     openDatabase(false);
     if (!m_database.isOpen())
         return 0;
@@ -182,10 +177,8 @@ void ApplicationCacheStorage::loadManifestHostHashes()
     // to avoid trying to open the database over and over if it doesn't exist.
     hasLoadedHashes = true;
     
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     openDatabase(false);
     if (!m_database.isOpen())
         return;
@@ -229,10 +222,7 @@ ApplicationCacheGroup* ApplicationCacheStorage::cacheGroupForURL(const URL& url)
     if (!m_database.isOpen())
         return 0;
         
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
 
     // Check the database. Look for all cache groups with a newest cache.
     SQLiteStatement statement(m_database, "SELECT id, manifestURL, newestCache FROM CacheGroups WHERE newestCache IS NOT NULL");
@@ -280,10 +270,8 @@ ApplicationCacheGroup* ApplicationCacheStorage::cacheGroupForURL(const URL& url)
 
 ApplicationCacheGroup* ApplicationCacheStorage::fallbackCacheGroupForURL(const URL& url)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     ASSERT(!url.hasFragmentIdentifier());
 
     // Check if an appropriate cache already exists in memory.
@@ -455,10 +443,8 @@ void ApplicationCacheStorage::setDefaultOriginQuota(int64_t quota)
 
 bool ApplicationCacheStorage::calculateQuotaForOrigin(const SecurityOrigin* origin, int64_t& quota)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     // If an Origin record doesn't exist, then the COUNT will be 0 and quota will be 0.
     // Using the count to determine if a record existed or not is a safe way to determine
     // if a quota of 0 is real, from the record, or from null.
@@ -482,10 +468,8 @@ bool ApplicationCacheStorage::calculateQuotaForOrigin(const SecurityOrigin* orig
 
 bool ApplicationCacheStorage::calculateUsageForOrigin(const SecurityOrigin* origin, int64_t& usage)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     // If an Origins record doesn't exist, then the SUM will be null,
     // which will become 0, as expected, when converting to a number.
     SQLiteStatement statement(m_database, "SELECT SUM(Caches.size)"
@@ -510,10 +494,8 @@ bool ApplicationCacheStorage::calculateUsageForOrigin(const SecurityOrigin* orig
 
 bool ApplicationCacheStorage::calculateRemainingSizeForOriginExcludingCache(const SecurityOrigin* origin, ApplicationCache* cache, int64_t& remainingSize)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     openDatabase(false);
     if (!m_database.isOpen())
         return false;
@@ -563,10 +545,8 @@ bool ApplicationCacheStorage::calculateRemainingSizeForOriginExcludingCache(cons
 
 bool ApplicationCacheStorage::storeUpdatedQuotaForOrigin(const SecurityOrigin* origin, int64_t quota)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     openDatabase(true);
     if (!m_database.isOpen())
         return false;
@@ -633,10 +613,8 @@ void ApplicationCacheStorage::verifySchemaVersion()
     
 void ApplicationCacheStorage::openDatabase(bool createIfDoesNotExist)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     if (m_database.isOpen())
         return;
 
@@ -950,10 +928,8 @@ bool ApplicationCacheStorage::store(ApplicationCacheResource* resource, unsigned
 
 bool ApplicationCacheStorage::storeUpdatedType(ApplicationCacheResource* resource, ApplicationCache* cache)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     ASSERT_UNUSED(cache, cache->storageID());
     ASSERT(resource->storageID());
 
@@ -970,10 +946,8 @@ bool ApplicationCacheStorage::storeUpdatedType(ApplicationCacheResource* resourc
 
 bool ApplicationCacheStorage::store(ApplicationCacheResource* resource, ApplicationCache* cache)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     ASSERT(cache->storageID());
     
     openDatabase(true);
@@ -1270,10 +1244,8 @@ PassRefPtr<ApplicationCache> ApplicationCacheStorage::loadCache(unsigned storage
     
 void ApplicationCacheStorage::remove(ApplicationCache* cache)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     if (!cache->storageID())
         return;
     
@@ -1311,10 +1283,8 @@ void ApplicationCacheStorage::remove(ApplicationCache* cache)
 
 void ApplicationCacheStorage::empty()
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     openDatabase(false);
     
     if (!m_database.isOpen())
@@ -1379,10 +1349,8 @@ bool ApplicationCacheStorage::writeDataToUniqueFileInDirectory(SharedBuffer* dat
 
 bool ApplicationCacheStorage::storeCopyOfCache(const String& cacheDirectory, ApplicationCacheHost* cacheHost)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     ApplicationCache* cache = cacheHost->applicationCache();
     if (!cache)
         return true;
@@ -1419,10 +1387,8 @@ bool ApplicationCacheStorage::storeCopyOfCache(const String& cacheDirectory, App
 
 bool ApplicationCacheStorage::manifestURLs(Vector<URL>* urls)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     ASSERT(urls);
     openDatabase(false);
     if (!m_database.isOpen())
@@ -1441,10 +1407,8 @@ bool ApplicationCacheStorage::manifestURLs(Vector<URL>* urls)
 
 bool ApplicationCacheStorage::cacheGroupSize(const String& manifestURL, int64_t* size)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     ASSERT(size);
     openDatabase(false);
     if (!m_database.isOpen())
@@ -1471,10 +1435,8 @@ bool ApplicationCacheStorage::cacheGroupSize(const String& manifestURL, int64_t*
 
 bool ApplicationCacheStorage::deleteCacheGroup(const String& manifestURL)
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     SQLiteTransaction deleteTransaction(m_database);
     // Check to see if the group is in memory.
     ApplicationCacheGroup* group = m_cachesInMemory.get(manifestURL);
@@ -1526,10 +1488,8 @@ bool ApplicationCacheStorage::deleteCacheGroup(const String& manifestURL)
 
 void ApplicationCacheStorage::vacuumDatabaseFile()
 {
-#if PLATFORM(IOS)
-    // FIXME: Move the PLATFORM(IOS)-guards inside the constructor and destructor of SQLiteTransactionInProgressAutoCounter.
     SQLiteTransactionInProgressAutoCounter transactionCounter;
-#endif
+
     openDatabase(false);
     if (!m_database.isOpen())
         return;