[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d8af48cac5e759c74b507eec7985cbdc2485227e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 22:44:03 2010 +0000

    2010-03-10  Eric Uhrhane  <ericu at chromium.org>
    
            Reviewed by David Levin.
    
            The build fix for my patch on bug #35763 wasn't quite right--it removed
            the call entirely, instead of replacing it with the new API.  This adds
            the call to Database::setIsAvailable.
    
            https://bugs.webkit.org/show_bug.cgi?id=35763
    
            * WebView.cpp: Added a call to Database::setIsAvailable where change 55667 removed the old Settings API call <http://trac.webkit.org/changeset/55667>.
            (WebView::notifyPreferencesChanged):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55809 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 8819f78..c927d2a 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-10  Eric Uhrhane  <ericu at chromium.org>
+
+        Reviewed by David Levin.
+
+        The build fix for my patch on bug #35763 wasn't quite right--it removed
+        the call entirely, instead of replacing it with the new API.  This adds
+        the call to Database::setIsAvailable.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35763
+
+        * WebView.cpp: Added a call to Database::setIsAvailable where change 55667 removed the old Settings API call <http://trac.webkit.org/changeset/55667>.
+        (WebView::notifyPreferencesChanged):
+
 2010-03-10  John Sullivan  <sullivan at apple.com>
 
         Reviewed by Tim Hatcher.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 7a15b71..091bbe4 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -73,6 +73,7 @@
 #include <WebCore/ContextMenuController.h>
 #include <WebCore/CookieStorageWin.h>
 #include <WebCore/Cursor.h>
+#include <WebCore/Database.h>
 #include <WebCore/Document.h>
 #include <WebCore/DragController.h>
 #include <WebCore/DragData.h>
@@ -4608,6 +4609,13 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
         return hr;
     settings->setOfflineWebApplicationCacheEnabled(enabled);
 
+#if ENABLE(DATABASE)
+    hr = prefsPrivate->databasesEnabled(&enabled);
+    if (FAILED(hr))
+        return hr;
+    Database::setIsAvailable(enabled);
+#endif
+
     hr = prefsPrivate->localStorageEnabled(&enabled);
     if (FAILED(hr))
         return hr;

-- 
WebKit Debian packaging