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

Unified Diff: third_party/sqlite/patches/0004-Modify-default-VFS-to-support-WebDatabase.patch

Issue 1610963002: Import SQLite 3.10.2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
Index: third_party/sqlite/patches/0004-Modify-default-VFS-to-support-WebDatabase.patch
diff --git a/third_party/sqlite/patches/0005-Modify-default-VFS-to-support-WebDatabase.patch b/third_party/sqlite/patches/0004-Modify-default-VFS-to-support-WebDatabase.patch
similarity index 86%
rename from third_party/sqlite/patches/0005-Modify-default-VFS-to-support-WebDatabase.patch
rename to third_party/sqlite/patches/0004-Modify-default-VFS-to-support-WebDatabase.patch
index 658136b076e4a9e2bd053f4e534401dc1c875674..b4b3ade3496acd035f6a6472dbbc25494c123b32 100644
--- a/third_party/sqlite/patches/0005-Modify-default-VFS-to-support-WebDatabase.patch
+++ b/third_party/sqlite/patches/0004-Modify-default-VFS-to-support-WebDatabase.patch
@@ -1,7 +1,7 @@
-From 0125566ec87741be89ba7c4e9c2e4cc3436a6122 Mon Sep 17 00:00:00 2001
+From 0a5da8cd79a6b502edc01c40037ae418b2d5c828 Mon Sep 17 00:00:00 2001
From: dumi <dumi@chromium.org>
Date: Mon, 20 Jul 2009 23:40:51 +0000
-Subject: [PATCH 05/12] Modify default VFS to support WebDatabase.
+Subject: [PATCH 04/10] Modify default VFS to support WebDatabase.
The renderer WebDatabase implementation needs to broker certain requests
to the browser. This modifies SQLite to allow monkey-patching the VFS
@@ -23,10 +23,10 @@ https://codereview.chromium.org/377039
3 files changed, 80 insertions(+)
diff --git a/third_party/sqlite/src/src/os_unix.c b/third_party/sqlite/src/src/os_unix.c
-index a9344ee..ea52abb 100644
+index 791ba5d..fa85638 100644
--- a/third_party/sqlite/src/src/os_unix.c
+++ b/third_party/sqlite/src/src/os_unix.c
-@@ -1321,6 +1321,12 @@ static int fileHasMoved(unixFile *pFile){
+@@ -1297,6 +1297,12 @@ static int fileHasMoved(unixFile *pFile){
return pFile->pInode!=0 && pFile->pId!=pFile->pInode->fileId.pId;
#else
struct stat buf;
@@ -39,7 +39,7 @@ index a9344ee..ea52abb 100644
return pFile->pInode!=0 &&
(osStat(pFile->zPath, &buf)!=0 || buf.st_ino!=pFile->pInode->fileId.ino);
#endif
-@@ -5615,6 +5621,44 @@ static int findCreateFileMode(
+@@ -5554,6 +5560,44 @@ static int findCreateFileMode(
}
/*
@@ -84,7 +84,7 @@ index a9344ee..ea52abb 100644
** Open the file zPath.
**
** Previously, the SQLite OS layer used three functions in place of this
-@@ -5715,6 +5759,7 @@ static int unixOpen(
+@@ -5654,6 +5698,7 @@ static int unixOpen(
sqlite3_randomness(0,0);
}
@@ -92,15 +92,15 @@ index a9344ee..ea52abb 100644
memset(p, 0, sizeof(unixFile));
if( eType==SQLITE_OPEN_MAIN_DB ){
-@@ -5723,6 +5768,7 @@ static int unixOpen(
+@@ -5662,6 +5707,7 @@ static int unixOpen(
if( pUnused ){
fd = pUnused->fd;
}else{
+ /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
- pUnused = sqlite3_malloc(sizeof(*pUnused));
+ pUnused = sqlite3_malloc64(sizeof(*pUnused));
if( !pUnused ){
return SQLITE_NOMEM;
-@@ -5799,6 +5845,7 @@ static int unixOpen(
+@@ -5739,6 +5785,7 @@ static int unixOpen(
}
if( p->pUnused ){
@@ -108,7 +108,7 @@ index a9344ee..ea52abb 100644
p->pUnused->fd = fd;
p->pUnused->flags = flags;
}
-@@ -5889,10 +5936,12 @@ static int unixOpen(
+@@ -5819,10 +5866,12 @@ static int unixOpen(
}
#endif
@@ -122,10 +122,10 @@ index a9344ee..ea52abb 100644
}
return rc;
diff --git a/third_party/sqlite/src/src/os_win.c b/third_party/sqlite/src/src/os_win.c
-index 8ca2107..9320bfc 100644
+index c54bfd6..00ad6fd 100644
--- a/third_party/sqlite/src/src/os_win.c
+++ b/third_party/sqlite/src/src/os_win.c
-@@ -5546,4 +5546,12 @@ int sqlite3_os_end(void){
+@@ -5639,4 +5639,12 @@ int sqlite3_os_end(void){
return SQLITE_OK;
}
@@ -139,12 +139,12 @@ index 8ca2107..9320bfc 100644
+
#endif /* SQLITE_OS_WIN */
diff --git a/third_party/sqlite/src/src/sqlite.h.in b/third_party/sqlite/src/src/sqlite.h.in
-index f1d4e40..14c12f2 100644
+index 59b30cd..e5673fd 100644
--- a/third_party/sqlite/src/src/sqlite.h.in
+++ b/third_party/sqlite/src/src/sqlite.h.in
-@@ -7408,6 +7408,29 @@ int sqlite3_vtab_on_conflict(sqlite3 *);
-
-
+@@ -7411,6 +7411,29 @@ int sqlite3_strnicmp(const char *, const char *, int);
+ */
+ int sqlite3_strglob(const char *zGlob, const char *zStr);
+/* Begin WebDatabase patch for Chromium */
+/* Expose some SQLite internals for the WebDatabase vfs.
@@ -170,8 +170,8 @@ index f1d4e40..14c12f2 100644
+/* End WebDatabase patch for Chromium */
+
/*
- ** Undo the hack that converts floating point types to integer for
- ** builds on processors without floating point support.
+ ** CAPI3REF: String LIKE Matching
+ *
--
-2.6.3
+2.7.0

Powered by Google App Engine
This is Rietveld 408576698