WinCairo buildfix after r168611

• Component: WebCore Misc.
• Status: RESOLVED FIXED

[Berta József]

http://trac.webkit.org/changeset/168611 broke the WinCairo build:

CurlDownload.cpp
1>..\platform\network\curl\CurlDownload.cpp(216): error C2059: syntax error : ','
1>..\platform\network\curl\CurlDownload.cpp(218): error C2059: syntax error : ','
1>..\platform\network\curl\CurlDownload.cpp(403): error C2059: syntax error : ','
1>..\platform\network\curl\CurlDownload.cpp(416): error C2059: syntax error : ','

[Berta József]

Created attachment 231299 [details]
Speculative buildfix, not tested

callOnMainThread takes a function parameter:

void callOnMainThread(std::function<void ()>);

I think you have to do something like:

callOnMainThread(MainThreadTask(CurlDownload::downloadFinishedCallback, download));

[Csaba Osztrogonác]

Comment on attachment 231299 [details]
Speculative buildfix, not tested

View in context: https://bugs.webkit.org/attachment.cgi?id=231299&action=review

> Source/WebCore/platform/network/curl/CurlDownload.cpp:216
> -                callOnMainThread<CurlDownload*, CurlDownload*>(CurlDownload::downloadFinishedCallback, download);
> +                callOnMainThread(CurlDownload::downloadFinishedCallback, download);

I think we should use callOnMainThread(MainThreadTask((CurlDownload::downloadFinishedCallback, download)); here.

> Source/WebCore/platform/network/curl/CurlDownload.cpp:218
> -                callOnMainThread<CurlDownload*, CurlDownload*>(CurlDownload::downloadFailedCallback, download);
> +                callOnMainThread(CurlDownload::downloadFailedCallback, download);

ditto

> Source/WebCore/platform/network/curl/CurlDownload.cpp:403
> -            callOnMainThread<CurlDownload*, CurlDownload*>(receivedResponseCallback, this);
> +            callOnMainThread(receivedResponseCallback, this);

ditto

> Source/WebCore/platform/network/curl/CurlDownload.cpp:416
> -    callOnMainThread<CurlDownload*, CurlDownload*, int, int>(receivedDataCallback, this, size);
> +    callOnMainThread(receivedDataCallback, this, size);

ditto

[Berta József]

Created attachment 231301 [details]
Updating patch

[WebKit Commit Bot]

Comment on attachment 231301 [details]
Updating patch

Clearing flags on attachment: 231301

Committed r168626: <http://trac.webkit.org/changeset/168626>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.