From b1e9e47fa11f608ae16bc07f97a2acf95bf80272 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 1 Jun 2012 10:36:58 +0200
Subject: Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46
 (http://svn.webkit.org/repository/webkit/trunk@119200)

Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
---
 .../WebKit2/UIProcess/API/gtk/WebKitDownload.cpp   | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp')

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp
index 018f08d3d..61d316f6c 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp
@@ -20,8 +20,10 @@
 #include "config.h"
 #include "WebKitDownload.h"
 
+#include "DownloadProxy.h"
 #include "WebKitDownloadPrivate.h"
 #include "WebKitMarshal.h"
+#include "WebKitURIRequestPrivate.h"
 #include "WebKitURIResponsePrivate.h"
 #include <WebCore/ErrorsGtk.h>
 #include <WebCore/ResourceResponse.h>
@@ -53,6 +55,7 @@ enum {
 struct _WebKitDownloadPrivate {
     WKRetainPtr<WKDownloadRef> wkDownload;
 
+    GRefPtr<WebKitURIRequest> request;
     GRefPtr<WebKitURIResponse> response;
     CString destinationURI;
     guint64 currentSize;
@@ -359,6 +362,25 @@ void webkitDownloadDestinationCreated(WebKitDownload* download, const CString& d
     g_signal_emit(download, signals[CREATED_DESTINATION], 0, destinationURI.data(), &returnValue);
 }
 
+/**
+ * webkit_download_get_request:
+ * @download: a #WebKitDownload
+ *
+ * Retrieves the #WebKitURIRequest object that backs the download
+ * process.
+ *
+ * Returns: (transfer none): the #WebKitURIRequest of @download
+ */
+WebKitURIRequest* webkit_download_get_request(WebKitDownload* download)
+{
+    g_return_val_if_fail(WEBKIT_IS_DOWNLOAD(download), 0);
+
+    WebKitDownloadPrivate* priv = download->priv;
+    if (!priv->request)
+        priv->request = adoptGRef(webkitURIRequestCreateForResourceRequest(toImpl(priv->wkDownload.get())->request()));
+    return download->priv->request.get();
+}
+
 /**
  * webkit_download_get_destination:
  * @download: a #WebKitDownload
-- 
cgit v1.2.1