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, 5 insertions, 16 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp
index e65728aac..46ce958ee 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp
@@ -33,29 +33,18 @@ struct _WebKitContextMenuPrivate {
     WebKitContextMenuItem* parentItem;
 };
 
-G_DEFINE_TYPE(WebKitContextMenu, webkit_context_menu, G_TYPE_OBJECT)
+WEBKIT_DEFINE_TYPE(WebKitContextMenu, webkit_context_menu, G_TYPE_OBJECT)
 
-static void webkitContextMenuFinalize(GObject* object)
+static void webkitContextMenuDispose(GObject* object)
 {
-    WebKitContextMenu* menu = WEBKIT_CONTEXT_MENU(object);
-    webkit_context_menu_remove_all(menu);
-    menu->priv->~WebKitContextMenuPrivate();
-    G_OBJECT_CLASS(webkit_context_menu_parent_class)->finalize(object);
-}
-
-static void webkit_context_menu_init(WebKitContextMenu* menu)
-{
-    WebKitContextMenuPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(menu, WEBKIT_TYPE_CONTEXT_MENU, WebKitContextMenuPrivate);
-    menu->priv = priv;
-    new (priv) WebKitContextMenuPrivate();
+    webkit_context_menu_remove_all(WEBKIT_CONTEXT_MENU(object));
+    G_OBJECT_CLASS(webkit_context_menu_parent_class)->dispose(object);
 }
 
 static void webkit_context_menu_class_init(WebKitContextMenuClass* listClass)
 {
     GObjectClass* gObjectClass = G_OBJECT_CLASS(listClass);
-    gObjectClass->finalize = webkitContextMenuFinalize;
-
-    g_type_class_add_private(listClass, sizeof(WebKitContextMenuPrivate));
+    gObjectClass->dispose = webkitContextMenuDispose;
 }
 
 void webkitContextMenuPopulate(WebKitContextMenu* menu, Vector<ContextMenuItem>& contextMenuItems)