[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:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b725f12fab62cbedaed50349c4f71dae7f37cab1
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 16:01:16 2010 +0000
Add WebKit2 C API for setting the font families.
https://bugs.webkit.org/show_bug.cgi?id=46408
Reviewed by Sam Weinig.
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetStandardFontFamily):
(WebPreferencesCopyStandardFontFamily):
(WKPreferencesSetFixedFontFamily):
(WKPreferencesCopyFixedFontFamily):
(WKPreferencesSetSerifFontFamily):
(WKPreferencesCopySerifFontFamily):
(WKPreferencesSetSansSerifFontFamily):
(WKPreferencesCopySansSerifFontFamily):
(WKPreferencesSetCursiveFontFamily):
(WKPreferencesCopyCursiveFontFamily):
(WKPreferencesSetFantasyFontFamily):
(WKPreferencesCopyFantasyFontFamily):
* UIProcess/API/C/WKPreferences.h:
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::setStandardFontFamily):
(WebKit::WebPreferences::standardFontFamily):
(WebKit::WebPreferences::setFixedFontFamily):
(WebKit::WebPreferences::fixedFontFamily):
(WebKit::WebPreferences::setSerifFontFamily):
(WebKit::WebPreferences::serifFontFamily):
(WebKit::WebPreferences::setSansSerifFontFamily):
(WebKit::WebPreferences::sansSerifFontFamily):
(WebKit::WebPreferences::setCursiveFontFamily):
(WebKit::WebPreferences::cursiveFontFamily):
(WebKit::WebPreferences::setFantasyFontFamily):
(WebKit::WebPreferences::fantasyFontFamily):
* UIProcess/WebPreferences.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::preferencesDidChange):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f890a6c..3d1b809 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,41 @@
+2010-09-23 Kenneth Rohde Christiansen <kenneth.christiansen at openbossa.org>
+
+ Reviewed by Sam Weinig.
+
+ Add WebKit2 C API for setting the font families.
+ https://bugs.webkit.org/show_bug.cgi?id=46408
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetStandardFontFamily):
+ (WebPreferencesCopyStandardFontFamily):
+ (WKPreferencesSetFixedFontFamily):
+ (WKPreferencesCopyFixedFontFamily):
+ (WKPreferencesSetSerifFontFamily):
+ (WKPreferencesCopySerifFontFamily):
+ (WKPreferencesSetSansSerifFontFamily):
+ (WKPreferencesCopySansSerifFontFamily):
+ (WKPreferencesSetCursiveFontFamily):
+ (WKPreferencesCopyCursiveFontFamily):
+ (WKPreferencesSetFantasyFontFamily):
+ (WKPreferencesCopyFantasyFontFamily):
+ * UIProcess/API/C/WKPreferences.h:
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::setStandardFontFamily):
+ (WebKit::WebPreferences::standardFontFamily):
+ (WebKit::WebPreferences::setFixedFontFamily):
+ (WebKit::WebPreferences::fixedFontFamily):
+ (WebKit::WebPreferences::setSerifFontFamily):
+ (WebKit::WebPreferences::serifFontFamily):
+ (WebKit::WebPreferences::setSansSerifFontFamily):
+ (WebKit::WebPreferences::sansSerifFontFamily):
+ (WebKit::WebPreferences::setCursiveFontFamily):
+ (WebKit::WebPreferences::cursiveFontFamily):
+ (WebKit::WebPreferences::setFantasyFontFamily):
+ (WebKit::WebPreferences::fantasyFontFamily):
+ * UIProcess/WebPreferences.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::preferencesDidChange):
+
2010-09-23 Csaba Osztrogonác <ossy at webkit.org>
Unreviewed buildfix after r68220 on WebKit2.
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index 3f40174..91ac30f 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -98,3 +98,63 @@ bool WKPreferencesGetXSSAuditorEnabled(WKPreferencesRef preferencesRef)
{
return toWK(preferencesRef)->xssAuditorEnabled();
}
+
+void WKPreferencesSetStandardFontFamily(WKPreferencesRef preferencesRef, WKStringRef family)
+{
+ toWK(preferencesRef)->setStandardFontFamily(toWTFString(family));
+}
+
+WKStringRef WebPreferencesCopyStandardFontFamily(WKPreferencesRef preferencesRef)
+{
+ return toCopiedRef(toWK(preferencesRef)->standardFontFamily());
+}
+
+void WKPreferencesSetFixedFontFamily(WKPreferencesRef preferencesRef, WKStringRef family)
+{
+ toWK(preferencesRef)->setFixedFontFamily(toWTFString(family));
+}
+
+WKStringRef WKPreferencesCopyFixedFontFamily(WKPreferencesRef preferencesRef)
+{
+ return toCopiedRef(toWK(preferencesRef)->fixedFontFamily());
+}
+
+void WKPreferencesSetSerifFontFamily(WKPreferencesRef preferencesRef, WKStringRef family)
+{
+ toWK(preferencesRef)->setSerifFontFamily(toWTFString(family));
+}
+
+WKStringRef WKPreferencesCopySerifFontFamily(WKPreferencesRef preferencesRef)
+{
+ return toCopiedRef(toWK(preferencesRef)->serifFontFamily());
+}
+
+void WKPreferencesSetSansSerifFontFamily(WKPreferencesRef preferencesRef, WKStringRef family)
+{
+ toWK(preferencesRef)->setSansSerifFontFamily(toWTFString(family));
+}
+
+WKStringRef WKPreferencesCopySansSerifFontFamily(WKPreferencesRef preferencesRef)
+{
+ return toCopiedRef(toWK(preferencesRef)->sansSerifFontFamily());
+}
+
+void WKPreferencesSetCursiveFontFamily(WKPreferencesRef preferencesRef, WKStringRef family)
+{
+ toWK(preferencesRef)->setCursiveFontFamily(toWTFString(family));
+}
+
+WKStringRef WKPreferencesCopyCursiveFontFamily(WKPreferencesRef preferencesRef)
+{
+ return toCopiedRef(toWK(preferencesRef)->cursiveFontFamily());
+}
+
+void WKPreferencesSetFantasyFontFamily(WKPreferencesRef preferencesRef, WKStringRef family)
+{
+ toWK(preferencesRef)->setFantasyFontFamily(toWTFString(family));
+}
+
+WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef preferencesRef)
+{
+ return toCopiedRef(toWK(preferencesRef)->fantasyFontFamily());
+}
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.h b/WebKit2/UIProcess/API/C/WKPreferences.h
index 7fc6891..e117d51 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -61,6 +61,24 @@ WK_EXPORT bool WKPreferencesGetLocalStorageEnabled(WKPreferencesRef preferences)
WK_EXPORT void WKPreferencesSetXSSAuditorEnabled(WKPreferencesRef preferences, bool xssAuditorEnabled);
WK_EXPORT bool WKPreferencesGetXSSAuditorEnabled(WKPreferencesRef preferences);
+WK_EXPORT void WKPreferencesSetStandardFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
+WK_EXPORT WKStringRef WebPreferencesCopyStandardFontFamily(WKPreferencesRef preferencesRef);
+
+WK_EXPORT void WKPreferencesSetFixedFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
+WK_EXPORT WKStringRef WKPreferencesCopyFixedFontFamily(WKPreferencesRef preferencesRef);
+
+WK_EXPORT void WKPreferencesSetSerifFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
+WK_EXPORT WKStringRef WKPreferencesCopySerifFontFamily(WKPreferencesRef preferencesRef);
+
+WK_EXPORT void WKPreferencesSetSansSerifFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
+WK_EXPORT WKStringRef WKPreferencesCopySansSerifFontFamily(WKPreferencesRef preferencesRef);
+
+WK_EXPORT void WKPreferencesSetCursiveFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
+WK_EXPORT WKStringRef WKPreferencesCopyCursiveFontFamily(WKPreferencesRef preferencesRef);
+
+WK_EXPORT void WKPreferencesSetFantasyFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
+WK_EXPORT WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef preferencesRef);
+
#ifdef __cplusplus
}
#endif
diff --git a/WebKit2/UIProcess/WebPreferences.cpp b/WebKit2/UIProcess/WebPreferences.cpp
index 752fba0..742f316 100644
--- a/WebKit2/UIProcess/WebPreferences.cpp
+++ b/WebKit2/UIProcess/WebPreferences.cpp
@@ -91,7 +91,7 @@ void WebPreferences::setOfflineWebApplicationCacheEnabled(bool b)
m_store.offlineWebApplicationCacheEnabled = b;
update();
}
-
+
bool WebPreferences::offlineWebApplicationCacheEnabled() const
{
return m_store.offlineWebApplicationCacheEnabled;
@@ -130,5 +130,71 @@ FontSmoothingLevel WebPreferences::fontSmoothingLevel() const
return static_cast<FontSmoothingLevel>(m_store.fontSmoothingLevel);
}
+void WebPreferences::setStandardFontFamily(const String& family)
+{
+ m_store.standardFontFamily = family;
+ update();
+}
+
+const String& WebPreferences::standardFontFamily() const
+{
+ return m_store.standardFontFamily;
+}
+
+void WebPreferences::setFixedFontFamily(const String& family)
+{
+ m_store.fixedFontFamily = family;
+ update();
+}
+
+const String& WebPreferences::fixedFontFamily() const
+{
+ return m_store.fixedFontFamily;
+}
+
+void WebPreferences::setSerifFontFamily(const String& family)
+{
+ m_store.serifFontFamily = family;
+ update();
+}
+
+const String& WebPreferences::serifFontFamily() const
+{
+ return m_store.serifFontFamily;
+}
+
+void WebPreferences::setSansSerifFontFamily(const String& family)
+{
+ m_store.sansSerifFontFamily = family;
+ update();
+}
+
+const String& WebPreferences::sansSerifFontFamily() const
+{
+ return m_store.sansSerifFontFamily;
+}
+
+void WebPreferences::setCursiveFontFamily(const String& family)
+{
+ m_store.cursiveFontFamily = family;
+ update();
+}
+
+const String& WebPreferences::cursiveFontFamily() const
+{
+ return m_store.cursiveFontFamily;
+}
+
+void WebPreferences::setFantasyFontFamily(const String& family)
+{
+ m_store.fantasyFontFamily = family;
+ update();
+}
+
+const String& WebPreferences::fantasyFontFamily() const
+{
+ return m_store.fantasyFontFamily;
+}
+
} // namespace WebKit
diff --git a/WebKit2/UIProcess/WebPreferences.h b/WebKit2/UIProcess/WebPreferences.h
index baeed21..2563f39 100644
--- a/WebKit2/UIProcess/WebPreferences.h
+++ b/WebKit2/UIProcess/WebPreferences.h
@@ -76,6 +76,24 @@ public:
void setFontSmoothingLevel(FontSmoothingLevel);
FontSmoothingLevel fontSmoothingLevel() const;
+ void setStandardFontFamily(const String&);
+ const String& standardFontFamily() const;
+
+ void setFixedFontFamily(const String&);
+ const String& fixedFontFamily() const;
+
+ void setSerifFontFamily(const String&);
+ const String& serifFontFamily() const;
+
+ void setSansSerifFontFamily(const String&);
+ const String& sansSerifFontFamily() const;
+
+ void setCursiveFontFamily(const String&);
+ const String& cursiveFontFamily() const;
+
+ void setFantasyFontFamily(const String&);
+ const String& fantasyFontFamily() const;
+
private:
WebPreferences();
WebPreferences(WebPreferences*);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 988fb31..15820e7 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -645,6 +645,13 @@ void WebPage::preferencesDidChange(const WebPreferencesStore& store)
m_page->settings()->setLocalStorageEnabled(store.localStorageEnabled);
m_page->settings()->setXSSAuditorEnabled(store.xssAuditorEnabled);
+ m_page->settings()->setStandardFontFamily(store.standardFontFamily);
+ m_page->settings()->setCursiveFontFamily(store.cursiveFontFamily);
+ m_page->settings()->setFantasyFontFamily(store.fantasyFontFamily);
+ m_page->settings()->setFixedFontFamily(store.fixedFontFamily);
+ m_page->settings()->setSansSerifFontFamily(store.sansSerifFontFamily);
+ m_page->settings()->setSerifFontFamily(store.serifFontFamily);
+
platformPreferencesDidChange(store);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list