Bug 132825

Summary:

WinCairo buildfix after r168611

Product:

WebKit

Reporter:

Berta József <jberta.u-szeged>

Component:

WebCore Misc.

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

bfulgham, commit-queue, darin, galpeter, ossy, peavo, zan

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Speculative buildfix, not tested	none
Updating patch	none

Berta József

Reported 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 : ','

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
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.

Berta József

Comment 1 2014-05-12 09:04:45 PDT

Created attachment 231299 [details] Speculative buildfix, not tested

peavo

Comment 2 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));

Csaba Osztrogonác

Comment 3 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

Berta József

Comment 4 2014-05-12 09:57:56 PDT

Created attachment 231301 [details] Updating patch

WebKit Commit Bot

Comment 5 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>

WebKit Commit Bot

Comment 6 2014-05-12 11:01:34 PDT

All reviewed patches have been landed. Closing bug.

Note You need to log in before you can comment on or make changes to this bug.