diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 19:58:51 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 19:58:51 +0000 |
| commit | ba4b3a9e1f5931aa8e6127fe1fe7ca38f4a58c6f (patch) | |
| tree | 5cd0f6982f3fd5302fb92f60d6ee2a8d39407534 /third_party/sqlite/README.chromium | |
| parent | 20477755e5b62e662b08e541d3cfc155622c387a (diff) | |
| download | chromium_src-ba4b3a9e1f5931aa8e6127fe1fe7ca38f4a58c6f.zip chromium_src-ba4b3a9e1f5931aa8e6127fe1fe7ca38f4a58c6f.tar.gz chromium_src-ba4b3a9e1f5931aa8e6127fe1fe7ca38f4a58c6f.tar.bz2 | |
Prepare to revert WebKit patch http://trac.webkit.org/changeset/68310 because of stability issues (race conditions detected by tsan, possibly leading to crashes).
Revert "Update sqlite's README.chromium with a note to keep webkit side" (http://crrev.com/62151).
Revert "Remove our local modifications to sqlite's os_unix.c now that" (http://crrev.com/60761).
BUG=70589, 22208
TEST=none
Review URL: http://codereview.chromium.org/6330011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite/README.chromium')
| -rw-r--r-- | third_party/sqlite/README.chromium | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium index 926abd7..45d0a8d 100644 --- a/third_party/sqlite/README.chromium +++ b/third_party/sqlite/README.chromium @@ -42,11 +42,6 @@ cd sqlite # Run the google_generate_preprocessed.sh script: ./google_generate_preprocessed.sh -# If there are any updates to os_unix.c, remember to keep -# WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp in sync. -# This means preparing a separate patch for WebKit. -# If you have questions about this part, ask phajdan.jr and dumi. - # Find a sucker. Send review. # TODO(shess) Describe an appropriate comment style. Seems like it # should at least include the SQLite version number. @@ -160,3 +155,18 @@ Changes from Chrome: - Added a new function chromium_sqlite3_initialize_win_sqlite3_file() at the end of os_win.c. It allows the Windows-specific Chromium VFS to reuse most of the win32 SQLite VFS. + - Added a new function + chromium_sqlite3_initialize_unix_sqlite3_file() and made + fillInUnixFile() non-static in os_unix.c. It allows the + Linux-specific Chromium VFS to reuse most of the unix SQLite VFS. + - Exposed three functions that deal with unused file descriptors in + os_unix.c, to allow Chromium's Posix VFS implementation in + WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp + to correctly implement the "unused file descriptors" logic in the + xDlOpen() method. The new functions are + chromium_sqlite3_get_reusable_file_handle(), + chromium_sqlite3_update_reusable_file_handle() and + chromium_sqlite3_destroy_reusable_file_handle(). Also, added the + chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls + fillInUnixFile(), which will be made static again as soon as a + WebKit patch using the new function lands. |