Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d

Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 8 insertions, 9 deletions

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 <WebCore/NotImplemented.h>
 #include <WebCore/QNetworkReplyHandler.h>
 #include <WebCore/ResourceHandle.h>
@@ -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)