Chromium side patch for DB support on Linux.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/174232

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

2 files changed, 8 insertions, 7 deletions

diff --git a/webkit/api/public/WebKitClient.h b/webkit/api/public/WebKitClient.h
index 9ecf0c3..4ff33b3 100644
--- a/webkit/api/public/WebKitClient.h
+++ b/webkit/api/public/WebKitClient.h
@@ -122,11 +122,12 @@ namespace WebKit {
         typedef int FileType;
 #endif
 
-        // Opens a database file
-        virtual FileType databaseOpenFile(const WebString& fileName, int desiredFlags) = 0;
+        // Opens a database file; dirHandle should be NULL if the caller does not need
+        // a handle to the directory containing this file
+        virtual FileType databaseOpenFile(const WebString& fileName, int desiredFlags, FileType* dirHandle) = 0;
 
         // Deletes a database file and returns the error code
-        virtual bool databaseDeleteFile(const WebString& fileName) = 0;
+        virtual int databaseDeleteFile(const WebString& fileName, bool syncDir) = 0;
 
         // Returns the attributes of the given database file
         virtual long databaseGetFileAttributes(const WebString& fileName) = 0;
diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp
index c13fe03..611c647 100644
--- a/webkit/api/src/ChromiumBridge.cpp
+++ b/webkit/api/src/ChromiumBridge.cpp
@@ -222,14 +222,14 @@ String ChromiumBridge::getFontFamilyForCharacters(const UChar* characters, size_
 // HTML5 DB -------------------------------------------------------------------
 
 #if ENABLE(DATABASE)
-PlatformFileHandle ChromiumBridge::databaseOpenFile(const String& fileName, int desiredFlags)
+PlatformFileHandle ChromiumBridge::databaseOpenFile(const String& fileName, int desiredFlags, PlatformFileHandle* dirHandle)
 {
-    return webKitClient()->databaseOpenFile(WebString(fileName), desiredFlags);
+  return webKitClient()->databaseOpenFile(WebString(fileName), desiredFlags, dirHandle);
 }
 
-bool ChromiumBridge::databaseDeleteFile(const String& fileName)
+int ChromiumBridge::databaseDeleteFile(const String& fileName, bool syncDir)
 {
-    return webKitClient()->databaseDeleteFile(WebString(fileName));
+    return webKitClient()->databaseDeleteFile(WebString(fileName), syncDir);
 }
 
 long ChromiumBridge::databaseGetFileAttributes(const String& fileName)