[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 02:09:07 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit f0abe7b4ca75281e5fb0f136cdc36bf2e2795c72
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 4 05:19:27 2010 +0000
2010-03-03 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
Build fix after r55452.
No new tests, this is a build fix.
* page/Settings.cpp:
(WebCore::Settings::setDatabasesEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55504 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 40f51e9..13f3c08 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-03 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Build fix after r55452.
+
+ No new tests, this is a build fix.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::setDatabasesEnabled):
+
2010-03-03 Diego Gonzalez <diego.gonzalez at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 82be1a3..8f19403 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -264,7 +264,9 @@ void Settings::setPluginsEnabled(bool arePluginsEnabled)
void Settings::setDatabasesEnabled(bool databasesEnabled)
{
m_databasesEnabled = databasesEnabled;
+#if ENABLE(DATABASE)
Database::setIsAvailable(databasesEnabled);
+#endif
}
void Settings::setLocalStorageEnabled(bool localStorageEnabled)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list