Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp

Issue 1639863003: [websql] Guard against vfs method deprecation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switch chromiumGetLastError to successfully return an empty buffer. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
diff --git a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
index b8e9c55068d76e77cb09dbd0a23f89ef1b1c40d6..f776d11d69dc3d93286753322b9af912d0ef40df 100644
--- a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
+++ b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
@@ -158,8 +158,9 @@ int chromiumCurrentTime(sqlite3_vfs *vfs, double *prNow)
int chromiumGetLastError(sqlite3_vfs *vfs, int e, char* s)
{
- sqlite3_vfs* wrappedVfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
- return wrappedVfs->xGetLastError(wrappedVfs, e, s);
+ // xGetLastError() has never been used by SQLite. The implementation in os_win.c indicates this is a reasonable implementation.
+ *s = '\0';
+ return 0;
}
} // namespace
@@ -167,6 +168,13 @@ int chromiumGetLastError(sqlite3_vfs *vfs, int e, char* s)
void SQLiteFileSystem::registerSQLiteVFS()
{
sqlite3_vfs* wrappedVfs = sqlite3_vfs_find("win32");
+
+ // These are implemented by delegating to |wrappedVfs|.
+ // TODO(shess): Implement local versions.
+ ASSERT(wrappedVfs->xRandomness);
+ ASSERT(wrappedVfs->xSleep);
+ ASSERT(wrappedVfs->xCurrentTime);
+
static sqlite3_vfs chromium_vfs = {
1,
wrappedVfs->szOsFile,
« no previous file with comments | « third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698