Changeset 230636 in webkit

Timestamp:

Apr 13, 2018, 9:54:12 AM (9 years ago)

Author:

dbates@webkit.org

Message:

Inline NetworkLoad::sharedWillSendRedirectedRequest() into NetworkLoad::willPerformHTTPRedirection()
​https://bugs.webkit.org/show_bug.cgi?id=184593

Reviewed by Alex Christensen.

Following the removal of the pre-Network Session code in r227364, NetworkLoad::sharedWillSendRedirectedRequest()
is only referenced from NetworkLoad::willPerformHTTPRedirection(). We should inline its
implementation into the NetworkLoad::willPerformHTTPRedirection(), remove a function call,
and the cognitive load to follow such a function call when reading the code.

No functionality changed. So, no new tests.

• NetworkProcess/NetworkLoad.cpp:

(WebKit::NetworkLoad::willPerformHTTPRedirection): Moved the implementation of NetworkLoad::sharedWillSendRedirectedRequest()
into this function.
(WebKit::NetworkLoad::sharedWillSendRedirectedRequest): Deleted. Moved its implementation
into NetworkLoad::willPerformHTTPRedirection().

• NetworkProcess/NetworkLoad.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkLoad.cpp (modified) (2 diffs)
• NetworkProcess/NetworkLoad.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-13  Daniel Bates  <dabates@apple.com>
+
+        Inline NetworkLoad::sharedWillSendRedirectedRequest() into NetworkLoad::willPerformHTTPRedirection()
+        https://bugs.webkit.org/show_bug.cgi?id=184593
+
+        Reviewed by Alex Christensen.
+
+        Following the removal of the pre-Network Session code in r227364, NetworkLoad::sharedWillSendRedirectedRequest()
+        is only referenced from NetworkLoad::willPerformHTTPRedirection(). We should inline its
+        implementation into the NetworkLoad::willPerformHTTPRedirection(), remove a function call,
+        and the cognitive load to follow such a function call when reading the code.
+
+        No functionality changed. So, no new tests.
+
+        * NetworkProcess/NetworkLoad.cpp:
+        (WebKit::NetworkLoad::willPerformHTTPRedirection): Moved the implementation of NetworkLoad::sharedWillSendRedirectedRequest()
+        into this function.
+        (WebKit::NetworkLoad::sharedWillSendRedirectedRequest): Deleted. Moved its implementation
+        into NetworkLoad::willPerformHTTPRedirection().
+        * NetworkProcess/NetworkLoad.h:
+
 2018-04-13  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp

@@ -192 +192 @@
 }
 
-void NetworkLoad::sharedWillSendRedirectedRequest(ResourceRequest&& request, ResourceResponse&& redirectResponse)
-{
-    // We only expect to get the willSendRequest callback from ResourceHandle as the result of a redirect.
+bool NetworkLoad::isAllowedToAskUserForCredentials() const
+{
+    return m_client.get().isAllowedToAskUserForCredentials();
+}
+
+void NetworkLoad::convertTaskToDownload(PendingDownload& pendingDownload, const ResourceRequest& updatedRequest, const ResourceResponse& response)
+{
+    if (!m_task)
+        return;
+
+    m_client = pendingDownload;
+    m_currentRequest = updatedRequest;
+    m_task->setPendingDownload(pendingDownload);
+
+    if (m_responseCompletionHandler)
+        NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), std::exchange(m_responseCompletionHandler, nullptr), response);
+}
+
+void NetworkLoad::setPendingDownloadID(DownloadID downloadID)
+{
+    if (!m_task)
+        return;
+
+    m_task->setPendingDownloadID(downloadID);
+}
+
+void NetworkLoad::setSuggestedFilename(const String& suggestedName)
+{
+    if (!m_task)
+        return;
+
+    m_task->setSuggestedFilename(suggestedName);
+}
+
+void NetworkLoad::setPendingDownload(PendingDownload& pendingDownload)
+{
+    if (!m_task)
+        return;
+
+    m_task->setPendingDownload(pendingDownload);
+}
+
+void NetworkLoad::willPerformHTTPRedirection(ResourceResponse&& redirectResponse, ResourceRequest&& request, RedirectCompletionHandler&& completionHandler)
+{
     ASSERT(!redirectResponse.isNull());
     ASSERT(RunLoop::isMain());
+    ASSERT(!m_redirectCompletionHandler);
+
+    m_redirectCompletionHandler = WTFMove(completionHandler);
 
 #if ENABLE(NETWORK_CAPTURE)
@@ -206 +250 @@
     m_currentRequest = request;
     m_client.get().willSendRedirectedRequest(WTFMove(oldRequest), WTFMove(request), WTFMove(redirectResponse));
-}
-
-bool NetworkLoad::isAllowedToAskUserForCredentials() const
-{
-    return m_client.get().isAllowedToAskUserForCredentials();
-}
-
-void NetworkLoad::convertTaskToDownload(PendingDownload& pendingDownload, const ResourceRequest& updatedRequest, const ResourceResponse& response)
-{
-    if (!m_task)
-        return;
-
-    m_client = pendingDownload;
-    m_currentRequest = updatedRequest;
-    m_task->setPendingDownload(pendingDownload);
-
-    if (m_responseCompletionHandler)
-        NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), std::exchange(m_responseCompletionHandler, nullptr), response);
-}
-
-void NetworkLoad::setPendingDownloadID(DownloadID downloadID)
-{
-    if (!m_task)
-        return;
-
-    m_task->setPendingDownloadID(downloadID);
-}
-
-void NetworkLoad::setSuggestedFilename(const String& suggestedName)
-{
-    if (!m_task)
-        return;
-
-    m_task->setSuggestedFilename(suggestedName);
-}
-
-void NetworkLoad::setPendingDownload(PendingDownload& pendingDownload)
-{
-    if (!m_task)
-        return;
-
-    m_task->setPendingDownload(pendingDownload);
-}
-
-void NetworkLoad::willPerformHTTPRedirection(ResourceResponse&& response, ResourceRequest&& request, RedirectCompletionHandler&& completionHandler)
-{
-    ASSERT(!m_redirectCompletionHandler);
-    m_redirectCompletionHandler = WTFMove(completionHandler);
-    sharedWillSendRedirectedRequest(WTFMove(request), WTFMove(response));
 }
 

trunk/Source/WebKit/NetworkProcess/NetworkLoad.h

@@ -80 +80 @@
     void initialize(NetworkSession&);
 
-    void sharedWillSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceResponse&&);
-
     // NetworkDataTaskClient
     void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler&&) final;