Bug 132825 - WinCairo buildfix after r168611
Summary: WinCairo buildfix after r168611
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-12 09:00 PDT by Berta József
Modified: 2014-05-12 11:01 PDT (History)
7 users (show)

See Also:


Attachments
Speculative buildfix, not tested (2.52 KB, patch)
2014-05-12 09:04 PDT, Berta József
no flags Details | Formatted Diff | Diff
Updating patch (2.54 KB, patch)
2014-05-12 09:57 PDT, Berta József
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Berta József 2014-05-12 09:00:36 PDT
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 : ','
Comment 1 Berta József 2014-05-12 09:04:45 PDT
Created attachment 231299 [details]
Speculative buildfix, not tested
Comment 2 peavo 2014-05-12 09:26:59 PDT
callOnMainThread takes a function parameter:

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

I think you have to do something like:

callOnMainThread(MainThreadTask(CurlDownload::downloadFinishedCallback, download));
Comment 3 Csaba Osztrogonác 2014-05-12 09:28:09 PDT
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
Comment 4 Berta József 2014-05-12 09:57:56 PDT
Created attachment 231301 [details]
Updating patch
Comment 5 WebKit Commit Bot 2014-05-12 11:01:29 PDT
Comment on attachment 231301 [details]
Updating patch

Clearing flags on attachment: 231301

Committed r168626: <http://trac.webkit.org/changeset/168626>
Comment 6 WebKit Commit Bot 2014-05-12 11:01:34 PDT
All reviewed patches have been landed.  Closing bug.