[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dbates at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c05a2ed73f8d93fd35452227777d785227408ab3
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 17:26:12 2010 +0000

    2010-03-08  Daniel Bates  <dbates at rim.com>
    
            Unreviewed, build fix.
    
            Attempt to fix the Windows builds by applying the corresponding change
            made in bug #35763 <https://bugs.webkit.org/show_bug.cgi?id=35763>.
    
            * WebView.cpp: Removed call to settings->setDatabasesEnabled since this
            setting no longer exists following changeset 55666 <http://trac.webkit.org/changeset/55666>.
            (WebView::notifyPreferencesChanged):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55667 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 36a8987..d5fdcfc 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-08  Daniel Bates  <dbates at rim.com>
+
+        Unreviewed, build fix.
+
+        Attempt to fix the Windows builds by applying the corresponding change
+        made in bug #35763 <https://bugs.webkit.org/show_bug.cgi?id=35763>.
+
+        * WebView.cpp: Removed call to settings->setDatabasesEnabled since this
+        setting no longer exists following changeset 55666 <http://trac.webkit.org/changeset/55666>.
+        (WebView::notifyPreferencesChanged):
+
 2010-03-07  Mark Rowe  <mrowe at apple.com>
 
         Windows build fix.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 08f625e..7a15b71 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -4608,11 +4608,6 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
         return hr;
     settings->setOfflineWebApplicationCacheEnabled(enabled);
 
-    hr = prefsPrivate->databasesEnabled(&enabled);
-    if (FAILED(hr))
-        return hr;
-    settings->setDatabasesEnabled(enabled);
-
     hr = prefsPrivate->localStorageEnabled(&enabled);
     if (FAILED(hr))
         return hr;

-- 
WebKit Debian packaging