diff options
Diffstat (limited to 'Source/WebCore/platform/sql')
6 files changed, 19 insertions, 16 deletions
diff --git a/Source/WebCore/platform/sql/SQLiteDatabase.h b/Source/WebCore/platform/sql/SQLiteDatabase.h index c329273..da53acc 100644 --- a/Source/WebCore/platform/sql/SQLiteDatabase.h +++ b/Source/WebCore/platform/sql/SQLiteDatabase.h @@ -50,7 +50,8 @@ extern const int SQLResultSchema; extern const int SQLResultFull; extern const int SQLResultInterrupt; -class SQLiteDatabase : public Noncopyable { +class SQLiteDatabase { + WTF_MAKE_NONCOPYABLE(SQLiteDatabase); friend class SQLiteTransaction; public: SQLiteDatabase(); diff --git a/Source/WebCore/platform/sql/SQLiteStatement.h b/Source/WebCore/platform/sql/SQLiteStatement.h index 1444f0e..fd1abfb 100644 --- a/Source/WebCore/platform/sql/SQLiteStatement.h +++ b/Source/WebCore/platform/sql/SQLiteStatement.h @@ -34,7 +34,8 @@ namespace WebCore { class SQLValue; -class SQLiteStatement : public Noncopyable { +class SQLiteStatement { + WTF_MAKE_NONCOPYABLE(SQLiteStatement); WTF_MAKE_FAST_ALLOCATED; public: SQLiteStatement(SQLiteDatabase&, const String&); ~SQLiteStatement(); diff --git a/Source/WebCore/platform/sql/SQLiteTransaction.h b/Source/WebCore/platform/sql/SQLiteTransaction.h index 924241f..ba686ba 100644 --- a/Source/WebCore/platform/sql/SQLiteTransaction.h +++ b/Source/WebCore/platform/sql/SQLiteTransaction.h @@ -26,14 +26,15 @@ #ifndef SQLiteTransaction_h #define SQLiteTransaction_h +#include <wtf/FastAllocBase.h> #include <wtf/Noncopyable.h> namespace WebCore { class SQLiteDatabase; -class SQLiteTransaction : public Noncopyable -{ +class SQLiteTransaction { + WTF_MAKE_NONCOPYABLE(SQLiteTransaction); WTF_MAKE_FAST_ALLOCATED; public: SQLiteTransaction(SQLiteDatabase& db, bool readOnly = false); ~SQLiteTransaction(); diff --git a/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromium.cpp b/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromium.cpp index 0a09888..b79eb1a 100644 --- a/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromium.cpp +++ b/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromium.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "SQLiteFileSystem.h" -#include "ChromiumBridge.h" +#include "PlatformBridge.h" #include "SQLiteDatabase.h" #include <sqlite3.h> #include <wtf/text/CString.h> @@ -92,12 +92,12 @@ bool SQLiteFileSystem::deleteEmptyDatabaseDirectory(const String&) bool SQLiteFileSystem::deleteDatabaseFile(const String& fileName) { - return (ChromiumBridge::databaseDeleteFile(fileName) == SQLITE_OK); + return (PlatformBridge::databaseDeleteFile(fileName) == SQLITE_OK); } long long SQLiteFileSystem::getDatabaseFileSize(const String& fileName) { - return ChromiumBridge::databaseGetFileSize(fileName); + return PlatformBridge::databaseGetFileSize(fileName); } } // namespace WebCore diff --git a/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp b/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp index 1102df5..37f96be 100644 --- a/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp +++ b/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "SQLiteFileSystem.h" -#include "ChromiumBridge.h" +#include "PlatformBridge.h" #include <sqlite3.h> #include <errno.h> @@ -996,10 +996,10 @@ static int chromiumOpen(sqlite3_vfs* vfs, const char* fileName, } if (fd < 0) { - fd = ChromiumBridge::databaseOpenFile(fileName, desiredFlags); + fd = PlatformBridge::databaseOpenFile(fileName, desiredFlags); if ((fd < 0) && (desiredFlags & SQLITE_OPEN_READWRITE)) { int newFlags = (desiredFlags & ~(SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)) | SQLITE_OPEN_READONLY; - fd = ChromiumBridge::databaseOpenFile(fileName, newFlags); + fd = PlatformBridge::databaseOpenFile(fileName, newFlags); } } if (fd < 0) { @@ -1031,7 +1031,7 @@ static int chromiumOpen(sqlite3_vfs* vfs, const char* fileName, // should be synched after the file is deleted. static int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir) { - return ChromiumBridge::databaseDeleteFile(fileName, syncDir); + return PlatformBridge::databaseDeleteFile(fileName, syncDir); } // Check the existance and status of the given file. @@ -1042,7 +1042,7 @@ static int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir) // res - the result. static int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res) { - int attr = static_cast<int>(ChromiumBridge::databaseGetFileAttributes(fileName)); + int attr = static_cast<int>(PlatformBridge::databaseGetFileAttributes(fileName)); if (attr < 0) { *res = 0; return SQLITE_OK; diff --git a/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp b/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp index d846af7..47e01d0 100644 --- a/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp +++ b/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "SQLiteFileSystem.h" -#include "ChromiumBridge.h" +#include "PlatformBridge.h" #include <sqlite3.h> #include <windows.h> @@ -55,7 +55,7 @@ namespace { int chromiumOpen(sqlite3_vfs*, const char* fileName, sqlite3_file* id, int desiredFlags, int* usedFlags) { - HANDLE h = ChromiumBridge::databaseOpenFile(fileName, desiredFlags); + HANDLE h = PlatformBridge::databaseOpenFile(fileName, desiredFlags); if (h == INVALID_HANDLE_VALUE) { if (desiredFlags & SQLITE_OPEN_READWRITE) { int newFlags = (desiredFlags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE; @@ -82,7 +82,7 @@ int chromiumOpen(sqlite3_vfs*, const char* fileName, // should be synched after the file is deleted. int chromiumDelete(sqlite3_vfs*, const char* fileName, int) { - return ChromiumBridge::databaseDeleteFile(fileName); + return PlatformBridge::databaseDeleteFile(fileName); } // Check the existance and status of the given file. @@ -93,7 +93,7 @@ int chromiumDelete(sqlite3_vfs*, const char* fileName, int) // res - the result. int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res) { - DWORD attr = ChromiumBridge::databaseGetFileAttributes(fileName); + DWORD attr = PlatformBridge::databaseGetFileAttributes(fileName); switch (flag) { case SQLITE_ACCESS_READ: case SQLITE_ACCESS_EXISTS: |