[Curl] Remove unnecessary function from ResourceResponseCurl

https://bugs.webkit.org/show_bug.cgi?id=249195 Reviewed by Fujii Hironori. Remove ResourceResponse::setCertificateInfo. Also, we configure CertificateInfo in a ResourceResponse constructor. * Source/WebCore/platform/network/curl/CurlResourceHandleDelegate.cpp: (WebCore::CurlResourceHandleDelegate::curlDidReceiveResponse): * Source/WebCore/platform/network/curl/ResourceResponse.h: * Source/WebCore/platform/network/curl/ResourceResponseCurl.cpp: (WebCore::ResourceResponse::ResourceResponse): (WebCore::ResourceResponse::setCertificateInfo): Deleted. * Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp: (WebKit::NetworkDataTaskCurl::curlDidReceiveResponse): Canonical link: https://commits.webkit.org/257777@main
WebKit · Dec 13, 2022 · fb94f2d · fb94f2d
1 parent 82b61e2
commit fb94f2d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/Source/WebCore/platform/network/curl/CurlResourceHandleDelegate.cpp b/Source/WebCore/platform/network/curl/CurlResourceHandleDelegate.cpp
@@ -106,7 +106,6 @@ void CurlResourceHandleDelegate::curlDidReceiveResponse(CurlRequest& request, Cu
         return;
 
     m_response = ResourceResponse(receivedResponse);
-    m_response.setCertificateInfo(WTFMove(receivedResponse.certificateInfo));
 
     updateNetworkLoadMetrics(receivedResponse.networkLoadMetrics);
     m_response.setDeprecatedNetworkLoadMetrics(Box<NetworkLoadMetrics>::create(WTFMove(receivedResponse.networkLoadMetrics)));

diff --git a/Source/WebCore/platform/network/curl/ResourceResponse.h b/Source/WebCore/platform/network/curl/ResourceResponse.h
@@ -46,12 +46,10 @@ class WEBCORE_EXPORT ResourceResponse : public ResourceResponseBase {
     {
     }
 
-    ResourceResponse(const CurlResponse&);
+    ResourceResponse(CurlResponse&);
 
     void appendHTTPHeaderField(const String&);
 
-    void setCertificateInfo(CertificateInfo&&);
-
     bool shouldRedirect();
     bool isMovedPermanently() const;
     bool isFound() const;

diff --git a/Source/WebCore/platform/network/curl/ResourceResponseCurl.cpp b/Source/WebCore/platform/network/curl/ResourceResponseCurl.cpp
@@ -78,7 +78,7 @@ bool ResourceResponse::isAppendableHeader(const String &key)
     return false;
 }
 
-ResourceResponse::ResourceResponse(const CurlResponse& response)
+ResourceResponse::ResourceResponse(CurlResponse& response)
     : ResourceResponseBase()
 {
     setURL(response.url);
@@ -105,6 +105,7 @@ ResourceResponse::ResourceResponse(const CurlResponse& response)
 
     setMimeType(AtomString { extractMIMETypeFromMediaType(httpHeaderField(HTTPHeaderName::ContentType)).convertToASCIILowercase() });
     setTextEncodingName(extractCharsetFromMediaType(httpHeaderField(HTTPHeaderName::ContentType)).toAtomString());
+    setCertificateInfo(WTFMove(response.certificateInfo));
     setSource(ResourceResponse::Source::Network);
 }
 
@@ -145,11 +146,6 @@ void ResourceResponse::setStatusLine(StringView header)
     }
 }
 
-void ResourceResponse::setCertificateInfo(CertificateInfo&& certificateInfo)
-{
-    m_certificateInfo = WTFMove(certificateInfo);
-}
-
 String ResourceResponse::platformSuggestedFilename() const
 {
     StringView contentDisposition = filenameFromHTTPContentDisposition(httpHeaderField(HTTPHeaderName::ContentDisposition));

diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
@@ -166,7 +166,6 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo
         return;
 
     m_response = ResourceResponse(receivedResponse);
-    m_response.setCertificateInfo(WTFMove(receivedResponse.certificateInfo));
 
     updateNetworkLoadMetrics(receivedResponse.networkLoadMetrics);
     m_response.setDeprecatedNetworkLoadMetrics(Box<NetworkLoadMetrics>::create(WTFMove(receivedResponse.networkLoadMetrics)));