Revert "Stubs for DB-related methods in ChromiumBridge."

This reverts commit r20839. It broke many builds.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20840 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 45 deletions

diff --git a/DEPS b/DEPS
index f98b48e..5f236a9 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "45959",
+  "webkit_revision": "45958",
 }
 
 
diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium
index 8dfe456..509f313 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 July 10, 2009, these are our changes from sqlite_vendor:
+As of September 12, 2008, these are our changes from sqlite_vendor:
 
  - fts2.c disables fts2_tokenizer().
  - sqlite3Poison() in src/btree.c.
@@ -103,6 +103,3 @@ 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 f5baabb..ec30add 100644
--- a/third_party/sqlite/src/os_win.c
+++ b/third_party/sqlite/src/os_win.c
@@ -1635,11 +1635,4 @@ 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 13134bc..4d05a2e 100644
--- a/webkit/api/src/ChromiumBridge.cpp
+++ b/webkit/api/src/ChromiumBridge.cpp
@@ -33,7 +33,6 @@
 
 #include <googleurl/src/url_util.h>
 
-#include "FileSystem.h"
 #include "WebClipboard.h"
 #include "WebData.h"
 #include "WebImage.h"
@@ -421,36 +420,4 @@ 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