Changeset 207530 in webkit

Timestamp:

Oct 19, 2016 12:59:27 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

NetworkSession: updatedRequest parameter of NetworkProcess::findPendingDownloadLocation is unused since r206988
​https://bugs.webkit.org/show_bug.cgi?id=163588

Reviewed by Alex Christensen.

The parameter was used only for the DownloadProxy::DidStart message that is no longer sent from
findPendingDownloadLocation since r206988.

• NetworkProcess/NetworkDataTask.h:

(WebKit::NetworkDataTask::currentRequest): Removed since it's unused now.

• NetworkProcess/NetworkLoad.cpp:

(WebKit::NetworkLoad::convertTaskToDownload): Update the m_currentRequest and pass it to DidStart message.
(WebKit::NetworkLoad::didReceiveResponseNetworkSession):

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::findPendingDownloadLocation):

• NetworkProcess/NetworkProcess.h:
• NetworkProcess/cocoa/NetworkDataTaskCocoa.mm: Remove currentRequest() implementation.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkDataTask.h (modified) (1 diff)
• NetworkProcess/NetworkLoad.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-10-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        NetworkSession: updatedRequest parameter of NetworkProcess::findPendingDownloadLocation is unused since r206988
+        https://bugs.webkit.org/show_bug.cgi?id=163588
+
+        Reviewed by Alex Christensen.
+
+        The parameter was used only for the DownloadProxy::DidStart message that is no longer sent from
+        findPendingDownloadLocation since r206988.
+
+        * NetworkProcess/NetworkDataTask.h:
+        (WebKit::NetworkDataTask::currentRequest): Removed since it's unused now.
+        * NetworkProcess/NetworkLoad.cpp:
+        (WebKit::NetworkLoad::convertTaskToDownload): Update the m_currentRequest and pass it to DidStart message.
+        (WebKit::NetworkLoad::didReceiveResponseNetworkSession):
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::findPendingDownloadLocation):
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm: Remove currentRequest() implementation.
+
 2016-10-19  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h

@@ -134 +134 @@
 
     const WebCore::ResourceRequest& firstRequest() const { return m_firstRequest; }
-    WebCore::ResourceRequest currentRequest();
     String suggestedFilename();
     void setSuggestedFilename(const String&);

trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp

@@ -190 +190 @@
         return;
 
-    NetworkProcess::singleton().downloadManager().downloadProxyConnection()->send(Messages::DownloadProxy::DidStart(updatedRequest, String()), downloadID.downloadID());
+    m_currentRequest = updatedRequest;
+    NetworkProcess::singleton().downloadManager().downloadProxyConnection()->send(Messages::DownloadProxy::DidStart(m_currentRequest, String()), downloadID.downloadID());
     m_task->setPendingDownloadID(downloadID);
     
     ASSERT(m_responseCompletionHandler);
     if (m_responseCompletionHandler)
-        NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), std::exchange(m_responseCompletionHandler, nullptr), updatedRequest, response);
+        NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), std::exchange(m_responseCompletionHandler, nullptr), response);
 }
 
@@ -272 +273 @@
     ASSERT(isMainThread());
     if (m_task && m_task->pendingDownloadID().downloadID())
-        NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), m_task->currentRequest(), response);
+        NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), response);
     else if (sharedDidReceiveResponse(WTFMove(response)) == NetworkLoadClient::ShouldContinueDidReceiveResponse::Yes)
         completionHandler(PolicyUse);

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -507 +507 @@
 }
 
-void NetworkProcess::findPendingDownloadLocation(NetworkDataTask& networkDataTask, ResponseCompletionHandler&& completionHandler, const ResourceRequest& updatedRequest, const ResourceResponse& response)
+void NetworkProcess::findPendingDownloadLocation(NetworkDataTask& networkDataTask, ResponseCompletionHandler&& completionHandler, const ResourceResponse& response)
 {
     uint64_t destinationID = networkDataTask.pendingDownloadID().downloadID();

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

@@ -108 +108 @@
 
 #if USE(NETWORK_SESSION)
-    void findPendingDownloadLocation(NetworkDataTask&, ResponseCompletionHandler&&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
+    void findPendingDownloadLocation(NetworkDataTask&, ResponseCompletionHandler&&, const WebCore::ResourceResponse&);
 #endif
 

trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

@@ -386 +386 @@
 }
 
-WebCore::ResourceRequest NetworkDataTask::currentRequest()
-{
-    return [m_task currentRequest];
-}
-
 void NetworkDataTask::cancel()
 {