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

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

Issue 2634473002: [websql] Filenames are utf-8, not latin1. (Closed)
Patch Set: final changes? Created 3 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 2933df65f638527c12bcb7a94f963169972adf27..bc4fd2feadb8e6c1cdc040883656c933f22166a0 100644
--- a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
+++ b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
@@ -54,8 +54,8 @@ int chromiumOpen(sqlite3_vfs*,
sqlite3_file* id,
int desiredFlags,
int* usedFlags) {
- HANDLE h =
- Platform::current()->databaseOpenFile(String(fileName), desiredFlags);
+ HANDLE h = Platform::current()->databaseOpenFile(String::fromUTF8(fileName),
+ desiredFlags);
if (h == INVALID_HANDLE_VALUE) {
if (desiredFlags & SQLITE_OPEN_READWRITE) {
int newFlags =
@@ -82,7 +82,8 @@ int chromiumOpen(sqlite3_vfs*,
// syncDir - determines if the directory to which this file belongs
// should be synched after the file is deleted.
int chromiumDelete(sqlite3_vfs*, const char* fileName, int) {
- return Platform::current()->databaseDeleteFile(String(fileName), false);
+ return Platform::current()->databaseDeleteFile(String::fromUTF8(fileName),
+ false);
}
// Check the existance and status of the given file.
@@ -92,7 +93,8 @@ int chromiumDelete(sqlite3_vfs*, const char* fileName, int) {
// flag - the type of test to make on this file.
// res - the result.
int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res) {
- DWORD attr = Platform::current()->databaseGetFileAttributes(String(fileName));
+ DWORD attr = Platform::current()->databaseGetFileAttributes(
+ String::fromUTF8(fileName));
switch (flag) {
case SQLITE_ACCESS_READ:
case SQLITE_ACCESS_EXISTS:
« 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