diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp')
| -rw-r--r-- | WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp index b357d4a..153793b 100644 --- a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp +++ b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp @@ -35,6 +35,8 @@ #include <sqlite3.h> #include <windows.h> +using namespace WebCore; + // Defined in Chromium's codebase in third_party/sqlite/src/os_win.c extern "C" { int chromium_sqlite3_initialize_win_sqlite3_file(sqlite3_file* file, HANDLE handle); @@ -53,7 +55,7 @@ namespace { int chromiumOpen(sqlite3_vfs*, const char* fileName, sqlite3_file* id, int desiredFlags, int* usedFlags) { - HANDLE h = WebCore::ChromiumBridge::databaseOpenFile(fileName, desiredFlags); + HANDLE h = ChromiumBridge::databaseOpenFile(fileName, desiredFlags); if (h == INVALID_HANDLE_VALUE) { if (desiredFlags & SQLITE_OPEN_READWRITE) { int newFlags = (desiredFlags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE; @@ -80,10 +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) { - bool deleted = WebCore::ChromiumBridge::databaseDeleteFile(fileName); - DWORD rc = WebCore::ChromiumBridge::databaseGetFileAttributes(fileName); - return ((rc == INVALID_FILE_ATTRIBUTES) && deleted ? - SQLITE_OK : SQLITE_IOERR_DELETE); + return ChromiumBridge::databaseDeleteFile(fileName); } // Check the existance and status of the given file. @@ -94,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 = WebCore::ChromiumBridge::databaseGetFileAttributes(fileName); + DWORD attr = ChromiumBridge::databaseGetFileAttributes(fileName); switch (flag) { case SQLITE_ACCESS_READ: case SQLITE_ACCESS_EXISTS: @@ -156,7 +155,7 @@ void SQLiteFileSystem::registerSQLiteVFS() win32_vfs->mxPathname, 0, "chromium_vfs", - 0, + win32_vfs->pAppData, chromiumOpen, chromiumDelete, chromiumAccess, |