[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 693f422946ba9203756f4f2080eafa4a881dcc6e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 28 23:33:25 2009 +0000

    2009-09-28  Dumitru Daniliuc  <dumi at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Register Chromium's VFSs with a proper sqlite3_io_methods
            finder. This should only affect the POSIX implementation. The
            Windows change is included for consistency and in case sqlite
            starts using something similar in its Windows VFS in the future.
    
            https://bugs.webkit.org/show_bug.cgi?id=29743
    
            * platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:
            (WebCore::SQLiteFileSystem::registerSQLiteVFS):
            * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp:
            (WebCore::SQLiteFileSystem::registerSQLiteVFS):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48845 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 66403a4..9d9b537 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-09-28  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Register Chromium's VFSs with a proper sqlite3_io_methods
+        finder. This should only affect the POSIX implementation. The
+        Windows change is included for consistency and in case sqlite
+        starts using something similar in its Windows VFS in the future.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29743
+
+        * platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:
+        (WebCore::SQLiteFileSystem::registerSQLiteVFS):
+        * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp:
+        (WebCore::SQLiteFileSystem::registerSQLiteVFS):
+
 2009-09-28  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp
index 937f0b3..2960a5f 100644
--- a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp
+++ b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp
@@ -170,7 +170,7 @@ void SQLiteFileSystem::registerSQLiteVFS()
         unix_vfs->mxPathname,
         0,
         "chromium_vfs",
-        0,
+        unix_vfs->pAppData,
         chromiumOpen,
         chromiumDelete,
         chromiumAccess,
diff --git a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp
index f955122..153793b 100644
--- a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp
+++ b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp
@@ -155,7 +155,7 @@ void SQLiteFileSystem::registerSQLiteVFS()
         win32_vfs->mxPathname,
         0,
         "chromium_vfs",
-        0,
+        win32_vfs->pAppData,
         chromiumOpen,
         chromiumDelete,
         chromiumAccess,

-- 
WebKit Debian packaging