Diff
Modified: trunk/Source/WebCore/ChangeLog (276210 => 276211)
--- trunk/Source/WebCore/ChangeLog 2021-04-17 22:40:08 UTC (rev 276210)
+++ trunk/Source/WebCore/ChangeLog 2021-04-17 22:55:14 UTC (rev 276211)
@@ -1,3 +1,28 @@
+2021-04-17 Basuke Suzuki <basuke.suz...@sony.com>
+
+ [Curl] Remove warnings on curl layer.
+ https://bugs.webkit.org/show_bug.cgi?id=224721
+
+ Reviewed by Darin Adler.
+
+ Remove unused parameters to prevent warnings. For CurlRequest, it passes
+ member variable to private method which is meaningless so that it was
+ removed.
+
+ Covered by existing test files.
+
+ * platform/network/curl/CookieJarDB.cpp:
+ (WebCore::CookieJarDB::createPrepareStatement):
+ * platform/network/curl/CurlFormDataStream.cpp:
+ (WebCore::CurlFormDataStream::read):
+ * platform/network/curl/CurlRequest.cpp:
+ (WebCore::CurlRequest::setupTransfer):
+ (WebCore::CurlRequest::setupPUT):
+ (WebCore::CurlRequest::setupPOST):
+ * platform/network/curl/CurlRequest.h:
+ * platform/network/curl/NetworkStorageSessionCurl.cpp:
+ (WebCore::NetworkStorageSession::setCookiesFromDOM const):
+
2021-04-17 Chris Lord <cl...@igalia.com>
Create local copy of CSSParserContext in CSSPropertyParserWorkerSafe
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp (276210 => 276211)
--- trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp 2021-04-17 22:40:08 UTC (rev 276210)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp 2021-04-17 22:55:14 UTC (rev 276211)
@@ -639,7 +639,7 @@
{
auto statement = makeUnique<SQLiteStatement>(m_database, sql);
int ret = statement->prepare();
- ASSERT(ret == SQLITE_OK);
+ ASSERT_UNUSED(ret, ret == SQLITE_OK);
m_statements.add(sql, WTFMove(statement));
}
Modified: trunk/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp (276210 => 276211)
--- trunk/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp 2021-04-17 22:40:08 UTC (rev 276210)
+++ trunk/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp 2021-04-17 22:55:14 UTC (rev 276211)
@@ -128,7 +128,7 @@
return readFromData(bytes, bufferPosition, bufferSize);
}, [&] (const FormDataElement::EncodedFileData& fileData) {
return readFromFile(fileData, bufferPosition, bufferSize);
- }, [] (const FormDataElement::EncodedBlobData& blobData) {
+ }, [] (const FormDataElement::EncodedBlobData&) {
ASSERT_NOT_REACHED();
return WTF::nullopt;
}
Modified: trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp (276210 => 276211)
--- trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2021-04-17 22:40:08 UTC (rev 276210)
+++ trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2021-04-17 22:55:14 UTC (rev 276211)
@@ -216,14 +216,14 @@
if (method == "GET")
m_curlHandle->enableHttpGetRequest();
else if (method == "POST")
- setupPOST(m_request);
+ setupPOST();
else if (method == "PUT")
- setupPUT(m_request);
+ setupPUT();
else if (method == "HEAD")
m_curlHandle->enableHttpHeadRequest();
else {
m_curlHandle->setHttpCustomRequest(method);
- setupPUT(m_request);
+ setupPUT();
}
if (!m_user.isEmpty() || !m_password.isEmpty()) {
@@ -529,7 +529,7 @@
header.add(HTTPHeaderName::AcceptLanguage, language);
}
-void CurlRequest::setupPUT(ResourceRequest& request)
+void CurlRequest::setupPUT()
{
m_curlHandle->enableHttpPutRequest();
@@ -543,7 +543,7 @@
setupSendData(true);
}
-void CurlRequest::setupPOST(ResourceRequest& request)
+void CurlRequest::setupPOST()
{
m_curlHandle->enableHttpPostRequest();
Modified: trunk/Source/WebCore/platform/network/curl/CurlRequest.h (276210 => 276211)
--- trunk/Source/WebCore/platform/network/curl/CurlRequest.h 2021-04-17 22:40:08 UTC (rev 276210)
+++ trunk/Source/WebCore/platform/network/curl/CurlRequest.h 2021-04-17 22:55:14 UTC (rev 276211)
@@ -135,8 +135,8 @@
// For setup
void appendAcceptLanguageHeader(HTTPHeaderMap&);
- void setupPOST(ResourceRequest&);
- void setupPUT(ResourceRequest&);
+ void setupPOST();
+ void setupPUT();
void setupSendData(bool forPutMethod);
// Processing for DidReceiveResponse
Modified: trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp (276210 => 276211)
--- trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp 2021-04-17 22:40:08 UTC (rev 276210)
+++ trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp 2021-04-17 22:55:14 UTC (rev 276211)
@@ -95,11 +95,12 @@
return m_cookieDatabase;
}
-void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameSiteInfo&, const URL& url, Optional<FrameIdentifier> frameID, Optional<PageIdentifier> pageID, ShouldAskITP, const String& value, ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking) const
+void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameSiteInfo&, const URL& url, Optional<FrameIdentifier>, Optional<PageIdentifier> pageID, ShouldAskITP, const String& value, ShouldRelaxThirdPartyCookieBlocking) const
{
#if ENABLE(RESOURCE_LOAD_STATISTICS)
Optional<Seconds> cappedLifetime = clientSideCookieCap(RegistrableDomain { firstParty }, pageID);
#else
+ UNUSED_PARAM(pageID);
Optional<Seconds> cappedLifetime = WTF::nullopt;
#endif
cookieDatabase().setCookie(firstParty, url, value, CookieJarDB::Source::Script, cappedLifetime);
