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, 1 insertions, 18 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp
index 930cf8676..bdfc72589 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp
@@ -106,8 +106,6 @@ enum {
     PROP_FULLSCREEN
 };
 
-G_DEFINE_TYPE(WebKitWindowProperties, webkit_window_properties, G_TYPE_OBJECT)
-
 struct _WebKitWindowPropertiesPrivate {
     GdkRectangle geometry;
 
@@ -121,11 +119,7 @@ struct _WebKitWindowPropertiesPrivate {
     bool fullscreen : 1;
 };
 
-static void webkitWindowPropertiesFinalize(GObject* object)
-{
-    WEBKIT_WINDOW_PROPERTIES(object)->priv->~WebKitWindowPropertiesPrivate();
-    G_OBJECT_CLASS(webkit_window_properties_parent_class)->finalize(object);
-}
+WEBKIT_DEFINE_TYPE(WebKitWindowProperties, webkit_window_properties, G_TYPE_OBJECT)
 
 static void webkitWindowPropertiesGetProperty(GObject* object, guint propId, GValue* value, GParamSpec* paramSpec)
 {
@@ -199,8 +193,6 @@ static void webkitWindowPropertiesSetProperty(GObject* object, guint propId, con
 static void webkit_window_properties_class_init(WebKitWindowPropertiesClass* requestClass)
 {
     GObjectClass* objectClass = G_OBJECT_CLASS(requestClass);
-
-    objectClass->finalize = webkitWindowPropertiesFinalize;
     objectClass->get_property = webkitWindowPropertiesGetProperty;
     objectClass->set_property = webkitWindowPropertiesSetProperty;
 
@@ -308,15 +300,6 @@ static void webkit_window_properties_class_init(WebKitWindowPropertiesClass* req
                                                          _("Whether window will be displayed fullscreen."),
                                                          FALSE,
                                                          paramFlags));
-
-    g_type_class_add_private(requestClass, sizeof(WebKitWindowPropertiesPrivate));
-}
-
-static void webkit_window_properties_init(WebKitWindowProperties* request)
-{
-    WebKitWindowPropertiesPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(request, WEBKIT_TYPE_WINDOW_PROPERTIES, WebKitWindowPropertiesPrivate);
-    request->priv = priv;
-    new (priv) WebKitWindowPropertiesPrivate();
 }
 
 WebKitWindowProperties* webkitWindowPropertiesCreate()