[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[dimich at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit ec96e58a41c3091ed3fd898b4c04e268ba6d4164
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 21:02:15 2010 +0000

    Add changes missing from r53595, without which Chromium has no database.
    
    Patch by Eric Uhrhane <ericu at 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: http://svn.webkit.org/repository/webkit/trunk@53641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7b14d13..ee59d17 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-21  Eric Uhrhane  <ericu at 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 at rim.com>
 
         Reviewed by Adam Treat.
diff --git a/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp b/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
index 399379b..780520b 100644
--- a/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
@@ -33,7 +33,6 @@
 
 namespace WebCore {
 
-bool RuntimeEnabledFeatures::isDatabaseEnabled = false;
 bool RuntimeEnabledFeatures::isLocalStorageEnabled = true;
 bool RuntimeEnabledFeatures::isSessionStorageEnabled = true;
 bool RuntimeEnabledFeatures::isNotificationsEnabled = false;
diff --git a/WebCore/bindings/v8/RuntimeEnabledFeatures.h b/WebCore/bindings/v8/RuntimeEnabledFeatures.h
index e5a050a..d030176 100644
--- a/WebCore/bindings/v8/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/v8/RuntimeEnabledFeatures.h
@@ -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;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index da2073f..6d1e026 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-21  Eric Uhrhane  <ericu at 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 at google.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKit/chromium/src/WebRuntimeFeatures.cpp b/WebKit/chromium/src/WebRuntimeFeatures.cpp
index ca3d45c..c8eed37 100644
--- a/WebKit/chromium/src/WebRuntimeFeatures.cpp
+++ b/WebKit/chromium/src/WebRuntimeFeatures.cpp
@@ -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

-- 
WebKit Debian packaging