Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)

New snapshot that fixes build without QtWidgets

1 files changed, 190 insertions, 221 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
index 17d4c881b..005aaae78 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
@@ -33,14 +33,17 @@
 
 #include "WebKitPrivate.h"
 #include "WebKitSettingsPrivate.h"
+#include "WebPageGroup.h"
 #include "WebPageProxy.h"
 #include "WebPreferences.h"
 #include <WebCore/UserAgentGtk.h>
 #include <glib/gi18n-lib.h>
 #include <wtf/text/CString.h>
 
+using namespace WebKit;
+
 struct _WebKitSettingsPrivate {
-    WKRetainPtr<WKPreferencesRef> preferences;
+    RefPtr<WebPreferences> preferences;
     CString defaultFontFamily;
     CString monospaceFontFamily;
     CString serifFontFamily;
@@ -959,7 +962,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
                                                          readWriteConstructParamFlags));
 
     /**
-     * WebKitSettings:media-playback-allows-inline
+     * WebKitSettings:media-playback-allows-inline:
      *
      * Whether media playback is full-screen only or inline playback is allowed.
      * This is %TRUE by default, so media playback can be inline. Setting it to
@@ -1069,42 +1072,23 @@ static void webkit_settings_init(WebKitSettings* settings)
     settings->priv = priv;
     new (priv) WebKitSettingsPrivate();
 
-    priv->preferences = adoptWK(WKPreferencesCreate());
-
-    WKRetainPtr<WKStringRef> defaultFontFamilyRef = adoptWK(WKPreferencesCopyStandardFontFamily(priv->preferences.get()));
-    priv->defaultFontFamily =  WebKit::toImpl(defaultFontFamilyRef.get())->string().utf8();
-
-    WKRetainPtr<WKStringRef> monospaceFontFamilyRef = adoptWK(WKPreferencesCopyFixedFontFamily(priv->preferences.get()));
-    priv->monospaceFontFamily = WebKit::toImpl(monospaceFontFamilyRef.get())->string().utf8();
-
-    WKRetainPtr<WKStringRef> serifFontFamilyRef = adoptWK(WKPreferencesCopySerifFontFamily(priv->preferences.get()));
-    priv->serifFontFamily = WebKit::toImpl(serifFontFamilyRef.get())->string().utf8();
-
-    WKRetainPtr<WKStringRef> sansSerifFontFamilyRef = adoptWK(WKPreferencesCopySansSerifFontFamily(priv->preferences.get()));
-    priv->sansSerifFontFamily = WebKit::toImpl(sansSerifFontFamilyRef.get())->string().utf8();
-
-    WKRetainPtr<WKStringRef> cursiveFontFamilyRef = adoptWK(WKPreferencesCopyCursiveFontFamily(priv->preferences.get()));
-    priv->cursiveFontFamily = WebKit::toImpl(cursiveFontFamilyRef.get())->string().utf8();
-
-    WKRetainPtr<WKStringRef> fantasyFontFamilyRef = adoptWK(WKPreferencesCopyFantasyFontFamily(priv->preferences.get()));
-    priv->fantasyFontFamily = WebKit::toImpl(fantasyFontFamilyRef.get())->string().utf8();
-
-    WKRetainPtr<WKStringRef> pictographFontFamilyRef = adoptWK(WKPreferencesCopyPictographFontFamily(priv->preferences.get()));
-    priv->pictographFontFamily = WebKit::toImpl(pictographFontFamilyRef.get())->string().utf8();
+    priv->preferences = WebPreferences::create();
+    priv->defaultFontFamily = priv->preferences->standardFontFamily().utf8();
+    priv->monospaceFontFamily = priv->preferences->fixedFontFamily().utf8();
+    priv->serifFontFamily = priv->preferences->serifFontFamily().utf8();
+    priv->sansSerifFontFamily = priv->preferences->sansSerifFontFamily().utf8();
+    priv->cursiveFontFamily = priv->preferences->cursiveFontFamily().utf8();
+    priv->fantasyFontFamily = priv->preferences->fantasyFontFamily().utf8();
+    priv->pictographFontFamily = priv->preferences->pictographFontFamily().utf8();
+    priv->defaultCharset = priv->preferences->defaultTextEncodingName().utf8();
 
-    WKRetainPtr<WKStringRef> defaultCharsetRef = adoptWK(WKPreferencesCopyDefaultTextEncodingName(priv->preferences.get()));
-    priv->defaultCharset = WebKit::toImpl(defaultCharsetRef.get())->string().utf8();
 }
 
-void webkitSettingsAttachSettingsToPage(WebKitSettings* settings, WKPageRef wkPage)
+void webkitSettingsAttachSettingsToPage(WebKitSettings* settings, WebPageProxy* page)
 {
-    WebKitSettingsPrivate* priv = settings->priv;
-    WKPageGroupSetPreferences(WKPageGetPageGroup(wkPage), priv->preferences.get());
-    WebKit::toImpl(wkPage)->setCanRunModal(priv->allowModalDialogs);
-
-    ASSERT(!priv->userAgent.isNull());
-    WKRetainPtr<WKStringRef> userAgent = adoptWK(WKStringCreateWithUTF8CString(priv->userAgent.data()));
-    WKPageSetCustomUserAgent(wkPage, userAgent.get());
+    page->pageGroup()->setPreferences(settings->priv->preferences.get());
+    page->setCanRunModal(settings->priv->allowModalDialogs);
+    page->setCustomUserAgent(String::fromUTF8(settings->priv->userAgent.data()));
 }
 
 /**
@@ -1153,7 +1137,7 @@ gboolean webkit_settings_get_enable_javascript(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetJavaScriptEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->javaScriptEnabled();
 }
 
 /**
@@ -1168,11 +1152,11 @@ void webkit_settings_set_enable_javascript(WebKitSettings* settings, gboolean en
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetJavaScriptEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->javaScriptEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetJavaScriptEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setJavaScriptEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-javascript");
 }
 
@@ -1188,7 +1172,7 @@ gboolean webkit_settings_get_auto_load_images(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetLoadsImagesAutomatically(settings->priv->preferences.get());
+    return settings->priv->preferences->loadsImagesAutomatically();
 }
 
 /**
@@ -1203,11 +1187,11 @@ void webkit_settings_set_auto_load_images(WebKitSettings* settings, gboolean ena
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetLoadsImagesAutomatically(priv->preferences.get());
+    bool currentValue = priv->preferences->loadsImagesAutomatically();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetLoadsImagesAutomatically(priv->preferences.get(), enabled);
+    priv->preferences->setLoadsImagesAutomatically(enabled);
     g_object_notify(G_OBJECT(settings), "auto-load-images");
 }
 
@@ -1223,7 +1207,7 @@ gboolean webkit_settings_get_load_icons_ignoring_image_load_setting(WebKitSettin
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetLoadsSiteIconsIgnoringImageLoadingPreference(settings->priv->preferences.get());
+    return settings->priv->preferences->loadsSiteIconsIgnoringImageLoadingPreference();
 }
 
 /**
@@ -1238,11 +1222,11 @@ void webkit_settings_set_load_icons_ignoring_image_load_setting(WebKitSettings*
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetLoadsSiteIconsIgnoringImageLoadingPreference(priv->preferences.get());
+    bool currentValue = priv->preferences->loadsSiteIconsIgnoringImageLoadingPreference();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetLoadsSiteIconsIgnoringImageLoadingPreference(priv->preferences.get(), enabled);
+    priv->preferences->setLoadsSiteIconsIgnoringImageLoadingPreference(enabled);
     g_object_notify(G_OBJECT(settings), "load-icons-ignoring-image-load-setting");
 }
 
@@ -1258,7 +1242,7 @@ gboolean webkit_settings_get_enable_offline_web_application_cache(WebKitSettings
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetOfflineWebApplicationCacheEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->offlineWebApplicationCacheEnabled();
 }
 
 /**
@@ -1273,11 +1257,11 @@ void webkit_settings_set_enable_offline_web_application_cache(WebKitSettings* se
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetOfflineWebApplicationCacheEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->offlineWebApplicationCacheEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetOfflineWebApplicationCacheEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setOfflineWebApplicationCacheEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-offline-web-application-cache");
 }
 
@@ -1293,7 +1277,7 @@ gboolean webkit_settings_get_enable_html5_local_storage(WebKitSettings* settings
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetLocalStorageEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->localStorageEnabled();
 }
 
 /**
@@ -1308,11 +1292,11 @@ void webkit_settings_set_enable_html5_local_storage(WebKitSettings* settings, gb
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetLocalStorageEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->localStorageEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetLocalStorageEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setLocalStorageEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-html5-local-storage");
 }
 
@@ -1328,7 +1312,7 @@ gboolean webkit_settings_get_enable_html5_database(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetDatabasesEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->databasesEnabled();
 }
 
 /**
@@ -1343,11 +1327,11 @@ void webkit_settings_set_enable_html5_database(WebKitSettings* settings, gboolea
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetDatabasesEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->databasesEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetDatabasesEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setDatabasesEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-html5-database");
 }
 
@@ -1363,7 +1347,7 @@ gboolean webkit_settings_get_enable_xss_auditor(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetXSSAuditorEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->xssAuditorEnabled();
 }
 
 /**
@@ -1378,11 +1362,11 @@ void webkit_settings_set_enable_xss_auditor(WebKitSettings* settings, gboolean e
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetXSSAuditorEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->xssAuditorEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetXSSAuditorEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setXSSAuditorEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-xss-auditor");
 }
 
@@ -1399,7 +1383,7 @@ gboolean webkit_settings_get_enable_frame_flattening(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetFrameFlatteningEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->frameFlatteningEnabled();
 }
 
 /**
@@ -1414,11 +1398,11 @@ void webkit_settings_set_enable_frame_flattening(WebKitSettings* settings, gbool
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetFrameFlatteningEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->frameFlatteningEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetFrameFlatteningEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setFrameFlatteningEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-frame-flattening");
 }
 
@@ -1434,7 +1418,7 @@ gboolean webkit_settings_get_enable_plugins(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetPluginsEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->pluginsEnabled();
 }
 
 /**
@@ -1449,11 +1433,11 @@ void webkit_settings_set_enable_plugins(WebKitSettings* settings, gboolean enabl
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetPluginsEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->pluginsEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetPluginsEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setPluginsEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-plugins");
 }
 
@@ -1469,7 +1453,7 @@ gboolean webkit_settings_get_enable_java(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetJavaEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->javaEnabled();
 }
 
 /**
@@ -1484,11 +1468,11 @@ void webkit_settings_set_enable_java(WebKitSettings* settings, gboolean enabled)
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetJavaEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->javaEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetJavaEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setJavaEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-java");
 }
 
@@ -1504,7 +1488,7 @@ gboolean webkit_settings_get_javascript_can_open_windows_automatically(WebKitSet
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(settings->priv->preferences.get());
+    return settings->priv->preferences->javaScriptCanOpenWindowsAutomatically();
 }
 
 /**
@@ -1519,11 +1503,11 @@ void webkit_settings_set_javascript_can_open_windows_automatically(WebKitSetting
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(priv->preferences.get());
+    bool currentValue = priv->preferences->javaScriptCanOpenWindowsAutomatically();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetJavaScriptCanOpenWindowsAutomatically(priv->preferences.get(), enabled);
+    priv->preferences->setJavaScriptCanOpenWindowsAutomatically(enabled);
     g_object_notify(G_OBJECT(settings), "javascript-can-open-windows-automatically");
 }
 
@@ -1539,7 +1523,7 @@ gboolean webkit_settings_get_enable_hyperlink_auditing(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetHyperlinkAuditingEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->hyperlinkAuditingEnabled();
 }
 
 /**
@@ -1554,11 +1538,11 @@ void webkit_settings_set_enable_hyperlink_auditing(WebKitSettings* settings, gbo
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetHyperlinkAuditingEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->hyperlinkAuditingEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetHyperlinkAuditingEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setHyperlinkAuditingEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-hyperlink-auditing");
 }
 
@@ -1593,10 +1577,9 @@ void webkit_settings_set_default_font_family(WebKitSettings* settings, const gch
     if (!g_strcmp0(priv->defaultFontFamily.data(), defaultFontFamily))
         return;
 
-    WKRetainPtr<WKStringRef> standardFontFamilyRef = adoptWK(WKStringCreateWithUTF8CString(defaultFontFamily));
-    WKPreferencesSetStandardFontFamily(priv->preferences.get(), standardFontFamilyRef.get());
-    priv->defaultFontFamily = WebKit::toImpl(standardFontFamilyRef.get())->string().utf8();
-
+    String standardFontFamily = String::fromUTF8(defaultFontFamily);
+    priv->preferences->setStandardFontFamily(standardFontFamily);
+    priv->defaultFontFamily = standardFontFamily.utf8();
     g_object_notify(G_OBJECT(settings), "default-font-family");
 }
 
@@ -1631,10 +1614,9 @@ void webkit_settings_set_monospace_font_family(WebKitSettings* settings, const g
     if (!g_strcmp0(priv->monospaceFontFamily.data(), monospaceFontFamily))
         return;
 
-    WKRetainPtr<WKStringRef> fixedFontFamilyRef = adoptWK(WKStringCreateWithUTF8CString(monospaceFontFamily));
-    WKPreferencesSetFixedFontFamily(priv->preferences.get(), fixedFontFamilyRef.get());
-    priv->monospaceFontFamily = WebKit::toImpl(fixedFontFamilyRef.get())->string().utf8();
-
+    String fixedFontFamily = String::fromUTF8(monospaceFontFamily);
+    priv->preferences->setFixedFontFamily(fixedFontFamily);
+    priv->monospaceFontFamily = fixedFontFamily.utf8();
     g_object_notify(G_OBJECT(settings), "monospace-font-family");
 }
 
@@ -1669,10 +1651,9 @@ void webkit_settings_set_serif_font_family(WebKitSettings* settings, const gchar
     if (!g_strcmp0(priv->serifFontFamily.data(), serifFontFamily))
         return;
 
-    WKRetainPtr<WKStringRef> serifFontFamilyRef = adoptWK(WKStringCreateWithUTF8CString(serifFontFamily));
-    WKPreferencesSetSerifFontFamily(priv->preferences.get(), serifFontFamilyRef.get());
-    priv->serifFontFamily = WebKit::toImpl(serifFontFamilyRef.get())->string().utf8();
-
+    String serifFontFamilyString = String::fromUTF8(serifFontFamily);
+    priv->preferences->setSerifFontFamily(serifFontFamilyString);
+    priv->serifFontFamily = serifFontFamilyString.utf8();
     g_object_notify(G_OBJECT(settings), "serif-font-family");
 }
 
@@ -1707,10 +1688,9 @@ void webkit_settings_set_sans_serif_font_family(WebKitSettings* settings, const
     if (!g_strcmp0(priv->sansSerifFontFamily.data(), sansSerifFontFamily))
         return;
 
-    WKRetainPtr<WKStringRef> sansSerifFontFamilyRef = adoptWK(WKStringCreateWithUTF8CString(sansSerifFontFamily));
-    WKPreferencesSetSansSerifFontFamily(priv->preferences.get(), sansSerifFontFamilyRef.get());
-    priv->sansSerifFontFamily = WebKit::toImpl(sansSerifFontFamilyRef.get())->string().utf8();
-
+    String sansSerifFontFamilyString = String::fromUTF8(sansSerifFontFamily);
+    priv->preferences->setSansSerifFontFamily(sansSerifFontFamilyString);
+    priv->sansSerifFontFamily = sansSerifFontFamilyString.utf8();
     g_object_notify(G_OBJECT(settings), "sans-serif-font-family");
 }
 
@@ -1745,10 +1725,9 @@ void webkit_settings_set_cursive_font_family(WebKitSettings* settings, const gch
     if (!g_strcmp0(priv->cursiveFontFamily.data(), cursiveFontFamily))
         return;
 
-    WKRetainPtr<WKStringRef> cursiveFontFamilyRef = adoptWK(WKStringCreateWithUTF8CString(cursiveFontFamily));
-    WKPreferencesSetCursiveFontFamily(priv->preferences.get(), cursiveFontFamilyRef.get());
-    priv->cursiveFontFamily = WebKit::toImpl(cursiveFontFamilyRef.get())->string().utf8();
-
+    String cursiveFontFamilyString = String::fromUTF8(cursiveFontFamily);
+    priv->preferences->setCursiveFontFamily(cursiveFontFamilyString);
+    priv->cursiveFontFamily = cursiveFontFamilyString.utf8();
     g_object_notify(G_OBJECT(settings), "cursive-font-family");
 }
 
@@ -1783,10 +1762,9 @@ void webkit_settings_set_fantasy_font_family(WebKitSettings* settings, const gch
     if (!g_strcmp0(priv->fantasyFontFamily.data(), fantasyFontFamily))
         return;
 
-    WKRetainPtr<WKStringRef> fantasyFontFamilyRef = adoptWK(WKStringCreateWithUTF8CString(fantasyFontFamily));
-    WKPreferencesSetFantasyFontFamily(priv->preferences.get(), fantasyFontFamilyRef.get());
-    priv->fantasyFontFamily = WebKit::toImpl(fantasyFontFamilyRef.get())->string().utf8();
-
+    String fantasyFontFamilyString = String::fromUTF8(fantasyFontFamily);
+    priv->preferences->setFantasyFontFamily(fantasyFontFamilyString);
+    priv->fantasyFontFamily = fantasyFontFamilyString.utf8();
     g_object_notify(G_OBJECT(settings), "fantasy-font-family");
 }
 
@@ -1821,10 +1799,9 @@ void webkit_settings_set_pictograph_font_family(WebKitSettings* settings, const
     if (!g_strcmp0(priv->pictographFontFamily.data(), pictographFontFamily))
         return;
 
-    WKRetainPtr<WKStringRef> pictographFontFamilyRef = adoptWK(WKStringCreateWithUTF8CString(pictographFontFamily));
-    WKPreferencesSetPictographFontFamily(priv->preferences.get(), pictographFontFamilyRef.get());
-    priv->pictographFontFamily = WebKit::toImpl(pictographFontFamilyRef.get())->string().utf8();
-
+    String pictographFontFamilyString = String::fromUTF8(pictographFontFamily);
+    priv->preferences->setPictographFontFamily(pictographFontFamilyString);
+    priv->pictographFontFamily = pictographFontFamilyString.utf8();
     g_object_notify(G_OBJECT(settings), "pictograph-font-family");
 }
 
@@ -1840,7 +1817,7 @@ guint32 webkit_settings_get_default_font_size(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), 0);
 
-    return WKPreferencesGetDefaultFontSize(settings->priv->preferences.get());
+    return settings->priv->preferences->defaultFontSize();
 }
 
 /**
@@ -1855,12 +1832,11 @@ void webkit_settings_set_default_font_size(WebKitSettings* settings, guint32 fon
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-
-    uint32_t currentSize = WKPreferencesGetDefaultFontSize(priv->preferences.get());
+    uint32_t currentSize = priv->preferences->defaultFontSize();
     if (currentSize == fontSize)
         return;
 
-    WKPreferencesSetDefaultFontSize(priv->preferences.get(), fontSize);
+    priv->preferences->setDefaultFontSize(fontSize);
     g_object_notify(G_OBJECT(settings), "default-font-size");
 }
 
@@ -1876,7 +1852,7 @@ guint32 webkit_settings_get_default_monospace_font_size(WebKitSettings* settings
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), 0);
 
-    return WKPreferencesGetDefaultFixedFontSize(settings->priv->preferences.get());
+    return settings->priv->preferences->defaultFixedFontSize();
 }
 
 /**
@@ -1891,12 +1867,11 @@ void webkit_settings_set_default_monospace_font_size(WebKitSettings* settings, g
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-
-    uint32_t currentSize = WKPreferencesGetDefaultFixedFontSize(priv->preferences.get());
+    uint32_t currentSize = priv->preferences->defaultFixedFontSize();
     if (currentSize == fontSize)
         return;
 
-    WKPreferencesSetDefaultFixedFontSize(priv->preferences.get(), fontSize);
+    priv->preferences->setDefaultFixedFontSize(fontSize);
     g_object_notify(G_OBJECT(settings), "default-monospace-font-size");
 }
 
@@ -1912,7 +1887,7 @@ guint32 webkit_settings_get_minimum_font_size(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), 0);
 
-    return WKPreferencesGetMinimumFontSize(settings->priv->preferences.get());
+    return settings->priv->preferences->minimumFontSize();
 }
 
 /**
@@ -1927,12 +1902,11 @@ void webkit_settings_set_minimum_font_size(WebKitSettings* settings, guint32 fon
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-
-    uint32_t currentSize = WKPreferencesGetMinimumFontSize(priv->preferences.get());
+    uint32_t currentSize = priv->preferences->minimumFontSize();
     if (currentSize == fontSize)
         return;
 
-    WKPreferencesSetMinimumFontSize(priv->preferences.get(), fontSize);
+    priv->preferences->setMinimumFontSize(fontSize);
     g_object_notify(G_OBJECT(settings), "minimum-font-size");
 }
 
@@ -1967,10 +1941,9 @@ void webkit_settings_set_default_charset(WebKitSettings* settings, const gchar*
     if (!g_strcmp0(priv->defaultCharset.data(), defaultCharset))
         return;
 
-    WKRetainPtr<WKStringRef> defaultCharsetRef = adoptWK(WKStringCreateWithUTF8CString(defaultCharset));
-    WKPreferencesSetDefaultTextEncodingName(priv->preferences.get(), defaultCharsetRef.get());
-    priv->defaultCharset = WebKit::toImpl(defaultCharsetRef.get())->string().utf8();
-
+    String defaultCharsetString = String::fromUTF8(defaultCharset);
+    priv->preferences->setDefaultTextEncodingName(defaultCharsetString);
+    priv->defaultCharset = defaultCharsetString.utf8();
     g_object_notify(G_OBJECT(settings), "default-charset");
 }
 
@@ -1986,7 +1959,7 @@ gboolean webkit_settings_get_enable_private_browsing(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetPrivateBrowsingEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->privateBrowsingEnabled();
 }
 
 /**
@@ -2001,11 +1974,11 @@ void webkit_settings_set_enable_private_browsing(WebKitSettings* settings, gbool
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetPrivateBrowsingEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->privateBrowsingEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetPrivateBrowsingEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setPrivateBrowsingEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-private-browsing");
 }
 
@@ -2021,7 +1994,7 @@ gboolean webkit_settings_get_enable_developer_extras(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetDeveloperExtrasEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->developerExtrasEnabled();
 }
 
 /**
@@ -2036,11 +2009,11 @@ void webkit_settings_set_enable_developer_extras(WebKitSettings* settings, gbool
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetDeveloperExtrasEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->developerExtrasEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetDeveloperExtrasEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setDeveloperExtrasEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-developer-extras");
 }
 
@@ -2056,7 +2029,7 @@ gboolean webkit_settings_get_enable_resizable_text_areas(WebKitSettings* setting
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetTextAreasAreResizable(settings->priv->preferences.get());
+    return settings->priv->preferences->textAreasAreResizable();
 }
 
 /**
@@ -2071,11 +2044,11 @@ void webkit_settings_set_enable_resizable_text_areas(WebKitSettings* settings, g
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetTextAreasAreResizable(priv->preferences.get());
+    bool currentValue = priv->preferences->textAreasAreResizable();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetTextAreasAreResizable(priv->preferences.get(), enabled);
+    priv->preferences->setTextAreasAreResizable(enabled);
     g_object_notify(G_OBJECT(settings), "enable-resizable-text-areas");
 }
 
@@ -2091,7 +2064,7 @@ gboolean webkit_settings_get_enable_tabs_to_links(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetTabsToLinks(settings->priv->preferences.get());
+    return settings->priv->preferences->tabsToLinks();
 }
 
 /**
@@ -2106,11 +2079,11 @@ void webkit_settings_set_enable_tabs_to_links(WebKitSettings* settings, gboolean
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetTabsToLinks(priv->preferences.get());
+    bool currentValue = priv->preferences->tabsToLinks();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetTabsToLinks(priv->preferences.get(), enabled);
+    priv->preferences->setTabsToLinks(enabled);
     g_object_notify(G_OBJECT(settings), "enable-tabs-to-links");
 }
 
@@ -2126,7 +2099,7 @@ gboolean webkit_settings_get_enable_dns_prefetching(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetDNSPrefetchingEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->dnsPrefetchingEnabled();
 }
 
 /**
@@ -2141,11 +2114,11 @@ void webkit_settings_set_enable_dns_prefetching(WebKitSettings* settings, gboole
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetDNSPrefetchingEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->dnsPrefetchingEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetDNSPrefetchingEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setDNSPrefetchingEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-dns-prefetching");
 }
 
@@ -2161,7 +2134,7 @@ gboolean webkit_settings_get_enable_caret_browsing(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetCaretBrowsingEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->caretBrowsingEnabled();
 }
 
 /**
@@ -2176,11 +2149,11 @@ void webkit_settings_set_enable_caret_browsing(WebKitSettings* settings, gboolea
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetCaretBrowsingEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->caretBrowsingEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetCaretBrowsingEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setCaretBrowsingEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-caret-browsing");
 }
 
@@ -2196,7 +2169,7 @@ gboolean webkit_settings_get_enable_fullscreen(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetFullScreenEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->fullScreenEnabled();
 }
 
 /**
@@ -2211,11 +2184,11 @@ void webkit_settings_set_enable_fullscreen(WebKitSettings* settings, gboolean en
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetFullScreenEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->fullScreenEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetFullScreenEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setFullScreenEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-fullscreen");
 }
 
@@ -2231,7 +2204,7 @@ gboolean webkit_settings_get_print_backgrounds(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetShouldPrintBackgrounds(settings->priv->preferences.get());
+    return settings->priv->preferences->shouldPrintBackgrounds();
 }
 
 /**
@@ -2246,11 +2219,11 @@ void webkit_settings_set_print_backgrounds(WebKitSettings* settings, gboolean pr
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetShouldPrintBackgrounds(priv->preferences.get());
+    bool currentValue = priv->preferences->shouldPrintBackgrounds();
     if (currentValue == printBackgrounds)
         return;
 
-    WKPreferencesSetShouldPrintBackgrounds(priv->preferences.get(), printBackgrounds);
+    priv->preferences->setShouldPrintBackgrounds(printBackgrounds);
     g_object_notify(G_OBJECT(settings), "print-backgrounds");
 }
 
@@ -2266,7 +2239,7 @@ gboolean webkit_settings_get_enable_webaudio(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetWebAudioEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->webAudioEnabled();
 }
 
 /**
@@ -2281,11 +2254,11 @@ void webkit_settings_set_enable_webaudio(WebKitSettings* settings, gboolean enab
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetWebAudioEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->webAudioEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetWebAudioEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setWebAudioEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-webaudio");
 }
 
@@ -2301,7 +2274,7 @@ gboolean webkit_settings_get_enable_webgl(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetWebGLEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->webGLEnabled();
 }
 
 /**
@@ -2316,15 +2289,29 @@ void webkit_settings_set_enable_webgl(WebKitSettings* settings, gboolean enabled
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetWebGLEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->webGLEnabled();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetWebGLEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setWebGLEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-webgl");
 }
 
 /**
+ * webkit_settings_get_allow_modal_dialogs:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:allow-modal-dialogs property.
+ *
+ * Returns: %TRUE if it's allowed to create and run modal dialogs or %FALSE otherwise.
+ */
+gboolean webkit_settings_get_allow_modal_dialogs(WebKitSettings* settings)
+{
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+    return settings->priv->allowModalDialogs;
+}
+
+/**
  * webkit_settings_set_allow_modal_dialogs:
  * @settings: a #WebKitSettings
  * @allowed: Value to be set
@@ -2344,17 +2331,19 @@ void webkit_settings_set_allow_modal_dialogs(WebKitSettings* settings, gboolean
 }
 
 /**
- * webkit_settings_get_allow_modal_dialogs:
+ * webkit_settings_get_zoom_text_only:
  * @settings: a #WebKitSettings
  *
- * Get the #WebKitSettings:allow-modal-dialogs property.
+ * Get the #WebKitSettings:zoom-text-only property.
  *
- * Returns: %TRUE if it's allowed to create and run modal dialogs or %FALSE otherwise.
+ * Returns: %TRUE If zoom level of the view should only affect the text
+ *    or %FALSE if all view contents should be scaled.
  */
