From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 18 May 2012 14:03:11 +0200 Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot --- Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp') diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp index 5c027044b..cd04eb12b 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp @@ -919,28 +919,28 @@ static void webkit_settings_init(WebKitSettings* settings) priv->preferences = adoptWK(WKPreferencesCreate()); - WKRetainPtr defaultFontFamilyRef = WKPreferencesCopyStandardFontFamily(priv->preferences.get()); + WKRetainPtr defaultFontFamilyRef = adoptWK(WKPreferencesCopyStandardFontFamily(priv->preferences.get())); priv->defaultFontFamily = WebKit::toImpl(defaultFontFamilyRef.get())->string().utf8(); - WKRetainPtr monospaceFontFamilyRef = WKPreferencesCopyFixedFontFamily(priv->preferences.get()); + WKRetainPtr monospaceFontFamilyRef = adoptWK(WKPreferencesCopyFixedFontFamily(priv->preferences.get())); priv->monospaceFontFamily = WebKit::toImpl(monospaceFontFamilyRef.get())->string().utf8(); - WKRetainPtr serifFontFamilyRef = WKPreferencesCopySerifFontFamily(priv->preferences.get()); + WKRetainPtr serifFontFamilyRef = adoptWK(WKPreferencesCopySerifFontFamily(priv->preferences.get())); priv->serifFontFamily = WebKit::toImpl(serifFontFamilyRef.get())->string().utf8(); - WKRetainPtr sansSerifFontFamilyRef = WKPreferencesCopySansSerifFontFamily(priv->preferences.get()); + WKRetainPtr sansSerifFontFamilyRef = adoptWK(WKPreferencesCopySansSerifFontFamily(priv->preferences.get())); priv->sansSerifFontFamily = WebKit::toImpl(sansSerifFontFamilyRef.get())->string().utf8(); - WKRetainPtr cursiveFontFamilyRef = WKPreferencesCopyCursiveFontFamily(priv->preferences.get()); + WKRetainPtr cursiveFontFamilyRef = adoptWK(WKPreferencesCopyCursiveFontFamily(priv->preferences.get())); priv->cursiveFontFamily = WebKit::toImpl(cursiveFontFamilyRef.get())->string().utf8(); - WKRetainPtr fantasyFontFamilyRef = WKPreferencesCopyFantasyFontFamily(priv->preferences.get()); + WKRetainPtr fantasyFontFamilyRef = adoptWK(WKPreferencesCopyFantasyFontFamily(priv->preferences.get())); priv->fantasyFontFamily = WebKit::toImpl(fantasyFontFamilyRef.get())->string().utf8(); - WKRetainPtr pictographFontFamilyRef = WKPreferencesCopyPictographFontFamily(priv->preferences.get()); + WKRetainPtr pictographFontFamilyRef = adoptWK(WKPreferencesCopyPictographFontFamily(priv->preferences.get())); priv->pictographFontFamily = WebKit::toImpl(pictographFontFamilyRef.get())->string().utf8(); - WKRetainPtr defaultCharsetRef = WKPreferencesCopyDefaultTextEncodingName(priv->preferences.get()); + WKRetainPtr defaultCharsetRef = adoptWK(WKPreferencesCopyDefaultTextEncodingName(priv->preferences.get())); priv->defaultCharset = WebKit::toImpl(defaultCharsetRef.get())->string().utf8(); } @@ -1511,7 +1511,7 @@ void webkit_settings_set_serif_font_family(WebKitSettings* settings, const gchar if (!g_strcmp0(priv->serifFontFamily.data(), serifFontFamily)) return; - WKRetainPtr serifFontFamilyRef = WKStringCreateWithUTF8CString(serifFontFamily); + WKRetainPtr serifFontFamilyRef = adoptWK(WKStringCreateWithUTF8CString(serifFontFamily)); WKPreferencesSetSerifFontFamily(priv->preferences.get(), serifFontFamilyRef.get()); priv->serifFontFamily = WebKit::toImpl(serifFontFamilyRef.get())->string().utf8(); -- cgit v1.2.1