Changeset 230635 in webkit

Timestamp:

Apr 13, 2018 9:48:56 AM (6 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::sharedDidReceiveResponse() into NetworkLoad::notifyDidReceiveResponse()
+        https://bugs.webkit.org/show_bug.cgi?id=184592
+
+        Reviewed by Alex Christensen.
+
+        Following the removal of the pre-Network Session code in r227364, NetworkLoad::sharedDidReceiveResponse()
+        is only referenced from NetworkLoad::notifyDidReceiveResponse(). We should inline its
+        implementation into the NetworkLoad::notifyDidReceiveResponse(), 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::notifyDidReceiveResponse): Moved the implementation of NetworkLoad::sharedDidReceiveResponse()
+        into this function.
+        (WebKit::NetworkLoad::sharedDidReceiveResponse): Deleted. Moved its implementation into
+        NetworkLoad::notifyDidReceiveResponse().
+        * NetworkProcess/NetworkLoad.h:
+
 2018-04-13  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp

@@ -192 +192 @@
 }
 
-NetworkLoadClient::ShouldContinueDidReceiveResponse NetworkLoad::sharedDidReceiveResponse(ResourceResponse&& response)
-{
-    response.setSource(ResourceResponse::Source::Network);
-    if (m_parameters.needsCertificateInfo)
-        response.includeCertificateInfo();
-
-    return m_client.get().didReceiveResponse(WTFMove(response));
-}
-
 void NetworkLoad::sharedWillSendRedirectedRequest(ResourceRequest&& request, ResourceResponse&& redirectResponse)
 {
@@ -344 +335 @@
 #endif
 
-    if (sharedDidReceiveResponse(WTFMove(response)) == NetworkLoadClient::ShouldContinueDidReceiveResponse::No) {
+    response.setSource(ResourceResponse::Source::Network);
+    if (m_parameters.needsCertificateInfo)
+        response.includeCertificateInfo();
+
+    if (m_client.get().didReceiveResponse(WTFMove(response)) == NetworkLoadClient::ShouldContinueDidReceiveResponse::No) {
         m_responseCompletionHandler = WTFMove(completionHandler);
         return;

trunk/Source/WebKit/NetworkProcess/NetworkLoad.h

@@ -80 +80 @@
     void initialize(NetworkSession&);
 
-    NetworkLoadClient::ShouldContinueDidReceiveResponse sharedDidReceiveResponse(WebCore::ResourceResponse&&);
     void sharedWillSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceResponse&&);