summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-16 01:41:44 +0000
committerdumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-16 01:41:44 +0000
commite19b7e8e213bd2d826628bef6f258d92fdc774de (patch)
tree1c545eb7e02f78a52d54781faa37d4fb80ec8458
parentf9a5964bff26154d7086636685568783a253d9fe (diff)
downloadchromium_src-e19b7e8e213bd2d826628bef6f258d92fdc774de.zip
chromium_src-e19b7e8e213bd2d826628bef6f258d92fdc774de.tar.gz
chromium_src-e19b7e8e213bd2d826628bef6f258d92fdc774de.tar.bz2
Stubs for DB-related methods in ChromiumBridge. Allows us to compile the Chromium SQLite VFS.BUG=noneTEST=none
BUG=none TEST=none Review URL: http://codereview.chromium.org/155391 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20839 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/sqlite/README.chromium5
-rw-r--r--third_party/sqlite/src/os_win.c7
-rw-r--r--webkit/api/src/ChromiumBridge.cpp33
4 files changed, 45 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 5f236a9..f98b48e 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "45958",
+ "webkit_revision": "45959",
}
diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium
index 509f313..8dfe456 100644
--- a/third_party/sqlite/README.chromium
+++ b/third_party/sqlite/README.chromium
@@ -68,7 +68,7 @@ Scott Hess <shess@google.com>, December 11, 2007
--------------------------------------------
-As of September 12, 2008, these are our changes from sqlite_vendor:
+As of July 10, 2009, these are our changes from sqlite_vendor:
- fts2.c disables fts2_tokenizer().
- sqlite3Poison() in src/btree.c.
@@ -103,3 +103,6 @@ Changes from Chrome:
allows much faster performance by reading the file in one contiguous
operation rather than bringing it in organically, which involves a lot of
seeking.
+ - 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.
diff --git a/third_party/sqlite/src/os_win.c b/third_party/sqlite/src/os_win.c
index ec30add..f5baabb 100644
--- a/third_party/sqlite/src/os_win.c
+++ b/third_party/sqlite/src/os_win.c
@@ -1635,4 +1635,11 @@ int sqlite3_os_end(void){
return SQLITE_OK;
}
+void chromium_sqlite3_initialize_win_sqlite3_file(sqlite3_file* file, HANDLE handle) {
+ winFile* winSQLite3File = (winFile*)file;
+ memset(file, 0, sizeof(*file));
+ winSQLite3File->pMethod = &winIoMethod;
+ winSQLite3File->h = handle;
+}
+
#endif /* SQLITE_OS_WIN */
diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp
index 4d05a2e..13134bc 100644
--- a/webkit/api/src/ChromiumBridge.cpp
+++ b/webkit/api/src/ChromiumBridge.cpp
@@ -33,6 +33,7 @@
#include <googleurl/src/url_util.h>
+#include "FileSystem.h"
#include "WebClipboard.h"
#include "WebData.h"
#include "WebImage.h"
@@ -420,4 +421,36 @@ bool ChromiumBridge::isLinkVisited(WebCore::LinkHash visitedLinkHash)
return webKitClient()->isLinkVisited(visitedLinkHash);
}
+// HTML5 DB -------------------------------------------------------------------
+
+#if ENABLE(DATABASE)
+PlatformFileHandle ChromiumBridge::databaseOpenFile(const String& fileName, int desiredFlags)
+{
+ // FIXME: un-stub when the code on the browser process side is submitted
+ //return webKitClient()->databaseOpenFile(WebString(fileName), desiredFlags);
+ return invalidPlatformFileHandle;
+}
+
+bool ChromiumBridge::databaseDeleteFile(const String& fileName)
+{
+ // FIXME: un-stub when the code on the browser process side is submitted
+ //return webKitClient()->databaseDeleteFile(WebString(fileName));
+ return false;
+}
+
+long ChromiumBridge::databaseGetFileAttributes(const String& fileName)
+{
+ // FIXME: un-stub when the code on the browser process side is submitted
+ //return webKitClient()->databaseGetFileAttributes(WebString(fileName));
+ return 0L;
+}
+
+long long ChromiumBridge::databaseGetFileSize(const String& fileName)
+{
+ // FIXME: un-stub when the code on the browser process side is submitted
+ //return webKitClient()->databaseGetFileSize(WebString(fileName));
+ return 0LL;
+}
+#endif
+
} // namespace WebCore