diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
| commit | ee4c86d1990a9e26277a6948e7027ad8d525ebfa (patch) | |
| tree | 1e2d3408cd097606571f40ab63353c27bcb7dd5c /Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp | |
| parent | d882bec96d0d30aeeda2141bfadfca7f038ee862 (diff) | |
| download | qtwebkit-ee4c86d1990a9e26277a6948e7027ad8d525ebfa.tar.gz | |
Imported WebKit commit 795dcd25a9649fccaf1c9b685f6e2ffedaf7e620 (http://svn.webkit.org/repository/webkit/trunk@131718)
New snapshot that includes the return of -fkeep-memory at link time
to reduce memory pressure as well as modularized documentation
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp index aa2623783..620ac96db 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp @@ -31,7 +31,6 @@ #include <wtf/gobject/GOwnPtr.h> #include <wtf/gobject/GRefPtr.h> -using namespace WebKit; using namespace WebCore; enum { @@ -53,7 +52,7 @@ enum { }; struct _WebKitDownloadPrivate { - WKRetainPtr<WKDownloadRef> wkDownload; + RefPtr<DownloadProxy> download; GRefPtr<WebKitURIRequest> request; GRefPtr<WebKitURIResponse> response; @@ -264,11 +263,11 @@ static void webkit_download_class_init(WebKitDownloadClass* downloadClass) g_type_class_add_private(downloadClass, sizeof(WebKitDownloadPrivate)); } -WebKitDownload* webkitDownloadCreate(WKDownloadRef wkDownload) +WebKitDownload* webkitDownloadCreate(DownloadProxy* downloadProxy) { - ASSERT(wkDownload); + ASSERT(downloadProxy); WebKitDownload* download = WEBKIT_DOWNLOAD(g_object_new(WEBKIT_TYPE_DOWNLOAD, NULL)); - download->priv->wkDownload = wkDownload; + download->priv->download = downloadProxy; return download; } @@ -379,8 +378,8 @@ WebKitURIRequest* webkit_download_get_request(WebKitDownload* download) WebKitDownloadPrivate* priv = download->priv; if (!priv->request) - priv->request = adoptGRef(webkitURIRequestCreateForResourceRequest(toImpl(priv->wkDownload.get())->request())); - return download->priv->request.get(); + priv->request = adoptGRef(webkitURIRequestCreateForResourceRequest(priv->download->request())); + return priv->request.get(); } /** @@ -465,7 +464,7 @@ void webkit_download_cancel(WebKitDownload* download) g_return_if_fail(WEBKIT_IS_DOWNLOAD(download)); download->priv->isCancelled = true; - WKDownloadCancel(download->priv->wkDownload.get()); + download->priv->download->cancel(); } /** |