diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:08:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:09:20 +0100 |
| commit | 061d58bc0fa016cfeed744fd3e4663460635d69b (patch) | |
| tree | ad9b8b032c803e1c9054c23fa1b7a0f1976bf98f /Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp | |
| parent | 470286ecfe79d59df14944e5b5d34630fc739391 (diff) | |
| download | qtwebkit-061d58bc0fa016cfeed744fd3e4663460635d69b.tar.gz | |
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>
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp index e2542e844..f65789fce 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp @@ -35,8 +35,6 @@ using namespace WebKit; static const unsigned int gReadBufferSize = 8192; -G_DEFINE_TYPE(WebKitURISchemeRequest, webkit_uri_scheme_request, G_TYPE_OBJECT) - struct _WebKitURISchemeRequestPrivate { WebKitWebContext* webContext; RefPtr<WebSoupRequestManagerProxy> webRequestManager; @@ -53,24 +51,10 @@ struct _WebKitURISchemeRequestPrivate { CString mimeType; }; -static void webkit_uri_scheme_request_init(WebKitURISchemeRequest* request) -{ - WebKitURISchemeRequestPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(request, WEBKIT_TYPE_URI_SCHEME_REQUEST, WebKitURISchemeRequestPrivate); - request->priv = priv; - new (priv) WebKitURISchemeRequestPrivate(); -} - -static void webkitURISchemeRequestFinalize(GObject* object) -{ - WEBKIT_URI_SCHEME_REQUEST(object)->priv->~WebKitURISchemeRequestPrivate(); - G_OBJECT_CLASS(webkit_uri_scheme_request_parent_class)->finalize(object); -} +WEBKIT_DEFINE_TYPE(WebKitURISchemeRequest, webkit_uri_scheme_request, G_TYPE_OBJECT) static void webkit_uri_scheme_request_class_init(WebKitURISchemeRequestClass* requestClass) { - GObjectClass* objectClass = G_OBJECT_CLASS(requestClass); - objectClass->finalize = webkitURISchemeRequestFinalize; - g_type_class_add_private(requestClass, sizeof(WebKitURISchemeRequestPrivate)); } WebKitURISchemeRequest* webkitURISchemeRequestCreate(WebKitWebContext* webContext, WebSoupRequestManagerProxy* webRequestManager, WebURL* webURL, WebPageProxy* initiatingPage, uint64_t requestID) |