[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:56 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ea471c00b46d1280733827a8dda92652bfb0210c
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 21:47:51 2010 +0000
Expose all WebKit2 C API preferences via the Qt API.
Reviewed by Andreas Kling.
Also rename a wrongly named C method (was using Web instead of WK).
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesCopyStandardFontFamily):
* UIProcess/API/C/WKPreferences.h:
* UIProcess/API/qt/qwkpreferences.cpp:
(QWKPreferences::setFontFamily):
(QWKPreferences::fontFamily):
(QWKPreferences::testAttribute):
(QWKPreferences::setAttribute):
* UIProcess/API/qt/qwkpreferences.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68291 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3bcb4dc..6fb36e6 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-24 Kenneth Rohde Christiansen <kenneth.christiansen at openbossa.org>
+
+ Reviewed by Andreas Kling.
+
+ Expose all WebKit2 C API preferences via the Qt API.
+
+ Also rename a wrongly named C method (was using Web instead of WK).
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesCopyStandardFontFamily):
+ * UIProcess/API/C/WKPreferences.h:
+ * UIProcess/API/qt/qwkpreferences.cpp:
+ (QWKPreferences::setFontFamily):
+ (QWKPreferences::fontFamily):
+ (QWKPreferences::testAttribute):
+ (QWKPreferences::setAttribute):
+ * UIProcess/API/qt/qwkpreferences.h:
+
2010-09-24 Anders Carlsson <andersca at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index 59b3ea1..774455e 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -124,7 +124,7 @@ void WKPreferencesSetStandardFontFamily(WKPreferencesRef preferencesRef, WKStrin
toWK(preferencesRef)->setStandardFontFamily(toWTFString(family));
}
-WKStringRef WebPreferencesCopyStandardFontFamily(WKPreferencesRef preferencesRef)
+WKStringRef WKPreferencesCopyStandardFontFamily(WKPreferencesRef preferencesRef)
{
return toCopiedRef(toWK(preferencesRef)->standardFontFamily());
}
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.h b/WebKit2/UIProcess/API/C/WKPreferences.h
index 1775f08..a7e6386 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -70,7 +70,7 @@ WK_EXPORT void WKPreferencesSetPluginsEnabled(WKPreferencesRef preferences, bool
WK_EXPORT bool WKPreferencesGetPluginsEnabled(WKPreferencesRef preferences);
WK_EXPORT void WKPreferencesSetStandardFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
-WK_EXPORT WKStringRef WebPreferencesCopyStandardFontFamily(WKPreferencesRef preferencesRef);
+WK_EXPORT WKStringRef WKPreferencesCopyStandardFontFamily(WKPreferencesRef preferencesRef);
WK_EXPORT void WKPreferencesSetFixedFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
WK_EXPORT WKStringRef WKPreferencesCopyFixedFontFamily(WKPreferencesRef preferencesRef);
diff --git a/WebKit2/UIProcess/API/qt/qwkpreferences.cpp b/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
index c3fb5bb..11271ff 100644
--- a/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
@@ -21,8 +21,11 @@
#include "WKContext.h"
#include "WKPreferences.h"
+#include "WKStringQt.h"
+#include "WKRetainPtr.h"
#include "qwkpreferences_p.h"
+
QWKPreferences* QWKPreferencesPrivate::createPreferences(WKContextRef contextRef)
{
QWKPreferences* prefs = new QWKPreferences;
@@ -56,6 +59,64 @@ QWKPreferences::~QWKPreferences()
delete d;
}
+void QWKPreferences::setFontFamily(FontFamily which, const QString& family)
+{
+ switch (which) {
+ case StandardFont:
+ WKPreferencesSetStandardFontFamily(d->ref, WKStringCreateWithQString(family));
+ break;
+ case FixedFont:
+ WKPreferencesSetFixedFontFamily(d->ref, WKStringCreateWithQString(family));
+ break;
+ case SerifFont:
+ WKPreferencesSetSerifFontFamily(d->ref, WKStringCreateWithQString(family));
+ break;
+ case SansSerifFont:
+ WKPreferencesSetSansSerifFontFamily(d->ref, WKStringCreateWithQString(family));
+ break;
+ case CursiveFont:
+ WKPreferencesSetCursiveFontFamily(d->ref, WKStringCreateWithQString(family));
+ break;
+ case FantasyFont:
+ WKPreferencesSetFantasyFontFamily(d->ref, WKStringCreateWithQString(family));
+ break;
+ default:
+ break;
+ }
+}
+
+QString QWKPreferences::fontFamily(FontFamily which) const
+{
+ switch (which) {
+ case StandardFont: {
+ WKRetainPtr<WKStringRef> stringRef(AdoptWK, WKPreferencesCopyStandardFontFamily(d->ref));
+ return WKStringCopyQString(stringRef.get());
+ }
+ case FixedFont: {
+ WKRetainPtr<WKStringRef> stringRef(AdoptWK, WKPreferencesCopyFixedFontFamily(d->ref));
+ return WKStringCopyQString(stringRef.get());
+ }
+ case SerifFont: {
+ WKRetainPtr<WKStringRef> stringRef(AdoptWK, WKPreferencesCopySerifFontFamily(d->ref));
+ return WKStringCopyQString(stringRef.get());
+ }
+ case SansSerifFont: {
+ WKRetainPtr<WKStringRef> stringRef(AdoptWK, WKPreferencesCopySansSerifFontFamily(d->ref));
+ return WKStringCopyQString(stringRef.get());
+ }
+ case CursiveFont: {
+ WKRetainPtr<WKStringRef> stringRef(AdoptWK, WKPreferencesCopyCursiveFontFamily(d->ref));
+ return WKStringCopyQString(stringRef.get());
+ }
+ case FantasyFont: {
+ WKRetainPtr<WKStringRef> stringRef(AdoptWK, WKPreferencesCopyFantasyFontFamily(d->ref));
+ return WKStringCopyQString(stringRef.get());
+ }
+ default:
+ return QString();
+ }
+}
+
bool QWKPreferences::testAttribute(WebAttribute attr) const
{
switch (attr) {
@@ -63,12 +124,16 @@ bool QWKPreferences::testAttribute(WebAttribute attr) const
return WKPreferencesGetLoadsImagesAutomatically(d->ref);
case JavascriptEnabled:
return WKPreferencesGetJavaScriptEnabled(d->ref);
+ case PluginsEnabled:
+ return WKPreferencesGetPluginsEnabled(d->ref);
case OfflineWebApplicationCacheEnabled:
return WKPreferencesGetOfflineWebApplicationCacheEnabled(d->ref);
case LocalStorageEnabled:
return WKPreferencesGetLocalStorageEnabled(d->ref);
case XSSAuditingEnabled:
return WKPreferencesGetXSSAuditorEnabled(d->ref);
+ case FrameFlatteningEnabled:
+ return WKPreferencesGetFrameFlatteningEnabled(d->ref);
default:
ASSERT_NOT_REACHED();
return false;
@@ -79,15 +144,26 @@ void QWKPreferences::setAttribute(WebAttribute attr, bool on)
{
switch (attr) {
case AutoLoadImages:
- return WKPreferencesSetLoadsImagesAutomatically(d->ref, on);
+ WKPreferencesSetLoadsImagesAutomatically(d->ref, on);
+ break;
case JavascriptEnabled:
- return WKPreferencesSetJavaScriptEnabled(d->ref, on);
+ WKPreferencesSetJavaScriptEnabled(d->ref, on);
+ break;
+ case PluginsEnabled:
+ WKPreferencesSetPluginsEnabled(d->ref, on);
+ break;
case OfflineWebApplicationCacheEnabled:
- return WKPreferencesSetOfflineWebApplicationCacheEnabled(d->ref, on);
+ WKPreferencesSetOfflineWebApplicationCacheEnabled(d->ref, on);
+ break;
case LocalStorageEnabled:
- return WKPreferencesSetLocalStorageEnabled(d->ref, on);
+ WKPreferencesSetLocalStorageEnabled(d->ref, on);
+ break;
case XSSAuditingEnabled:
- return WKPreferencesSetXSSAuditorEnabled(d->ref, on);
+ WKPreferencesSetXSSAuditorEnabled(d->ref, on);
+ break;
+ case FrameFlatteningEnabled:
+ WKPreferencesSetFrameFlatteningEnabled(d->ref, on);
+ break;
default:
ASSERT_NOT_REACHED();
}
diff --git a/WebKit2/UIProcess/API/qt/qwkpreferences.h b/WebKit2/UIProcess/API/qt/qwkpreferences.h
index 40f5b18..7fae643 100644
--- a/WebKit2/UIProcess/API/qt/qwkpreferences.h
+++ b/WebKit2/UIProcess/API/qt/qwkpreferences.h
@@ -27,16 +27,30 @@ class QWKPreferencesPrivate;
class QWEBKIT_EXPORT QWKPreferences {
public:
+ enum FontFamily {
+ StandardFont,
+ FixedFont,
+ SerifFont,
+ SansSerifFont,
+ CursiveFont,
+ FantasyFont
+ };
+
enum WebAttribute {
AutoLoadImages,
JavascriptEnabled,
+ PluginsEnabled,
OfflineWebApplicationCacheEnabled,
LocalStorageEnabled,
- XSSAuditingEnabled
+ XSSAuditingEnabled,
+ FrameFlatteningEnabled
};
static QWKPreferences* sharedPreferences();
+ void setFontFamily(FontFamily which, const QString& family);
+ QString fontFamily(FontFamily which) const;
+
void setAttribute(WebAttribute attr, bool on);
bool testAttribute(WebAttribute attr) const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list