-gboolean webkit_settings_get_allow_modal_dialogs(WebKitSettings* settings)
+gboolean webkit_settings_get_zoom_text_only(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
-    return settings->priv->allowModalDialogs;
+
+    return settings->priv->zoomTextOnly;
 }
 
 /**
@@ -2377,22 +2366,6 @@ void webkit_settings_set_zoom_text_only(WebKitSettings* settings, gboolean zoomT
 }
 
 /**
- * webkit_settings_get_zoom_text_only:
- * @settings: a #WebKitSettings
- *
- * Get the #WebKitSettings:zoom-text-only property.
- *
- * Returns: %TRUE If zoom level of the view should only affect the text
- *    or %FALSE if all view contents should be scaled.
- */
-gboolean webkit_settings_get_zoom_text_only(WebKitSettings* settings)
-{
-    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
-
-    return settings->priv->zoomTextOnly;
-}
-
-/**
  * webkit_settings_get_javascript_can_access_clipboard:
  * @settings: a #WebKitSettings
  *
@@ -2404,8 +2377,8 @@ gboolean webkit_settings_get_javascript_can_access_clipboard(WebKitSettings* set
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetJavaScriptCanAccessClipboard(settings->priv->preferences.get())
-            && WKPreferencesGetDOMPasteAllowed(settings->priv->preferences.get());
+    return settings->priv->preferences->javaScriptCanAccessClipboard()
+        && settings->priv->preferences->domPasteAllowed();
 }
 
 /**
@@ -2420,39 +2393,16 @@ void webkit_settings_set_javascript_can_access_clipboard(WebKitSettings* setting
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetJavaScriptCanAccessClipboard(priv->preferences.get())
-            && WKPreferencesGetDOMPasteAllowed(priv->preferences.get());
+    bool currentValue = priv->preferences->javaScriptCanAccessClipboard() && priv->preferences->domPasteAllowed();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetJavaScriptCanAccessClipboard(priv->preferences.get(), enabled);
-    WKPreferencesSetDOMPasteAllowed(priv->preferences.get(), enabled);
-
+    priv->preferences->setJavaScriptCanAccessClipboard(enabled);
+    priv->preferences->setDOMPasteAllowed(enabled);
     g_object_notify(G_OBJECT(settings), "javascript-can-access-clipboard");
 }
 
 /**
- * webkit_settings_set_media_playback_requires_user_gesture:
- * @settings: a #WebKitSettings
- * @enabled: Value to be set
- *
- * Set the #WebKitSettings:media-playback-requires-user-gesture property.
- */
-void webkit_settings_set_media_playback_requires_user_gesture(WebKitSettings* settings, gboolean enabled)
-{
-    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
-
-    WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetMediaPlaybackRequiresUserGesture(priv->preferences.get());
-    if (currentValue == enabled)
-        return;
-
-    WKPreferencesSetMediaPlaybackRequiresUserGesture(priv->preferences.get(), enabled);
-
-    g_object_notify(G_OBJECT(settings), "media-playback-requires-user-gesture");
-}
-
-/**
  * webkit_settings_get_media_playback_requires_user_gesture:
  * @settings: a #WebKitSettings
  *
@@ -2465,28 +2415,27 @@ gboolean webkit_settings_get_media_playback_requires_user_gesture(WebKitSettings
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetMediaPlaybackRequiresUserGesture(settings->priv->preferences.get());
+    return settings->priv->preferences->mediaPlaybackRequiresUserGesture();
 }
 
 /**
- * webkit_settings_set_media_playback_allows_inline:
+ * webkit_settings_set_media_playback_requires_user_gesture:
  * @settings: a #WebKitSettings
  * @enabled: Value to be set
  *
- * Set the #WebKitSettings:media-playback-allows-inline property.
+ * Set the #WebKitSettings:media-playback-requires-user-gesture property.
  */
