From 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 24 Apr 2017 22:40:03 +0300 Subject: Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev --- .../WebKit2/NetworkProcess/Downloads/qt/DownloadQt.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Source/WebKit2/NetworkProcess/Downloads/qt/DownloadQt.cpp') diff --git a/Source/WebKit2/NetworkProcess/Downloads/qt/DownloadQt.cpp b/Source/WebKit2/NetworkProcess/Downloads/qt/DownloadQt.cpp index 9747f5210..3db5ecdfb 100644 --- a/Source/WebKit2/NetworkProcess/Downloads/qt/DownloadQt.cpp +++ b/Source/WebKit2/NetworkProcess/Downloads/qt/DownloadQt.cpp @@ -28,7 +28,6 @@ #include "Download.h" #include "QtFileDownloader.h" -#include "WebProcess.h" #include #include #include @@ -41,19 +40,19 @@ namespace WebKit { void Download::start() { - QNetworkAccessManager* manager = WebProcess::singleton().networkAccessManager(); - ASSERT(manager); ASSERT(!m_qtDownloader); - - m_qtDownloader = new QtFileDownloader(this, manager->get(m_request.toNetworkRequest())); - m_qtDownloader->init(); + m_qtDownloader = new QtFileDownloader(*this, m_request.toNetworkRequest()); } void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& resp) { ASSERT(!m_qtDownloader); - m_qtDownloader = new QtFileDownloader(this, handle->getInternal()->m_job->release()); - m_qtDownloader->init(); + m_qtDownloader = new QtFileDownloader(*this, handle->getInternal()->m_job->release()); +} + +void Download::resume(const IPC::DataReference&, const WTF::String&, const SandboxExtension::Handle&) +{ + notImplemented(); } void Download::cancel() @@ -66,7 +65,7 @@ void Download::platformInvalidate() { ASSERT(m_qtDownloader); m_qtDownloader->deleteLater(); - m_qtDownloader = 0; + m_qtDownloader = nullptr; } void Download::startTransfer(const String& destination) -- cgit v1.2.1