[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:13:41 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit a156b6ffe76a8b75aeda2eeee09b4d04611ee628
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 8 16:41:59 2010 +0000
2010-03-08 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
Remove the now-redundant Settings fields for the Database
https://bugs.webkit.org/show_bug.cgi?id=35763
No new tests; this code isn't called.
* WebCore.base.exp:
* page/Settings.cpp:
(WebCore::Settings::Settings):
* page/Settings.h:
2010-03-08 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
Remove the now-redundant Settings fields for the Database
https://bugs.webkit.org/show_bug.cgi?id=35763
No new tests; this code isn't called.
* public/WebSettings.h:
* src/WebSettingsImpl.cpp:
* src/WebSettingsImpl.h:
2010-03-08 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
Remove the now-redundant Settings fields for the Database
https://bugs.webkit.org/show_bug.cgi?id=35763
No new tests; this code isn't called.
* webkit/webkitwebview.cpp: Remove the calls into Settings.
(DNDContentsRequest::webkit_web_view_update_settings):
(DNDContentsRequest::webkit_web_view_settings_notify):
2010-03-08 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
Remove the now-redundant Settings fields for the Database
https://bugs.webkit.org/show_bug.cgi?id=35763
No new tests; this code isn't called.
* WebView/WebView.mm: Remove the call into Settings.
(-[WebView _preferencesChangedNotification:]):
2010-03-08 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
Remove the now-redundant Settings fields for the Database
https://bugs.webkit.org/show_bug.cgi?id=35763
No new tests; this code isn't called.
* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply): Remove the call into Settings.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55666 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 92d76a9..84f7229 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-08 Eric Uhrhane <ericu at chromium.org>
+
+ Reviewed by David Levin.
+
+ Remove the now-redundant Settings fields for the Database
+ https://bugs.webkit.org/show_bug.cgi?id=35763
+
+ No new tests; this code isn't called.
+
+ * WebCore.base.exp:
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+
2010-03-04 Philippe Normand <pnormand at igalia.com>
Reviewed by Eric Seidel.
diff --git a/WebCore/WebCore.base.exp b/WebCore/WebCore.base.exp
index c93d808..7e9cb7d 100644
--- a/WebCore/WebCore.base.exp
+++ b/WebCore/WebCore.base.exp
@@ -635,7 +635,6 @@ __ZN7WebCore8Settings18setDefaultFontSizeEi
__ZN7WebCore8Settings18setFixedFontFamilyERKNS_12AtomicStringE
__ZN7WebCore8Settings18setMinimumFontSizeEi
__ZN7WebCore8Settings18setSerifFontFamilyERKNS_12AtomicStringE
-__ZN7WebCore8Settings19setDatabasesEnabledEb
__ZN7WebCore8Settings19setShowDebugBordersEb
__ZN7WebCore8Settings20setCursiveFontFamilyERKNS_12AtomicStringE
__ZN7WebCore8Settings20setFantasyFontFamilyERKNS_12AtomicStringE
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index f18696d..ce5a215 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -73,7 +73,6 @@ Settings::Settings(Page* page)
, m_caretBrowsingEnabled(false)
, m_areImagesEnabled(true)
, m_arePluginsEnabled(false)
- , m_databasesEnabled(false)
, m_localStorageEnabled(false)
, m_isJavaScriptEnabled(false)
, m_isWebSecurityEnabled(true)
@@ -267,14 +266,6 @@ void Settings::setPluginsEnabled(bool arePluginsEnabled)
m_arePluginsEnabled = arePluginsEnabled;
}
-void Settings::setDatabasesEnabled(bool databasesEnabled)
-{
- m_databasesEnabled = databasesEnabled;
-#if ENABLE(DATABASE)
- Database::setIsAvailable(databasesEnabled);
-#endif
-}
-
void Settings::setLocalStorageEnabled(bool localStorageEnabled)
{
m_localStorageEnabled = localStorageEnabled;
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index b99e089..b380708 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -131,9 +131,6 @@ namespace WebCore {
void setPluginsEnabled(bool);
bool arePluginsEnabled() const { return m_arePluginsEnabled; }
- void setDatabasesEnabled(bool);
- bool databasesEnabled() const { return m_databasesEnabled; }
-
void setLocalStorageEnabled(bool);
bool localStorageEnabled() const { return m_localStorageEnabled; }
@@ -321,7 +318,6 @@ namespace WebCore {
bool m_caretBrowsingEnabled : 1;
bool m_areImagesEnabled : 1;
bool m_arePluginsEnabled : 1;
- bool m_databasesEnabled : 1;
bool m_localStorageEnabled : 1;
bool m_isJavaScriptEnabled : 1;
bool m_isWebSecurityEnabled : 1;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6bdb4ff..c507dda 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-08 Eric Uhrhane <ericu at chromium.org>
+
+ Reviewed by David Levin.
+
+ Remove the now-redundant Settings fields for the Database
+ https://bugs.webkit.org/show_bug.cgi?id=35763
+
+ No new tests; this code isn't called.
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ * src/WebSettingsImpl.h:
+
2010-03-08 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebSettings.h b/WebKit/chromium/public/WebSettings.h
index 87b0188..709d9c2 100644
--- a/WebKit/chromium/public/WebSettings.h
+++ b/WebKit/chromium/public/WebSettings.h
@@ -76,7 +76,6 @@ public:
virtual void setEditableLinkBehaviorNeverLive() = 0;
virtual void setFontRenderingModeNormal() = 0;
virtual void setShouldPaintCustomScrollbars(bool) = 0;
- virtual void setDatabasesEnabled(bool) = 0;
virtual void setAllowUniversalAccessFromFileURLs(bool) = 0;
virtual void setAllowFileAccessFromFileURLs(bool) = 0;
virtual void setTextDirectionSubmenuInclusionBehaviorNeverIncluded() = 0;
diff --git a/WebKit/chromium/src/WebSettingsImpl.cpp b/WebKit/chromium/src/WebSettingsImpl.cpp
index bafe741..6515524 100644
--- a/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -226,11 +226,6 @@ void WebSettingsImpl::setShouldPaintCustomScrollbars(bool enabled)
m_settings->setShouldPaintCustomScrollbars(enabled);
}
-void WebSettingsImpl::setDatabasesEnabled(bool enabled)
-{
- m_settings->setDatabasesEnabled(enabled);
-}
-
void WebSettingsImpl::setAllowUniversalAccessFromFileURLs(bool allow)
{
m_settings->setAllowUniversalAccessFromFileURLs(allow);
diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index 183afc3..d03099d 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -78,7 +78,6 @@ public:
virtual void setEditableLinkBehaviorNeverLive();
virtual void setFontRenderingModeNormal();
virtual void setShouldPaintCustomScrollbars(bool);
- virtual void setDatabasesEnabled(bool);
virtual void setAllowUniversalAccessFromFileURLs(bool);
virtual void setAllowFileAccessFromFileURLs(bool);
virtual void setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index bed5d84..279ca18 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-08 Eric Uhrhane <ericu at chromium.org>
+
+ Reviewed by David Levin.
+
+ Remove the now-redundant Settings fields for the Database
+ https://bugs.webkit.org/show_bug.cgi?id=35763
+
+ No new tests; this code isn't called.
+
+ * webkit/webkitwebview.cpp: Remove the calls into Settings.
+ (DNDContentsRequest::webkit_web_view_update_settings):
+ (DNDContentsRequest::webkit_web_view_settings_notify):
+
2010-03-06 Arno Renevier <arno at renevier.net>
Reviewed by Eric Seidel.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 8ca31e1..274030c 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -2730,7 +2730,6 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
settings->setDeveloperExtrasEnabled(enableDeveloperExtras);
settings->setPrivateBrowsingEnabled(enablePrivateBrowsing);
settings->setCaretBrowsingEnabled(enableCaretBrowsing);
- settings->setDatabasesEnabled(enableHTML5Database);
#if ENABLE(DATABASE)
Database::setIsAvailable(enableHTML5Database);
#endif
@@ -2824,7 +2823,6 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar
settings->setCaretBrowsingEnabled(g_value_get_boolean(&value));
#if ENABLE(DATABASE)
else if (name == g_intern_string("enable-html5-database")) {
- settings->setDatabasesEnabled(g_value_get_boolean(&value));
Database::setIsAvailable(g_value_get_boolean(&value));
}
#endif
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 008cb3c..b33cc4f 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-08 Eric Uhrhane <ericu at chromium.org>
+
+ Reviewed by David Levin.
+
+ Remove the now-redundant Settings fields for the Database
+ https://bugs.webkit.org/show_bug.cgi?id=35763
+
+ No new tests; this code isn't called.
+
+ * WebView/WebView.mm: Remove the call into Settings.
+ (-[WebView _preferencesChangedNotification:]):
+
2010-03-07 Mark Rowe <mrowe at apple.com>
Rubber-stamped by Cameron Zwarich.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 1e9a967..4b85556 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -1305,7 +1305,6 @@ static bool fastDocumentTeardownEnabled()
settings->setMinimumFontSize([preferences minimumFontSize]);
settings->setMinimumLogicalFontSize([preferences minimumLogicalFontSize]);
settings->setPluginsEnabled([preferences arePlugInsEnabled]);
- settings->setDatabasesEnabled([preferences databasesEnabled]);
#if ENABLE(DATABASE)
Database::setIsAvailable([preferences databasesEnabled]);
#endif
diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index c35dd79..2c63d06 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -215,7 +215,6 @@ void QWebSettingsPrivate::apply()
#if ENABLE(DATABASE)
value = attributes.value(QWebSettings::OfflineStorageDatabaseEnabled,
global->attributes.value(QWebSettings::OfflineStorageDatabaseEnabled));
- settings->setDatabasesEnabled(value);
WebCore::Database::setIsAvailable(value);
#endif
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index dceeffe..8f55798 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-08 Eric Uhrhane <ericu at chromium.org>
+
+ Reviewed by David Levin.
+
+ Remove the now-redundant Settings fields for the Database
+ https://bugs.webkit.org/show_bug.cgi?id=35763
+
+ No new tests; this code isn't called.
+
+ * Api/qwebsettings.cpp:
+ (QWebSettingsPrivate::apply): Remove the call into Settings.
+
2010-03-08 Simon Hausmann <simon.hausmann at nokia.com>
Reviewed by Laszlo Gombos.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list