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, 2 insertions, 20 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp
index 09a11abe6..7b069dd94 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp
@@ -20,20 +20,14 @@
 #include "config.h"
 #include "WebKitWebViewBaseAccessible.h"
 
+#include "WebKitPrivate.h"
 #include <gtk/gtk.h>
 
 struct _WebKitWebViewBaseAccessiblePrivate {
     GtkWidget* widget;
 };
 
-G_DEFINE_TYPE(WebKitWebViewBaseAccessible, webkit_web_view_base_accessible, ATK_TYPE_SOCKET)
-
-static void webkitWebViewBaseAccessibleFinalize(GObject* gobject)
-{
-    WebKitWebViewBaseAccessible* accessible = WEBKIT_WEB_VIEW_BASE_ACCESSIBLE(gobject);
-    accessible->priv->~WebKitWebViewBaseAccessiblePrivate();
-    G_OBJECT_CLASS(webkit_web_view_base_accessible_parent_class)->finalize(gobject);
-}
+WEBKIT_DEFINE_TYPE(WebKitWebViewBaseAccessible, webkit_web_view_base_accessible, ATK_TYPE_SOCKET)
 
 static void webkitWebViewBaseAccessibleWidgetDestroyed(GtkWidget* widget, WebKitWebViewBaseAccessible* accessible)
 {
@@ -94,18 +88,8 @@ static gint webkitWebViewBaseAccessibleGetIndexInParent(AtkObject* atkObject)
     return -1;
 }
 
-static void webkit_web_view_base_accessible_init(WebKitWebViewBaseAccessible* accessible)
-{
-    WebKitWebViewBaseAccessiblePrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(accessible, WEBKIT_TYPE_WEB_VIEW_BASE_ACCESSIBLE, WebKitWebViewBaseAccessiblePrivate);
-    accessible->priv = priv;
-    new (priv) WebKitWebViewBaseAccessiblePrivate();
-}
-
 static void webkit_web_view_base_accessible_class_init(WebKitWebViewBaseAccessibleClass* klass)
 {
-    GObjectClass* gObjectClass = G_OBJECT_CLASS(klass);
-    gObjectClass->finalize = webkitWebViewBaseAccessibleFinalize;
-
     // No need to implement get_n_children() and ref_child() here
     // since this is a subclass of AtkSocket and all the logic related
     // to those functions will be implemented by the ATK bridge.
@@ -113,8 +97,6 @@ static void webkit_web_view_base_accessible_class_init(WebKitWebViewBaseAccessib
     atkObjectClass->initialize = webkitWebViewBaseAccessibleInitialize;
     atkObjectClass->ref_state_set = webkitWebViewBaseAccessibleRefStateSet;
     atkObjectClass->get_index_in_parent = webkitWebViewBaseAccessibleGetIndexInParent;
-
-    g_type_class_add_private(klass, sizeof(WebKitWebViewBaseAccessiblePrivate));
 }
 
 WebKitWebViewBaseAccessible* webkitWebViewBaseAccessibleNew(GtkWidget* widget)