Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp (202035 => 202036)
--- trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp 2016-06-14 07:35:53 UTC (rev 202035)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp 2016-06-14 07:43:24 UTC (rev 202036)
@@ -45,10 +45,10 @@
namespace WebKit {
-class DownloadClient : public ResourceHandleClient {
+class DownloadClient final : public ResourceHandleClient {
WTF_MAKE_NONCOPYABLE(DownloadClient);
public:
- DownloadClient(Download* download)
+ DownloadClient(Download& download)
: m_download(download)
, m_handleResponseLater(RunLoop::main(), this, &DownloadClient::handleResponse)
, m_allowOverwrite(false)
@@ -73,28 +73,28 @@
void downloadFailed(const ResourceError& error)
{
deleteFilesIfNeeded();
- m_download->didFail(error, IPC::DataReference());
+ m_download.didFail(error, IPC::DataReference());
}
- void didReceiveResponse(ResourceHandle*, const ResourceResponse& response)
+ void didReceiveResponse(ResourceHandle*, ResourceResponse&& response) override
{
- m_response = response;
- m_download->didReceiveResponse(response);
+ m_response = WTFMove(response);
+ m_download.didReceiveResponse(m_response);
- if (response.httpStatusCode() >= 400) {
- downloadFailed(platformDownloadNetworkError(response.httpStatusCode(), response.url(), response.httpStatusText()));
+ if (m_response.httpStatusCode() >= 400) {
+ downloadFailed(platformDownloadNetworkError(m_response.httpStatusCode(), m_response.url(), m_response.httpStatusText()));
return;
}
- String suggestedFilename = response.suggestedFilename();
+ String suggestedFilename = m_response.suggestedFilename();
if (suggestedFilename.isEmpty()) {
- URL url = ""
+ URL url = ""
url.setQuery(String());
url.removeFragmentIdentifier();
suggestedFilename = decodeURLEscapeSequences(url.lastPathComponent());
}
- String destinationURI = m_download->decideDestinationWithSuggestedFilename(suggestedFilename, m_allowOverwrite);
+ String destinationURI = m_download.decideDestinationWithSuggestedFilename(suggestedFilename, m_allowOverwrite);
if (destinationURI.isEmpty()) {
#if PLATFORM(GTK)
GUniquePtr<char> buffer(g_strdup_printf(_("Cannot determine destination URI for download with suggested filename %s"), suggestedFilename.utf8().data()));
@@ -102,7 +102,7 @@
#else
String errorMessage = makeString("Cannot determine destination URI for download with suggested filename ", suggestedFilename);
#endif
- downloadFailed(platformDownloadDestinationError(response, errorMessage));
+ downloadFailed(platformDownloadDestinationError(m_response, errorMessage));
return;
}
@@ -115,7 +115,7 @@
outputStream = adoptGRef(g_file_create(m_destinationFile.get(), G_FILE_CREATE_NONE, nullptr, &error.outPtr()));
if (!outputStream) {
m_destinationFile.clear();
- downloadFailed(platformDownloadDestinationError(response, error->message));
+ downloadFailed(platformDownloadDestinationError(m_response, error->message));
return;
}
@@ -123,14 +123,14 @@
m_intermediateFile = adoptGRef(g_file_new_for_uri(intermediateURI.utf8().data()));
m_outputStream = adoptGRef(g_file_replace(m_intermediateFile.get(), 0, TRUE, G_FILE_CREATE_NONE, 0, &error.outPtr()));
if (!m_outputStream) {
- downloadFailed(platformDownloadDestinationError(response, error->message));
+ downloadFailed(platformDownloadDestinationError(m_response, error->message));
return;
}
- m_download->didCreateDestination(destinationURI);
+ m_download.didCreateDestination(destinationURI);
}
- void didReceiveData(ResourceHandle*, const char* data, unsigned length, int /*encodedDataLength*/)
+ void didReceiveData(ResourceHandle*, const char* data, unsigned length, int /*encodedDataLength*/) override
{
if (m_handleResponseLater.isActive()) {
m_handleResponseLater.stop();
@@ -144,12 +144,12 @@
downloadFailed(platformDownloadDestinationError(m_response, error->message));
return;
}
- m_download->didReceiveData(bytesWritten);
+ m_download.didReceiveData(bytesWritten);
}
- void didFinishLoading(ResourceHandle*, double)
+ void didFinishLoading(ResourceHandle*, double) override
{
- m_outputStream = 0;
+ m_outputStream = nullptr;
ASSERT(m_destinationFile);
ASSERT(m_intermediateFile);
@@ -165,34 +165,24 @@
g_file_info_set_attribute_string(info.get(), "xattr::xdg.origin.url", uri.data());
g_file_set_attributes_async(m_destinationFile.get(), info.get(), G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, nullptr, nullptr, nullptr);
- m_download->didFinish();
+ m_download.didFinish();
}
- void didFail(ResourceHandle*, const ResourceError& error)
+ void didFail(ResourceHandle*, const ResourceError& error) override
{
downloadFailed(platformDownloadNetworkError(error.errorCode(), error.failingURL(), error.localizedDescription()));
}
- void wasBlocked(ResourceHandle*)
- {
- notImplemented();
- }
-
- void cannotShowURL(ResourceHandle*)
- {
- notImplemented();
- }
-
void cancel(ResourceHandle* handle)
{
handle->cancel();
deleteFilesIfNeeded();
- m_download->didCancel(IPC::DataReference());
+ m_download.didCancel(IPC::DataReference());
}
void handleResponse()
{
- didReceiveResponse(nullptr, m_delayedResponse);
+ didReceiveResponse(nullptr, WTFMove(m_delayedResponse));
}
void handleResponseLater(const ResourceResponse& response)
@@ -207,7 +197,7 @@
m_handleResponseLater.startOneShot(0);
}
- Download* m_download;
+ Download& m_download;
GRefPtr<GFileOutputStream> m_outputStream;
ResourceResponse m_response;
GRefPtr<GFile> m_destinationFile;
@@ -221,7 +211,7 @@
{
ASSERT(!m_downloadClient);
ASSERT(!m_resourceHandle);
- m_downloadClient = std::make_unique<DownloadClient>(this);
+ m_downloadClient = std::make_unique<DownloadClient>(*this);
m_resourceHandle = ResourceHandle::create(0, m_request, m_downloadClient.get(), false, false);
didStart();
}
@@ -230,7 +220,7 @@
{
ASSERT(!m_downloadClient);
ASSERT(!m_resourceHandle);
- m_downloadClient = std::make_unique<DownloadClient>(this);
+ m_downloadClient = std::make_unique<DownloadClient>(*this);
m_resourceHandle = resourceHandle->releaseForDownload(m_downloadClient.get());
didStart();
static_cast<DownloadClient*>(m_downloadClient.get())->handleResponseLater(response);
