4 files changed, 19 insertions, 13 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)
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 083de68..8f8be47 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -238,13 +238,16 @@ void WebKitClientImpl::callOnMainThread(void (*func)()) {
 }
 
 base::PlatformFile WebKitClientImpl::databaseOpenFile(
-    const WebKit::WebString& file_name, int desired_flags) {
+    const WebKit::WebString& file_name, int desired_flags,
+    base::PlatformFile* dir_handle) {
+  if (dir_handle)
+    *dir_handle = base::kInvalidPlatformFileValue;
   return base::kInvalidPlatformFileValue;
 }
 
-bool WebKitClientImpl::databaseDeleteFile(
-    const WebKit::WebString& file_name) {
-  return false;
+int WebKitClientImpl::databaseDeleteFile(
+    const WebKit::WebString& file_name, bool sync_dir) {
+  return -1;
 }
 
 long WebKitClientImpl::databaseGetFileAttributes(
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 2049753..829b162 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -41,8 +41,10 @@ class WebKitClientImpl : public WebKit::WebKitClient {
   virtual void suddenTerminationChanged(bool enabled) { }
 
   virtual base::PlatformFile databaseOpenFile(
-      const WebKit::WebString& file_name, int desired_flags);
-  virtual bool databaseDeleteFile(const WebKit::WebString& file_name);
+      const WebKit::WebString& file_name, int desired_flags,
+      base::PlatformFile* dir_handle);
+  virtual int databaseDeleteFile(const WebKit::WebString& file_name,
+      bool sync_dir);
   virtual long databaseGetFileAttributes(const WebKit::WebString& file_name);
   virtual long long databaseGetFileSize(const WebKit::WebString& file_name);