From 061d58bc0fa016cfeed744fd3e4663460635d69b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 23 Nov 2012 15:08:59 +0100 Subject: 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 --- .../UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp') diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp index f901e7375..816cee3f6 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp @@ -28,8 +28,6 @@ using namespace WebKit; -G_DEFINE_TYPE(WebKitFormSubmissionRequest, webkit_form_submission_request, G_TYPE_OBJECT) - struct _WebKitFormSubmissionRequestPrivate { RefPtr webValues; RefPtr listener; @@ -37,14 +35,9 @@ struct _WebKitFormSubmissionRequestPrivate { bool handledRequest; }; -static void webkit_form_submission_request_init(WebKitFormSubmissionRequest* request) -{ - WebKitFormSubmissionRequestPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(request, WEBKIT_TYPE_FORM_SUBMISSION_REQUEST, WebKitFormSubmissionRequestPrivate); - request->priv = priv; - new (priv) WebKitFormSubmissionRequestPrivate(); -} +WEBKIT_DEFINE_TYPE(WebKitFormSubmissionRequest, webkit_form_submission_request, G_TYPE_OBJECT) -static void webkitFormSubmissionRequestFinalize(GObject* object) +static void webkitFormSubmissionRequestDispose(GObject* object) { WebKitFormSubmissionRequest* request = WEBKIT_FORM_SUBMISSION_REQUEST(object); @@ -52,15 +45,13 @@ static void webkitFormSubmissionRequestFinalize(GObject* object) if (!request->priv->handledRequest) webkit_form_submission_request_submit(request); - request->priv->~WebKitFormSubmissionRequestPrivate(); - G_OBJECT_CLASS(webkit_form_submission_request_parent_class)->finalize(object); + G_OBJECT_CLASS(webkit_form_submission_request_parent_class)->dispose(object); } static void webkit_form_submission_request_class_init(WebKitFormSubmissionRequestClass* requestClass) { GObjectClass* objectClass = G_OBJECT_CLASS(requestClass); - objectClass->finalize = webkitFormSubmissionRequestFinalize; - g_type_class_add_private(requestClass, sizeof(WebKitFormSubmissionRequestPrivate)); + objectClass->dispose = webkitFormSubmissionRequestDispose; } WebKitFormSubmissionRequest* webkitFormSubmissionRequestCreate(ImmutableDictionary* values, WebFormSubmissionListenerProxy* listener) -- cgit v1.2.1