Changeset 50954 in webkit

Timestamp:

Nov 13, 2009 11:14:56 AM (14 years ago)

Author:

dumi@chromium.org

Message:

Do not register Chromium's HTML5 DB VFS as the default
VFS. Otherwise, other sqlite DB users in the same process will
stop working.

Reviewed by Dimitri Glazkov.

​https://bugs.webkit.org/show_bug.cgi?id=31462

• platform/sql/chromium/SQLiteFileSystemChromium.cpp:

(WebCore::SQLiteFileSystem::openDatabase):

• platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:

(WebCore::SQLiteFileSystem::registerSQLiteVFS):

• platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp:

(WebCore::SQLiteFileSystem::registerSQLiteVFS):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/sql/chromium/SQLiteFileSystemChromium.cpp (modified) (1 diff)
• platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp (modified) (1 diff)
• platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-13  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Do not register Chromium's HTML5 DB VFS as the default
+        VFS. Otherwise, other sqlite DB users in the same process will
+        stop working.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31462
+
+        * platform/sql/chromium/SQLiteFileSystemChromium.cpp:
+        (WebCore::SQLiteFileSystem::openDatabase):
+        * platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:
+        (WebCore::SQLiteFileSystem::registerSQLiteVFS):
+        * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp:
+        (WebCore::SQLiteFileSystem::registerSQLiteVFS):
+
 2009-11-13  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/platform/sql/chromium/SQLiteFileSystemChromium.cpp

@@ -59 +59 @@
     // in renderers, it should be Chromium's VFS; in the browser process it should be SQLite's default VFS
     return sqlite3_open_v2(fileName.utf8().data(), database,
-                           SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, 0);
+                           SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX,
+                           "chromium_vfs");
 }
 

trunk/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp

@@ -201 +201 @@
         unix_vfs->xGetLastError
     };
-    sqlite3_vfs_register(&chromium_vfs, 1);
+    sqlite3_vfs_register(&chromium_vfs, 0);
 }
 

trunk/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp

@@ -170 +170 @@
         win32_vfs->xGetLastError
     };
-    sqlite3_vfs_register(&chromium_vfs, 1);
+    sqlite3_vfs_register(&chromium_vfs, 0);
 }