Title: [116950] trunk/Source/WebKit2
- Revision
- 116950
- Author
- [email protected]
- Date
- 2012-05-14 08:33:05 -0700 (Mon, 14 May 2012)
Log Message
[GTK] [WK2] Memory leaks in WebKitWebSettings
https://bugs.webkit.org/show_bug.cgi?id=86365
Patch by Sudarsana Nagineni <[email protected]> on 2012-05-14
Reviewed by Martin Robinson.
Fix memory leaks in WebKitWebSettings by adopting allocations
using adoptWK.
* UIProcess/API/gtk/WebKitSettings.cpp:
(webkit_settings_init):
(webkit_settings_set_serif_font_family):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (116949 => 116950)
--- trunk/Source/WebKit2/ChangeLog 2012-05-14 15:28:24 UTC (rev 116949)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-14 15:33:05 UTC (rev 116950)
@@ -1,3 +1,17 @@
+2012-05-14 Sudarsana Nagineni <[email protected]>
+
+ [GTK] [WK2] Memory leaks in WebKitWebSettings
+ https://bugs.webkit.org/show_bug.cgi?id=86365
+
+ Reviewed by Martin Robinson.
+
+ Fix memory leaks in WebKitWebSettings by adopting allocations
+ using adoptWK.
+
+ * UIProcess/API/gtk/WebKitSettings.cpp:
+ (webkit_settings_init):
+ (webkit_settings_set_serif_font_family):
+
2012-05-14 Allan Sandfeld Jensen <[email protected]>
[Qt] Doesn't build with ENABLE_INSPECTOR=0
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (116949 => 116950)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2012-05-14 15:28:24 UTC (rev 116949)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2012-05-14 15:33:05 UTC (rev 116950)
@@ -919,28 +919,28 @@
priv->preferences = adoptWK(WKPreferencesCreate());
- WKRetainPtr<WKStringRef> defaultFontFamilyRef = WKPreferencesCopyStandardFontFamily(priv->preferences.get());
+ WKRetainPtr<WKStringRef> defaultFontFamilyRef = adoptWK(WKPreferencesCopyStandardFontFamily(priv->preferences.get()));
priv->defaultFontFamily = WebKit::toImpl(defaultFontFamilyRef.get())->string().utf8();
- WKRetainPtr<WKStringRef> monospaceFontFamilyRef = WKPreferencesCopyFixedFontFamily(priv->preferences.get());
+ WKRetainPtr<WKStringRef> monospaceFontFamilyRef = adoptWK(WKPreferencesCopyFixedFontFamily(priv->preferences.get()));
priv->monospaceFontFamily = WebKit::toImpl(monospaceFontFamilyRef.get())->string().utf8();
- WKRetainPtr<WKStringRef> serifFontFamilyRef = WKPreferencesCopySerifFontFamily(priv->preferences.get());
+ WKRetainPtr<WKStringRef> serifFontFamilyRef = adoptWK(WKPreferencesCopySerifFontFamily(priv->preferences.get()));
priv->serifFontFamily = WebKit::toImpl(serifFontFamilyRef.get())->string().utf8();
- WKRetainPtr<WKStringRef> sansSerifFontFamilyRef = WKPreferencesCopySansSerifFontFamily(priv->preferences.get());
+ WKRetainPtr<WKStringRef> sansSerifFontFamilyRef = adoptWK(WKPreferencesCopySansSerifFontFamily(priv->preferences.get()));
priv->sansSerifFontFamily = WebKit::toImpl(sansSerifFontFamilyRef.get())->string().utf8();
- WKRetainPtr<WKStringRef> cursiveFontFamilyRef = WKPreferencesCopyCursiveFontFamily(priv->preferences.get());
+ WKRetainPtr<WKStringRef> cursiveFontFamilyRef = adoptWK(WKPreferencesCopyCursiveFontFamily(priv->preferences.get()));
priv->cursiveFontFamily = WebKit::toImpl(cursiveFontFamilyRef.get())->string().utf8();
- WKRetainPtr<WKStringRef> fantasyFontFamilyRef = WKPreferencesCopyFantasyFontFamily(priv->preferences.get());
+ WKRetainPtr<WKStringRef> fantasyFontFamilyRef = adoptWK(WKPreferencesCopyFantasyFontFamily(priv->preferences.get()));
priv->fantasyFontFamily = WebKit::toImpl(fantasyFontFamilyRef.get())->string().utf8();
- WKRetainPtr<WKStringRef> pictographFontFamilyRef = WKPreferencesCopyPictographFontFamily(priv->preferences.get());
+ WKRetainPtr<WKStringRef> pictographFontFamilyRef = adoptWK(WKPreferencesCopyPictographFontFamily(priv->preferences.get()));
priv->pictographFontFamily = WebKit::toImpl(pictographFontFamilyRef.get())->string().utf8();
- WKRetainPtr<WKStringRef> defaultCharsetRef = WKPreferencesCopyDefaultTextEncodingName(priv->preferences.get());
+ WKRetainPtr<WKStringRef> defaultCharsetRef = adoptWK(WKPreferencesCopyDefaultTextEncodingName(priv->preferences.get()));
priv->defaultCharset = WebKit::toImpl(defaultCharsetRef.get())->string().utf8();
}
@@ -1511,7 +1511,7 @@
if (!g_strcmp0(priv->serifFontFamily.data(), serifFontFamily))
return;
- WKRetainPtr<WKStringRef> serifFontFamilyRef = WKStringCreateWithUTF8CString(serifFontFamily);
+ WKRetainPtr<WKStringRef> serifFontFamilyRef = adoptWK(WKStringCreateWithUTF8CString(serifFontFamily));
WKPreferencesSetSerifFontFamily(priv->preferences.get(), serifFontFamilyRef.get());
priv->serifFontFamily = WebKit::toImpl(serifFontFamilyRef.get())->string().utf8();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
