Adding HTML5 DB support to Chromium: Chromium changes

BUG=none
TEST=none

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

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

2 files changed, 18 insertions, 12 deletions

diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp
index 93ac857..5f0461f 100644
--- a/webkit/api/src/ChromiumBridge.cpp
+++ b/webkit/api/src/ChromiumBridge.cpp
@@ -429,30 +429,22 @@ bool ChromiumBridge::isLinkVisited(WebCore::LinkHash visitedLinkHash)
 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;
+    return webKitClient()->databaseOpenFile(WebString(fileName), desiredFlags);
 }
 
 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;
+    return webKitClient()->databaseDeleteFile(WebString(fileName));
 }
 
 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;
+    return webKitClient()->databaseGetFileAttributes(WebString(fileName));
 }
 
 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;
+    return webKitClient()->databaseGetFileSize(WebString(fileName));
 }
 #endif
 
diff --git a/webkit/api/src/WebKit.cpp b/webkit/api/src/WebKit.cpp
index 0bdbf42..e88a7a8 100644
--- a/webkit/api/src/WebKit.cpp
+++ b/webkit/api/src/WebKit.cpp
@@ -47,6 +47,7 @@ namespace WebKit {
 
 static WebKitClient* s_webKitClient = 0;
 static bool s_layoutTestMode = false;
+static bool s_databasesEnabled = false;
 
 void initialize(WebKitClient* webKitClient)
 {
@@ -123,4 +124,17 @@ void resetPluginCache()
     WebCore::Page::refreshPlugins(false);
 }
 
+void enableDatabases()
+{
+#if ENABLE(DATABASE)
+    s_databasesEnabled = true;
+#endif
+}
+
+bool databasesEnabled()
+{
+    return s_databasesEnabled;
+}
+
+
 } // namespace WebKit