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 <simon.hausmann@digia.com>

1 files changed, 7 insertions, 20 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp
index a73f07575..aa89b990b 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp
@@ -38,33 +38,20 @@ using namespace WebKit;
 using namespace WebCore;
 
 struct _WebKitContextMenuItemPrivate {
+    ~_WebKitContextMenuItemPrivate()
+    {
+        if (subMenu)
+            webkitContextMenuSetParentItem(subMenu.get(), 0);
+    }
+
     OwnPtr<ContextMenuItem> menuItem;
     GRefPtr<WebKitContextMenu> subMenu;
 };
 
-G_DEFINE_TYPE(WebKitContextMenuItem, webkit_context_menu_item, G_TYPE_INITIALLY_UNOWNED)
-
-static void webkitContextMenuItemFinalize(GObject* object)
-{
-    WebKitContextMenuItemPrivate* priv = WEBKIT_CONTEXT_MENU_ITEM(object)->priv;
-    if (priv->subMenu)
-        webkitContextMenuSetParentItem(priv->subMenu.get(), 0);
-    priv->~WebKitContextMenuItemPrivate();
-    G_OBJECT_CLASS(webkit_context_menu_item_parent_class)->finalize(object);
-}
-
-static void webkit_context_menu_item_init(WebKitContextMenuItem* item)
-{
-    WebKitContextMenuItemPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(item, WEBKIT_TYPE_CONTEXT_MENU_ITEM, WebKitContextMenuItemPrivate);
-    item->priv = priv;
-    new (priv) WebKitContextMenuItemPrivate();
-}
+WEBKIT_DEFINE_TYPE(WebKitContextMenuItem, webkit_context_menu_item, G_TYPE_INITIALLY_UNOWNED)
 
 static void webkit_context_menu_item_class_init(WebKitContextMenuItemClass* itemClass)
 {
-    GObjectClass* gObjectClass = G_OBJECT_CLASS(itemClass);
-    gObjectClass->finalize = webkitContextMenuItemFinalize;
-    g_type_class_add_private(itemClass, sizeof(WebKitContextMenuItemPrivate));
 }
 
 static bool checkAndWarnIfMenuHasParentItem(WebKitContextMenu* menu)