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, 12 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp
index 26ab99b44..85ae0efa0 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp
@@ -56,7 +56,6 @@ using namespace WebCore;
  * WebKit will provide a default handler which will asynchronously run
  * a regular #GtkFileChooserDialog for the user to interact with.
  */
-G_DEFINE_TYPE(WebKitFileChooserRequest, webkit_file_chooser_request, G_TYPE_OBJECT)
 
 struct _WebKitFileChooserRequestPrivate {
     RefPtr<WebOpenPanelParameters> parameters;
@@ -67,6 +66,8 @@ struct _WebKitFileChooserRequestPrivate {
     bool handledRequest;
 };
 
+WEBKIT_DEFINE_TYPE(WebKitFileChooserRequest, webkit_file_chooser_request, G_TYPE_OBJECT)
+
 enum {
     PROP_0,
     PROP_FILTER,
@@ -75,13 +76,7 @@ enum {
     PROP_SELECTED_FILES,
 };
 
-static void webkit_file_chooser_request_init(WebKitFileChooserRequest* request)
-{
-    request->priv = G_TYPE_INSTANCE_GET_PRIVATE(request, WEBKIT_TYPE_FILE_CHOOSER_REQUEST, WebKitFileChooserRequestPrivate);
-    new (request->priv) WebKitFileChooserRequestPrivate();
-}
-
-static void webkitFileChooserRequestFinalize(GObject* object)
+static void webkitFileChooserRequestDispose(GObject* object)
 {
     WebKitFileChooserRequest* request = WEBKIT_FILE_CHOOSER_REQUEST(object);
 
@@ -89,8 +84,7 @@ static void webkitFileChooserRequestFinalize(GObject* object)
     if (!request->priv->handledRequest)
         webkit_file_chooser_request_cancel(request);
 
-    request->priv->~WebKitFileChooserRequestPrivate();
-    G_OBJECT_CLASS(webkit_file_chooser_request_parent_class)->finalize(object);
+    G_OBJECT_CLASS(webkit_file_chooser_request_parent_class)->dispose(object);
 }
 
 static void webkitFileChooserRequestGetProperty(GObject* object, guint propId, GValue* value, GParamSpec* paramSpec)
@@ -118,9 +112,8 @@ static void webkitFileChooserRequestGetProperty(GObject* object, guint propId, G
 static void webkit_file_chooser_request_class_init(WebKitFileChooserRequestClass* requestClass)
 {
     GObjectClass* objectClass = G_OBJECT_CLASS(requestClass);
-    objectClass->finalize = webkitFileChooserRequestFinalize;
+    objectClass->dispose = webkitFileChooserRequestDispose;
     objectClass->get_property = webkitFileChooserRequestGetProperty;
-    g_type_class_add_private(requestClass, sizeof(WebKitFileChooserRequestPrivate));
 
     /**
      * WebKitFileChooserRequest:filter: