[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kenneth at webkit.org
kenneth at webkit.org
Wed Dec 22 13:44:27 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c7b1890bdc485e1de470490eed201e06dd0c1f0e
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 18:00:11 2010 +0000
Add WebKit2 C API for setting/getting frame flattening and plugin settings.
http://webkit.org/b/46477
Reviewed by Sam Weinig.
NOTE: The plugin setting was partly done but there was no C API.
* Shared/WebPreferencesStore.cpp:
(WebKit::WebPreferencesStore::WebPreferencesStore):
(WebKit::WebPreferencesStore::encode):
(WebKit::WebPreferencesStore::decode):
* Shared/WebPreferencesStore.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetFrameFlatteningEnabled):
(WKPreferencesGetFrameFlatteningEnabled):
(WKPreferencesSetPluginsEnabled):
(WKPreferencesGetPluginsEnabled):
* UIProcess/API/C/WKPreferences.h:
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::setFrameFlatteningEnabled):
(WebKit::WebPreferences::frameFlatteningEnabled):
(WebKit::WebPreferences::setPluginsEnabled):
(WebKit::WebPreferences::pluginsEnabled):
* UIProcess/WebPreferences.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::preferencesDidChange):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68274 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 395b02c..9abec86 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,33 @@
+2010-09-24 Kenneth Rohde Christiansen <kenneth.christiansen at openbossa.org>
+
+ Reviewed by Sam Weinig.
+
+ Add WebKit2 C API for setting/getting frame flattening and plugin settings.
+ http://webkit.org/b/46477
+
+ NOTE: The plugin setting was partly done but there was no C API.
+
+ * Shared/WebPreferencesStore.cpp:
+ (WebKit::WebPreferencesStore::WebPreferencesStore):
+ (WebKit::WebPreferencesStore::encode):
+ (WebKit::WebPreferencesStore::decode):
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetFrameFlatteningEnabled):
+ (WKPreferencesGetFrameFlatteningEnabled):
+ (WKPreferencesSetPluginsEnabled):
+ (WKPreferencesGetPluginsEnabled):
+ * UIProcess/API/C/WKPreferences.h:
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::setFrameFlatteningEnabled):
+ (WebKit::WebPreferences::frameFlatteningEnabled):
+ (WebKit::WebPreferences::setPluginsEnabled):
+ (WebKit::WebPreferences::pluginsEnabled):
+ * UIProcess/WebPreferences.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::preferencesDidChange):
+
2010-09-24 Adam Roben <aroben at apple.com>
Add WebPageCreationParameters
diff --git a/WebKit2/Shared/WebPreferencesStore.cpp b/WebKit2/Shared/WebPreferencesStore.cpp
index e95026b..f2a6c67 100644
--- a/WebKit2/Shared/WebPreferencesStore.cpp
+++ b/WebKit2/Shared/WebPreferencesStore.cpp
@@ -39,6 +39,7 @@ WebPreferencesStore::WebPreferencesStore()
, offlineWebApplicationCacheEnabled(false)
, localStorageEnabled(true)
, xssAuditorEnabled(true)
+ , frameFlatteningEnabled(false)
, fontSmoothingLevel(FontSmoothingLevelMedium)
, minimumFontSize(1)
, minimumLogicalFontSize(9)
@@ -61,6 +62,7 @@ void WebPreferencesStore::encode(CoreIPC::ArgumentEncoder* encoder) const
encoder->encode(offlineWebApplicationCacheEnabled);
encoder->encode(localStorageEnabled);
encoder->encode(xssAuditorEnabled);
+ encoder->encode(frameFlatteningEnabled);
encoder->encode(fontSmoothingLevel);
encoder->encode(minimumFontSize);
encoder->encode(minimumLogicalFontSize);
@@ -88,6 +90,8 @@ bool WebPreferencesStore::decode(CoreIPC::ArgumentDecoder* decoder, WebPreferenc
return false;
if (!decoder->decode(s.xssAuditorEnabled))
return false;
+ if (!decoder->decode(s.frameFlatteningEnabled))
+ return false;
if (!decoder->decode(s.fontSmoothingLevel))
return false;
if (!decoder->decode(s.minimumFontSize))
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index dda6ebb..6b0caf4 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -48,6 +48,7 @@ struct WebPreferencesStore {
bool offlineWebApplicationCacheEnabled;
bool localStorageEnabled;
bool xssAuditorEnabled;
+ bool frameFlatteningEnabled;
uint32_t fontSmoothingLevel;
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index 91ac30f..59b3ea1 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -99,6 +99,26 @@ bool WKPreferencesGetXSSAuditorEnabled(WKPreferencesRef preferencesRef)
return toWK(preferencesRef)->xssAuditorEnabled();
}
+void WKPreferencesSetFrameFlatteningEnabled(WKPreferencesRef preferencesRef, bool frameFlatteningEnabled)
+{
+ toWK(preferencesRef)->setFrameFlatteningEnabled(frameFlatteningEnabled);
+}
+
+bool WKPreferencesGetFrameFlatteningEnabled(WKPreferencesRef preferencesRef)
+{
+ return toWK(preferencesRef)->frameFlatteningEnabled();
+}
+
+void WKPreferencesSetPluginsEnabled(WKPreferencesRef preferencesRef, bool pluginsEnabled)
+{
+ toWK(preferencesRef)->setPluginsEnabled(pluginsEnabled);
+}
+
+bool WKPreferencesGetPluginsEnabled(WKPreferencesRef preferencesRef)
+{
+ return toWK(preferencesRef)->pluginsEnabled();
+}
+
void WKPreferencesSetStandardFontFamily(WKPreferencesRef preferencesRef, WKStringRef family)
{
toWK(preferencesRef)->setStandardFontFamily(toWTFString(family));
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.h b/WebKit2/UIProcess/API/C/WKPreferences.h
index e117d51..1775f08 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -61,6 +61,14 @@ WK_EXPORT bool WKPreferencesGetLocalStorageEnabled(WKPreferencesRef preferences)
WK_EXPORT void WKPreferencesSetXSSAuditorEnabled(WKPreferencesRef preferences, bool xssAuditorEnabled);
WK_EXPORT bool WKPreferencesGetXSSAuditorEnabled(WKPreferencesRef preferences);
+// Defaults to false.
+WK_EXPORT void WKPreferencesSetFrameFlatteningEnabled(WKPreferencesRef preferences, bool frameFlatteningEnabled);
+WK_EXPORT bool WKPreferencesGetFrameFlatteningEnabled(WKPreferencesRef preferences);
+
+// Default to true.
+WK_EXPORT void WKPreferencesSetPluginsEnabled(WKPreferencesRef preferences, bool pluginsEnabled);
+WK_EXPORT bool WKPreferencesGetPluginsEnabled(WKPreferencesRef preferences);
+
WK_EXPORT void WKPreferencesSetStandardFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
WK_EXPORT WKStringRef WebPreferencesCopyStandardFontFamily(WKPreferencesRef preferencesRef);
diff --git a/WebKit2/UIProcess/WebPreferences.cpp b/WebKit2/UIProcess/WebPreferences.cpp
index 742f316..aee848c 100644
--- a/WebKit2/UIProcess/WebPreferences.cpp
+++ b/WebKit2/UIProcess/WebPreferences.cpp
@@ -119,6 +119,28 @@ bool WebPreferences::xssAuditorEnabled() const
return m_store.xssAuditorEnabled;
}
+void WebPreferences::setFrameFlatteningEnabled(bool b)
+{
+ m_store.frameFlatteningEnabled = b;
+ update();
+}
+
+bool WebPreferences::frameFlatteningEnabled() const
+{
+ return m_store.frameFlatteningEnabled;
+}
+
+void WebPreferences::setPluginsEnabled(bool b)
+{
+ m_store.pluginsEnabled = b;
+ update();
+}
+
+bool WebPreferences::pluginsEnabled() const
+{
+ return m_store.pluginsEnabled;
+}
+
void WebPreferences::setFontSmoothingLevel(FontSmoothingLevel level)
{
m_store.fontSmoothingLevel = level;
diff --git a/WebKit2/UIProcess/WebPreferences.h b/WebKit2/UIProcess/WebPreferences.h
index 2563f39..c18d586 100644
--- a/WebKit2/UIProcess/WebPreferences.h
+++ b/WebKit2/UIProcess/WebPreferences.h
@@ -73,6 +73,12 @@ public:
void setXSSAuditorEnabled(bool);
bool xssAuditorEnabled() const;
+ void setFrameFlatteningEnabled(bool);
+ bool frameFlatteningEnabled() const;
+
+ void setPluginsEnabled(bool);
+ bool pluginsEnabled() const;
+
void setFontSmoothingLevel(FontSmoothingLevel);
FontSmoothingLevel fontSmoothingLevel() const;
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 531bb3e..a239ed6 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -117,6 +117,7 @@ WebPage::WebPage(uint64_t pageID, const IntSize& viewSize, const WebPreferencesS
m_page->settings()->setOfflineWebApplicationCacheEnabled(store.offlineWebApplicationCacheEnabled);
m_page->settings()->setLocalStorageEnabled(store.localStorageEnabled);
m_page->settings()->setXSSAuditorEnabled(store.xssAuditorEnabled);
+ m_page->settings()->setFrameFlatteningEnabled(store.frameFlatteningEnabled);
m_page->settings()->setMinimumFontSize(store.minimumFontSize);
m_page->settings()->setMinimumLogicalFontSize(store.minimumLogicalFontSize);
m_page->settings()->setDefaultFontSize(store.defaultFontSize);
@@ -641,10 +642,11 @@ void WebPage::preferencesDidChange(const WebPreferencesStore& store)
m_page->settings()->setJavaScriptEnabled(store.javaScriptEnabled);
m_page->settings()->setLoadsImagesAutomatically(store.loadsImagesAutomatically);
+ m_page->settings()->setPluginsEnabled(store.pluginsEnabled);
m_page->settings()->setOfflineWebApplicationCacheEnabled(store.offlineWebApplicationCacheEnabled);
m_page->settings()->setLocalStorageEnabled(store.localStorageEnabled);
m_page->settings()->setXSSAuditorEnabled(store.xssAuditorEnabled);
-
+ m_page->settings()->setFrameFlatteningEnabled(store.frameFlatteningEnabled);
m_page->settings()->setStandardFontFamily(store.standardFontFamily);
m_page->settings()->setCursiveFontFamily(store.cursiveFontFamily);
m_page->settings()->setFantasyFontFamily(store.fantasyFontFamily);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list