Add changes missing from r53595, without which Chromium has no database.
authordimich@chromium.org <dimich@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jan 2010 21:02:15 +0000 (21:02 +0000)
committerdimich@chromium.org <dimich@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jan 2010 21:02:15 +0000 (21:02 +0000)
Patch by Eric Uhrhane <ericu@chromium.org> on 2010-01-21
Reviewed by Dmitry Titov.

https://bugs.webkit.org/show_bug.cgi?id=33966

No new tests - fixes database layout tests in Chromium.

WebCore:

* bindings/v8/RuntimeEnabledFeatures.cpp:
* bindings/v8/RuntimeEnabledFeatures.h:

WebKit/chromium:

* src/WebRuntimeFeatures.cpp:
(WebKit::WebRuntimeFeatures::enableDatabase):
(WebKit::WebRuntimeFeatures::isDatabaseEnabled):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@53641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
WebCore/bindings/v8/RuntimeEnabledFeatures.h
WebKit/chromium/ChangeLog
WebKit/chromium/src/WebRuntimeFeatures.cpp

index 7b14d13..ee59d17 100644 (file)
@@ -1,3 +1,16 @@
+2010-01-21  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Add changes missing from r53595, without which Chromium has no database.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33966
+
+        No new tests - fixes database layout tests in Chromium.
+
+        * bindings/v8/RuntimeEnabledFeatures.cpp:
+        * bindings/v8/RuntimeEnabledFeatures.h:
+
 2010-01-21  Jakob Petsovits  <jpetsovits@rim.com>
 
         Reviewed by Adam Treat.
index 399379b..780520b 100644 (file)
@@ -33,7 +33,6 @@
 
 namespace WebCore {
 
-bool RuntimeEnabledFeatures::isDatabaseEnabled = false;
 bool RuntimeEnabledFeatures::isLocalStorageEnabled = true;
 bool RuntimeEnabledFeatures::isSessionStorageEnabled = true;
 bool RuntimeEnabledFeatures::isNotificationsEnabled = false;
index e5a050a..d030176 100644 (file)
@@ -36,9 +36,6 @@ namespace WebCore {
 // A class that stores static enablers for all experimental features
 class RuntimeEnabledFeatures {
 public:
-    static void setDatabaseEnabled(bool isEnabled) { isDatabaseEnabled = isEnabled; }
-    static bool databaseEnabled() { return isDatabaseEnabled; }
-
     static void setLocalStorageEnabled(bool isEnabled) { isLocalStorageEnabled = isEnabled; }
     static bool localStorageEnabled() { return isLocalStorageEnabled; }
 
@@ -58,7 +55,6 @@ private:
     // Never instantiate.
     RuntimeEnabledFeatures() { }
 
-    static bool isDatabaseEnabled;
     static bool isLocalStorageEnabled;
     static bool isSessionStorageEnabled;
     static bool isNotificationsEnabled;
index da2073f..6d1e026 100644 (file)
@@ -1,3 +1,17 @@
+2010-01-21  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Add changes missing from r53595, without which Chromium has no database.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33966
+
+        No new tests - fixes database layout tests in Chromium.
+
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enableDatabase):
+        (WebKit::WebRuntimeFeatures::isDatabaseEnabled):
+
 2010-01-21  Kenneth Russell  <kbr@google.com>
 
         Reviewed by Oliver Hunt.
index ca3d45c..c8eed37 100644 (file)
@@ -31,6 +31,7 @@
 #include "config.h"
 #include "WebRuntimeFeatures.h"
 
+#include "Database.h"
 #include "RuntimeEnabledFeatures.h"
 #include "WebMediaPlayerClientImpl.h"
 #include "WebSocket.h"
@@ -42,14 +43,14 @@ namespace WebKit {
 void WebRuntimeFeatures::enableDatabase(bool enable)
 {
 #if ENABLE(DATABASE)
-    RuntimeEnabledFeatures::setDatabaseEnabled(enable);
+    Database::setIsAvailable(enable);
 #endif
 }
 
 bool WebRuntimeFeatures::isDatabaseEnabled()
 {
 #if ENABLE(DATABASE)
-    return RuntimeEnabledFeatures::databaseEnabled();
+    return Database::isAvailable();
 #else
     return false;
 #endif