From 061d58bc0fa016cfeed744fd3e4663460635d69b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 23 Nov 2012 15:08:59 +0100 Subject: Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602) New snapshot that fixes various bugs Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a Reviewed-by: Simon Hausmann --- Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp | 26 ++++++----------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp') diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp index aff651aed..0dd1121cf 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp @@ -27,6 +27,11 @@ using namespace WebKit; struct _WebKitPluginPrivate { + ~_WebKitPluginPrivate() + { + g_list_free_full(mimeInfoList, reinterpret_cast(webkit_mime_info_unref)); + } + PluginModuleInfo pluginInfo; CString name; CString description; @@ -34,29 +39,10 @@ struct _WebKitPluginPrivate { GList* mimeInfoList; }; -G_DEFINE_TYPE(WebKitPlugin, webkit_plugin, G_TYPE_OBJECT) - -static void webkitPluginFinalize(GObject* object) -{ - WebKitPluginPrivate* priv = WEBKIT_PLUGIN(object)->priv; - g_list_free_full(priv->mimeInfoList, reinterpret_cast(webkit_mime_info_unref)); - priv->~WebKitPluginPrivate(); - G_OBJECT_CLASS(webkit_plugin_parent_class)->finalize(object); -} - -static void webkit_plugin_init(WebKitPlugin* plugin) -{ - WebKitPluginPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(plugin, WEBKIT_TYPE_PLUGIN, WebKitPluginPrivate); - plugin->priv = priv; - new (priv) WebKitPluginPrivate(); -} +WEBKIT_DEFINE_TYPE(WebKitPlugin, webkit_plugin, G_TYPE_OBJECT) static void webkit_plugin_class_init(WebKitPluginClass* pluginClass) { - GObjectClass* gObjectClass = G_OBJECT_CLASS(pluginClass); - gObjectClass->finalize = webkitPluginFinalize; - - g_type_class_add_private(pluginClass, sizeof(WebKitPluginPrivate)); } WebKitPlugin* webkitPluginCreate(const PluginModuleInfo& pluginInfo) -- cgit v1.2.1