-void webkit_settings_set_media_playback_allows_inline(WebKitSettings* settings, gboolean enabled)
+void webkit_settings_set_media_playback_requires_user_gesture(WebKitSettings* settings, gboolean enabled)
 {
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetMediaPlaybackAllowsInline(priv->preferences.get());
+    bool currentValue = priv->preferences->mediaPlaybackRequiresUserGesture();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetMediaPlaybackAllowsInline(priv->preferences.get(), enabled);
-
-    g_object_notify(G_OBJECT(settings), "media-playback-allows-inline");
+    priv->preferences->setMediaPlaybackRequiresUserGesture(enabled);
+    g_object_notify(G_OBJECT(settings), "media-playback-requires-user-gesture");
 }
 
 /**
@@ -2502,28 +2451,27 @@ gboolean webkit_settings_get_media_playback_allows_inline(WebKitSettings* settin
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), TRUE);
 
-    return WKPreferencesGetMediaPlaybackAllowsInline(settings->priv->preferences.get());
+    return settings->priv->preferences->mediaPlaybackAllowsInline();
 }
 
 /**
- * webkit_settings_set_draw_compositing_indicators:
+ * webkit_settings_set_media_playback_allows_inline:
  * @settings: a #WebKitSettings
  * @enabled: Value to be set
  *
- * Set the #WebKitSettings:draw-compositing-indicators property.
+ * Set the #WebKitSettings:media-playback-allows-inline property.
  */
