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

Unified Diff: third_party/sqlite/README.chromium

Issue 6330011: Prepare to revert WebKit patch http://trac.webkit.org/changeset/68310 because of stability issues. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | « no previous file | third_party/sqlite/src/src/os_unix.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/README.chromium
diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium
index 926abd791e5be93466ec6c414bc1ff17eeca086e..45d0a8d0c95eb4175327cb6434759b0607870072 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.
« no previous file with comments | « no previous file | third_party/sqlite/src/src/os_unix.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698