Index: third_party/sqlite/amalgamation/sqlite3.h |
diff --git a/third_party/sqlite/amalgamation/sqlite3.h b/third_party/sqlite/amalgamation/sqlite3.h |
index db1831a52fc4f7e73efa95476ea5a01df7d71181..cc58f009f00af79447ac5f79bfc3f9410c967075 100644 |
--- a/third_party/sqlite/amalgamation/sqlite3.h |
+++ b/third_party/sqlite/amalgamation/sqlite3.h |
@@ -7413,7 +7413,9 @@ SQLITE_API int sqlite3_vtab_on_conflict(sqlite3 *); |
-/* Begin recover.patch for Chromium */ |
+/* Begin recover virtual table patch for Chromium */ |
+/* Our patches don't conform to SQLite's amalgamation processing. Hack it. */ |
+#define CHROMIUM_SQLITE_API SQLITE_API |
/* |
** Call to initialize the recover virtual-table modules (see recover.c). |
** |
@@ -7421,8 +7423,42 @@ SQLITE_API int sqlite3_vtab_on_conflict(sqlite3 *); |
** virtual table available to Web SQL. Breaking it out allows only |
** selected users to enable it (currently sql/recovery.cc). |
*/ |
+CHROMIUM_SQLITE_API |
int recoverVtableInit(sqlite3 *db); |
-/* End recover.patch for Chromium */ |
+/* End recover virtual table patch for Chromium */ |
+ |
+/* Begin WebDatabase patch for Chromium */ |
+/* Expose some SQLite internals for the WebDatabase vfs. |
+** DO NOT EXTEND THE USE OF THIS. |
+*/ |
+#if defined(CHROMIUM_SQLITE_INTERNALS) |
+#ifdef _WIN32 |
+CHROMIUM_SQLITE_API |
+void chromium_sqlite3_initialize_win_sqlite3_file(sqlite3_file* file, HANDLE handle); |
+#else /* _WIN32 */ |
+CHROMIUM_SQLITE_API |
+void chromium_sqlite3_initialize_unix_sqlite3_file(sqlite3_file* file); |
+CHROMIUM_SQLITE_API |
+int chromium_sqlite3_fill_in_unix_sqlite3_file(sqlite3_vfs* vfs, |
+ int fd, |
+ int dirfd, |
+ sqlite3_file* file, |
+ const char* fileName, |
+ int noLock); |
+CHROMIUM_SQLITE_API |
+int chromium_sqlite3_get_reusable_file_handle(sqlite3_file* file, |
+ const char* fileName, |
+ int flags, |
+ int* fd); |
+CHROMIUM_SQLITE_API |
+void chromium_sqlite3_update_reusable_file_handle(sqlite3_file* file, |
+ int fd, |
+ int flags); |
+CHROMIUM_SQLITE_API |
+void chromium_sqlite3_destroy_reusable_file_handle(sqlite3_file* file); |
+#endif /* _WIN32 */ |
+#endif /* CHROMIUM_SQLITE_INTERNALS */ |
+/* End WebDatabase patch for Chromium */ |
/* |
** Undo the hack that converts floating point types to integer for |
@@ -7545,7 +7581,6 @@ struct sqlite3_rtree_query_info { |
#define PARTLY_WITHIN 1 /* Object partially overlaps query region */ |
#define FULLY_WITHIN 2 /* Object fully contained within query region */ |
- |
#ifdef __cplusplus |
} /* end of the 'extern "C"' block */ |
#endif |