Skip to content
Permalink
Browse files
[Curl] Fix warning on clang.
https://bugs.webkit.org/show_bug.cgi?id=182986

Patch by Basuke Suzuki <Basuke.Suzuki@sony.com> on 2018-02-22
Reviewed by Konstantin Tokarev.

No new tests because there's no behaviro changes.

* platform/network/curl/CurlResourceHandleDelegate.cpp:
(WebCore::CurlResourceHandleDelegate::curlDidSendData):
(WebCore::CurlResourceHandleDelegate::curlDidReceiveBuffer):
(WebCore::CurlResourceHandleDelegate::curlDidFailWithError):
* platform/network/curl/CurlResourceHandleDelegate.h:

Canonical link: https://commits.webkit.org/198796@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@228927 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
basuke authored and webkit-commit-queue committed Feb 22, 2018
1 parent 89c53e9 commit d0bf0b659576348f11433b3cd9a53c227175b71d
@@ -1,3 +1,18 @@
2018-02-22 Basuke Suzuki <Basuke.Suzuki@sony.com>

[Curl] Fix warning on clang.
https://bugs.webkit.org/show_bug.cgi?id=182986

Reviewed by Konstantin Tokarev.

No new tests because there's no behaviro changes.

* platform/network/curl/CurlResourceHandleDelegate.cpp:
(WebCore::CurlResourceHandleDelegate::curlDidSendData):
(WebCore::CurlResourceHandleDelegate::curlDidReceiveBuffer):
(WebCore::CurlResourceHandleDelegate::curlDidFailWithError):
* platform/network/curl/CurlResourceHandleDelegate.h:

2018-02-22 Youenn Fablet <youenn@apple.com>

WorkerCacheStorageConnection::doRemove can assert in case two frames try to delete the same cache at the same time
@@ -76,6 +76,7 @@ ResourceHandleInternal* CurlResourceHandleDelegate::d()

void CurlResourceHandleDelegate::curlDidSendData(CurlRequest& request, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
{
UNUSED_PARAM(request);
ASSERT(isMainThread());

if (cancelledOrClientless())
@@ -144,6 +145,7 @@ void CurlResourceHandleDelegate::curlDidReceiveResponse(CurlRequest& request, co

void CurlResourceHandleDelegate::curlDidReceiveBuffer(CurlRequest& request, Ref<SharedBuffer>&& buffer)
{
UNUSED_PARAM(request);
ASSERT(isMainThread());

if (cancelledOrClientless())
@@ -168,6 +170,7 @@ void CurlResourceHandleDelegate::curlDidComplete(CurlRequest& request)

void CurlResourceHandleDelegate::curlDidFailWithError(CurlRequest& request, const ResourceError& resourceError)
{
UNUSED_PARAM(request);
ASSERT(isMainThread());

if (cancelledOrClientless())
@@ -39,7 +39,7 @@ class ResourceHandle;
class ResourceHandleClient;
class ResourceHandleInternal;

class CurlResourceHandleDelegate : public CurlRequestClient {
class CurlResourceHandleDelegate final : public CurlRequestClient {
WTF_MAKE_NONCOPYABLE(CurlResourceHandleDelegate); WTF_MAKE_FAST_ALLOCATED;
public:
CurlResourceHandleDelegate(ResourceHandle&);
@@ -48,14 +48,14 @@ class CurlResourceHandleDelegate : public CurlRequestClient {

// CurlRequestClient methods

void ref();
void deref();
void ref() final;
void deref() final;

void curlDidSendData(CurlRequest&, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
void curlDidReceiveResponse(CurlRequest&, const CurlResponse&) override;
void curlDidReceiveBuffer(CurlRequest&, Ref<SharedBuffer>&&) override;
void curlDidComplete(CurlRequest&) override;
void curlDidFailWithError(CurlRequest&, const ResourceError&) override;
void curlDidSendData(CurlRequest&, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) final;
void curlDidReceiveResponse(CurlRequest&, const CurlResponse&) final;
void curlDidReceiveBuffer(CurlRequest&, Ref<SharedBuffer>&&) final;
void curlDidComplete(CurlRequest&) final;
void curlDidFailWithError(CurlRequest&, const ResourceError&) final;

private:
ResourceHandle& m_handle;

0 comments on commit d0bf0b6

Please sign in to comment.