From 0e63d050c60fb84ec8c48da1977d44d4b2741626 Mon Sep 17 00:00:00 2001 From: "weinig@apple.com" Date: Sun, 26 Jan 2014 00:50:21 +0000 Subject: [PATCH] Remove more unnecessary #if PLATFORM(IOS)s in ApplicationCacheStorage.cpp https://bugs.webkit.org/show_bug.cgi?id=127635 Reviewed by Antti Koivisto. * loader/appcache/ApplicationCacheStorage.cpp: (WebCore::ApplicationCacheStorage::executeSQLCommand): (WebCore::ApplicationCacheStorage::verifySchemaVersion): (WebCore::ApplicationCacheStorage::executeStatement): (WebCore::ApplicationCacheStorage::store): (WebCore::ApplicationCacheStorage::ensureOriginRecord): (WebCore::ApplicationCacheStorage::loadCache): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162789 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 15 +++++++++++++++ .../loader/appcache/ApplicationCacheStorage.cpp | 19 ++----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index d24120b..aea1015 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,5 +1,20 @@ 2014-01-25 Sam Weinig + Remove more unnecessary #if PLATFORM(IOS)s in ApplicationCacheStorage.cpp + https://bugs.webkit.org/show_bug.cgi?id=127635 + + Reviewed by Antti Koivisto. + + * loader/appcache/ApplicationCacheStorage.cpp: + (WebCore::ApplicationCacheStorage::executeSQLCommand): + (WebCore::ApplicationCacheStorage::verifySchemaVersion): + (WebCore::ApplicationCacheStorage::executeStatement): + (WebCore::ApplicationCacheStorage::store): + (WebCore::ApplicationCacheStorage::ensureOriginRecord): + (WebCore::ApplicationCacheStorage::loadCache): + +2014-01-25 Sam Weinig + Remove some iOS #ifdefs by adding SQLiteDatabaseTracker to all the builds https://bugs.webkit.org/show_bug.cgi?id=127632 diff --git a/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp b/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp index 40553ec..b82853a 100644 --- a/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp +++ b/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp @@ -566,9 +566,7 @@ bool ApplicationCacheStorage::storeUpdatedQuotaForOrigin(const SecurityOrigin* o bool ApplicationCacheStorage::executeSQLCommand(const String& sql) { -#if PLATFORM(IOS) ASSERT(SQLiteDatabaseTracker::hasTransactionInProgress()); -#endif ASSERT(m_database.isOpen()); bool result = m_database.executeCommand(sql); @@ -586,9 +584,8 @@ static const int schemaVersion = 7; void ApplicationCacheStorage::verifySchemaVersion() { -#if PLATFORM(IOS) ASSERT(SQLiteDatabaseTracker::hasTransactionInProgress()); -#endif + int version = SQLiteStatement(m_database, "PRAGMA user_version").getColumnInt(0); if (version == schemaVersion) return; @@ -682,9 +679,7 @@ void ApplicationCacheStorage::openDatabase(bool createIfDoesNotExist) bool ApplicationCacheStorage::executeStatement(SQLiteStatement& statement) { -#if PLATFORM(IOS) ASSERT(SQLiteDatabaseTracker::hasTransactionInProgress()); -#endif bool result = statement.executeCommand(); if (!result) LOG_ERROR("Application Cache Storage: failed to execute statement \"%s\" error \"%s\"", @@ -695,9 +690,7 @@ bool ApplicationCacheStorage::executeStatement(SQLiteStatement& statement) bool ApplicationCacheStorage::store(ApplicationCacheGroup* group, GroupStorageIDJournal* journal) { -#if PLATFORM(IOS) ASSERT(SQLiteDatabaseTracker::hasTransactionInProgress()); -#endif ASSERT(group->storageID() == 0); ASSERT(journal); @@ -724,9 +717,7 @@ bool ApplicationCacheStorage::store(ApplicationCacheGroup* group, GroupStorageID bool ApplicationCacheStorage::store(ApplicationCache* cache, ResourceStorageIDJournal* storageIDJournal) { -#if PLATFORM(IOS) ASSERT(SQLiteDatabaseTracker::hasTransactionInProgress()); -#endif ASSERT(cache->storageID() == 0); ASSERT(cache->group()->storageID() != 0); ASSERT(storageIDJournal); @@ -808,9 +799,7 @@ bool ApplicationCacheStorage::store(ApplicationCache* cache, ResourceStorageIDJo bool ApplicationCacheStorage::store(ApplicationCacheResource* resource, unsigned cacheStorageID) { -#if PLATFORM(IOS) ASSERT(SQLiteDatabaseTracker::hasTransactionInProgress()); -#endif ASSERT(cacheStorageID); ASSERT(!resource->storageID()); @@ -983,9 +972,7 @@ bool ApplicationCacheStorage::store(ApplicationCacheResource* resource, Applicat bool ApplicationCacheStorage::ensureOriginRecord(const SecurityOrigin* origin) { -#if PLATFORM(IOS) ASSERT(SQLiteDatabaseTracker::hasTransactionInProgress()); -#endif SQLiteStatement insertOriginStatement(m_database, "INSERT INTO Origins (origin, quota) VALUES (?, ?)"); if (insertOriginStatement.prepare() != SQLResultOk) return false; @@ -1133,10 +1120,8 @@ static inline void parseHeaders(const String& headers, ResourceResponse& respons PassRefPtr ApplicationCacheStorage::loadCache(unsigned storageID) { -#if PLATFORM(IOS) ASSERT(SQLiteDatabaseTracker::hasTransactionInProgress()); -#endif - SQLiteStatement cacheStatement(m_database, + SQLiteStatement cacheStatement(m_database, "SELECT url, statusCode, type, mimeType, textEncodingName, headers, CacheResourceData.data, CacheResourceData.path FROM CacheEntries INNER JOIN CacheResources ON CacheEntries.resource=CacheResources.id " "INNER JOIN CacheResourceData ON CacheResourceData.id=CacheResources.data WHERE CacheEntries.cache=?"); if (cacheStatement.prepare() != SQLResultOk) { -- 1.8.3.1