-void webkit_settings_set_draw_compositing_indicators(WebKitSettings* settings, gboolean enabled)
+void webkit_settings_set_media_playback_allows_inline(WebKitSettings* settings, gboolean enabled)
 {
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    if (WKPreferencesGetCompositingBordersVisible(priv->preferences.get()) == enabled
-        && WKPreferencesGetCompositingRepaintCountersVisible(priv->preferences.get()) == enabled)
+    bool currentValue = priv->preferences->mediaPlaybackAllowsInline();
+    if (currentValue == enabled)
         return;
 
-    WKPreferencesSetCompositingBordersVisible(priv->preferences.get(), enabled);
-    WKPreferencesSetCompositingRepaintCountersVisible(priv->preferences.get(), enabled);
-    g_object_notify(G_OBJECT(settings), "draw-compositing-indicators");
+    priv->preferences->setMediaPlaybackAllowsInline(enabled);
+    g_object_notify(G_OBJECT(settings), "media-playback-allows-inline");
 }
 
 /**
@@ -2537,8 +2485,29 @@ void webkit_settings_set_draw_compositing_indicators(WebKitSettings* settings, g
 gboolean webkit_settings_get_draw_compositing_indicators(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
-    return WKPreferencesGetCompositingBordersVisible(settings->priv->preferences.get())
-           && WKPreferencesGetCompositingRepaintCountersVisible(settings->priv->preferences.get());
+    return settings->priv->preferences->compositingBordersVisible()
+        && settings->priv->preferences->compositingRepaintCountersVisible();
+}
+
+/**
+ * webkit_settings_set_draw_compositing_indicators:
+ * @settings: a #WebKitSettings
+ * @enabled: Value to be set
+ *
+ * Set the #WebKitSettings:draw-compositing-indicators property.
+ */
+void webkit_settings_set_draw_compositing_indicators(WebKitSettings* settings, gboolean enabled)
+{
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+    WebKitSettingsPrivate* priv = settings->priv;
+    if (priv->preferences->compositingBordersVisible() == enabled
+        && priv->preferences->compositingRepaintCountersVisible() == enabled)
+        return;
+
+    priv->preferences->setCompositingBordersVisible(enabled);
+    priv->preferences->setCompositingRepaintCountersVisible(enabled);
+    g_object_notify(G_OBJECT(settings), "draw-compositing-indicators");
 }
 
 /**
@@ -2553,7 +2522,7 @@ gboolean webkit_settings_get_enable_site_specific_quirks(WebKitSettings* setting
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetNeedsSiteSpecificQuirks(settings->priv->preferences.get());
+    return settings->priv->preferences->needsSiteSpecificQuirks();
 }
 
 /**
@@ -2568,11 +2537,11 @@ void webkit_settings_set_enable_site_specific_quirks(WebKitSettings* settings, g
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetNeedsSiteSpecificQuirks(priv->preferences.get());
+    bool currentValue = priv->preferences->needsSiteSpecificQuirks();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetNeedsSiteSpecificQuirks(priv->preferences.get(), enabled);
+    priv->preferences->setNeedsSiteSpecificQuirks(enabled);
     g_object_notify(G_OBJECT(settings), "enable-site-specific-quirks");
 }
 
@@ -2588,7 +2557,7 @@ gboolean webkit_settings_get_enable_page_cache(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WKPreferencesGetPageCacheEnabled(settings->priv->preferences.get());
+    return settings->priv->preferences->usesPageCache();
 }
 
 /**
@@ -2603,11 +2572,11 @@ void webkit_settings_set_enable_page_cache(WebKitSettings* settings, gboolean en
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WKPreferencesGetPageCacheEnabled(priv->preferences.get());
+    bool currentValue = priv->preferences->usesPageCache();
     if (currentValue == enabled)
         return;
 
-    WKPreferencesSetPageCacheEnabled(priv->preferences.get(), enabled);
+    priv->preferences->setUsesPageCache(enabled);
     g_object_notify(G_OBJECT(settings), "enable-page-cache");
 }
 
@@ -2678,7 +2647,7 @@ gboolean webkit_settings_get_enable_smooth_scrolling(WebKitSettings* settings)
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
-    return WebKit::toImpl(settings->priv->preferences.get())->scrollAnimatorEnabled();
+    return settings->priv->preferences->scrollAnimatorEnabled();
 }
 
 /**
@@ -2693,10 +2662,10 @@ void webkit_settings_set_enable_smooth_scrolling(WebKitSettings* settings, gbool
     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
-    bool currentValue = WebKit::toImpl(priv->preferences.get())->scrollAnimatorEnabled();
+    bool currentValue = priv->preferences->scrollAnimatorEnabled();
     if (currentValue == enabled)
         return;
 
-    WebKit::toImpl(priv->preferences.get())->setScrollAnimatorEnabled(enabled);
+    priv->preferences->setScrollAnimatorEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-smooth-scrolling");
 }