132825 2014-05-12 09:00:36 -0700 WinCairo buildfix after r168611 2014-05-12 11:01:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jberta.u-szeged webkit-unassigned bfulgham commit-queue darin galpeter ossy peavo zan oldest_to_newest 1008615 0 jberta.u-szeged 2014-05-12 09:00:36 -0700 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 : ',' 1008619 1 231299 jberta.u-szeged 2014-05-12 09:04:45 -0700 Created attachment 231299 Speculative buildfix, not tested 1008622 2 peavo 2014-05-12 09:26:59 -0700 callOnMainThread takes a function parameter: void callOnMainThread(std::function<void ()>); I think you have to do something like: callOnMainThread(MainThreadTask(CurlDownload::downloadFinishedCallback, download)); 1008624 3 231299 ossy 2014-05-12 09:28:09 -0700 Comment on attachment 231299 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 1008628 4 231301 jberta.u-szeged 2014-05-12 09:57:56 -0700 Created attachment 231301 Updating patch 1008654 5 231301 commit-queue 2014-05-12 11:01:29 -0700 Comment on attachment 231301 Updating patch Clearing flags on attachment: 231301 Committed r168626: <http://trac.webkit.org/changeset/168626> 1008655 6 commit-queue 2014-05-12 11:01:34 -0700 All reviewed patches have been landed. Closing bug. 231299 2014-05-12 09:04:45 -0700 2014-05-12 09:57:56 -0700 Speculative buildfix, not tested patch.diff text/plain 2579 jberta.u-szeged ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NWExNzJiLi5kYjcwYjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMDUtMTIgIEpvenNlZiBCZXJ0YSAgPGpiZXJ0YS51LXN6ZWdlZEBwYXJ0bmVyLnNh bXN1bmcuY29tPgorCisgICAgICAgIFdpbkNhaXJvIGJ1aWxkZml4IGFmdGVyIHIxNjg2MTEKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjgyNQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwZWN1bGF0aXZl IGJ1aWxkZml4LCBub3QgdGVzdGVkCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwv Q3VybERvd25sb2FkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxEb3dubG9hZE1hbmFnZXI6 OmRvd25sb2FkVGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxEb3dubG9hZDo6ZGlkUmVj ZWl2ZUhlYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpDdXJsRG93bmxvYWQ6OmRpZFJlY2VpdmVE YXRhKToKKwogMjAxNC0wNS0xMiAgUmFkdSBTdGF2aWxhICA8c3RhdmlsYUBhZG9iZS5jb20+CiAK ICAgICAgICAgSW52YWxpZCBpbmZvcm1hdGlvbiByZW1haW5pbmcgaW4gbGluZVRvUmVnaW9uIG1h cCBvZiBSZW5kZXJGbG93VGhyZWFkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL0N1cmxEb3dubG9hZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2N1cmwvQ3VybERvd25sb2FkLmNwcAppbmRleCAwOTExM2NlLi44ZWZmNTlmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybERvd25s b2FkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybERv d25sb2FkLmNwcApAQCAtMjEzLDkgKzIxMyw5IEBAIHZvaWQgQ3VybERvd25sb2FkTWFuYWdlcjo6 ZG93bmxvYWRUaHJlYWQodm9pZCogZGF0YSkKIAogICAgICAgICBpZiAobXNnLT5tc2cgPT0gQ1VS TE1TR19ET05FKSB7CiAgICAgICAgICAgICBpZiAobXNnLT5kYXRhLnJlc3VsdCA9PSBDVVJMRV9P SykKLSAgICAgICAgICAgICAgICBjYWxsT25NYWluVGhyZWFkPEN1cmxEb3dubG9hZCosIEN1cmxE b3dubG9hZCo+KEN1cmxEb3dubG9hZDo6ZG93bmxvYWRGaW5pc2hlZENhbGxiYWNrLCBkb3dubG9h ZCk7CisgICAgICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZChDdXJsRG93bmxvYWQ6OmRvd25s b2FkRmluaXNoZWRDYWxsYmFjaywgZG93bmxvYWQpOwogICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQ8Q3VybERvd25sb2FkKiwgQ3VybERvd25sb2FkKj4o Q3VybERvd25sb2FkOjpkb3dubG9hZEZhaWxlZENhbGxiYWNrLCBkb3dubG9hZCk7CisgICAgICAg ICAgICAgICAgY2FsbE9uTWFpblRocmVhZChDdXJsRG93bmxvYWQ6OmRvd25sb2FkRmFpbGVkQ2Fs bGJhY2ssIGRvd25sb2FkKTsKIAogICAgICAgICAgICAgZG93bmxvYWRNYW5hZ2VyLT5yZW1vdmVG cm9tQ3VybChtc2ctPmVhc3lfaGFuZGxlKTsKICAgICAgICAgfQpAQCAtNDAwLDcgKzQwMCw3IEBA IHZvaWQgQ3VybERvd25sb2FkOjpkaWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYgaGVhZGVy KQogICAgICAgICAgICAgbV9yZXNwb25zZS5zZXRUZXh0RW5jb2RpbmdOYW1lKGV4dHJhY3RDaGFy c2V0RnJvbU1lZGlhVHlwZShtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgiQ29udGVudC1UeXBl IikpKTsKICAgICAgICAgICAgIG1fcmVzcG9uc2Uuc2V0U3VnZ2VzdGVkRmlsZW5hbWUoZmlsZW5h bWVGcm9tSFRUUENvbnRlbnREaXNwb3NpdGlvbihtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgi Q29udGVudC1EaXNwb3NpdGlvbiIpKSk7CiAKLSAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQ8 Q3VybERvd25sb2FkKiwgQ3VybERvd25sb2FkKj4ocmVjZWl2ZWRSZXNwb25zZUNhbGxiYWNrLCB0 aGlzKTsKKyAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQocmVjZWl2ZWRSZXNwb25zZUNhbGxi YWNrLCB0aGlzKTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIGludCBzcGxpdFBv cyA9IGhlYWRlci5maW5kKCI6Iik7CkBAIC00MTMsNyArNDEzLDcgQEAgdm9pZCBDdXJsRG93bmxv YWQ6OmRpZFJlY2VpdmVEYXRhKHZvaWQqIGRhdGEsIGludCBzaXplKQogewogICAgIE11dGV4TG9j a2VyIGxvY2tlcihtX211dGV4KTsKIAotICAgIGNhbGxPbk1haW5UaHJlYWQ8Q3VybERvd25sb2Fk KiwgQ3VybERvd25sb2FkKiwgaW50LCBpbnQ+KHJlY2VpdmVkRGF0YUNhbGxiYWNrLCB0aGlzLCBz aXplKTsKKyAgICBjYWxsT25NYWluVGhyZWFkKHJlY2VpdmVkRGF0YUNhbGxiYWNrLCB0aGlzLCBz aXplKTsKIAogICAgIHdyaXRlRGF0YVRvRmlsZShzdGF0aWNfY2FzdDxjb25zdCBjaGFyKj4oZGF0 YSksIHNpemUpOwogfQo= 231301 2014-05-12 09:57:56 -0700 2014-05-12 11:01:28 -0700 Updating patch patch.diff text/plain 2599 jberta.u-szeged ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NWExNzJiLi44MWZhZDFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTQtMDUtMTIgIEpvenNlZiBCZXJ0YSAgPGpiZXJ0YS51LXN6ZWdlZEBwYXJ0bmVyLnNh bXN1bmcuY29tPgorCisgICAgICAgIFdpbkNhaXJvIGJ1aWxkZml4IGFmdGVyIHIxNjg2MTEKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjgyNQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9jdXJsL0N1cmxEb3dubG9hZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDdXJsRG93 bmxvYWRNYW5hZ2VyOjpkb3dubG9hZFRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpDdXJsRG93 bmxvYWQ6OmRpZFJlY2VpdmVIZWFkZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q3VybERvd25sb2Fk OjpkaWRSZWNlaXZlRGF0YSk6CisKIDIwMTQtMDUtMTIgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFA YWRvYmUuY29tPgogCiAgICAgICAgIEludmFsaWQgaW5mb3JtYXRpb24gcmVtYWluaW5nIGluIGxp bmVUb1JlZ2lvbiBtYXAgb2YgUmVuZGVyRmxvd1RocmVhZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsRG93bmxvYWQuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxEb3dubG9hZC5jcHAKaW5kZXggMDkxMTNj ZS4uMjQ0YTY4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j dXJsL0N1cmxEb3dubG9hZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL0N1cmxEb3dubG9hZC5jcHAKQEAgLTIxMyw5ICsyMTMsOSBAQCB2b2lkIEN1cmxEb3du bG9hZE1hbmFnZXI6OmRvd25sb2FkVGhyZWFkKHZvaWQqIGRhdGEpCiAKICAgICAgICAgaWYgKG1z Zy0+bXNnID09IENVUkxNU0dfRE9ORSkgewogICAgICAgICAgICAgaWYgKG1zZy0+ZGF0YS5yZXN1 bHQgPT0gQ1VSTEVfT0spCi0gICAgICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZDxDdXJsRG93 bmxvYWQqLCBDdXJsRG93bmxvYWQqPihDdXJsRG93bmxvYWQ6OmRvd25sb2FkRmluaXNoZWRDYWxs YmFjaywgZG93bmxvYWQpOworICAgICAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoTWFpblRo cmVhZFRhc2soQ3VybERvd25sb2FkOjpkb3dubG9hZEZpbmlzaGVkQ2FsbGJhY2ssIGRvd25sb2Fk KSk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZDxD dXJsRG93bmxvYWQqLCBDdXJsRG93bmxvYWQqPihDdXJsRG93bmxvYWQ6OmRvd25sb2FkRmFpbGVk Q2FsbGJhY2ssIGRvd25sb2FkKTsKKyAgICAgICAgICAgICAgICBjYWxsT25NYWluVGhyZWFkKE1h aW5UaHJlYWRUYXNrKEN1cmxEb3dubG9hZDo6ZG93bmxvYWRGYWlsZWRDYWxsYmFjaywgZG93bmxv YWQpKTsKIAogICAgICAgICAgICAgZG93bmxvYWRNYW5hZ2VyLT5yZW1vdmVGcm9tQ3VybChtc2ct PmVhc3lfaGFuZGxlKTsKICAgICAgICAgfQpAQCAtNDAwLDcgKzQwMCw3IEBAIHZvaWQgQ3VybERv d25sb2FkOjpkaWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYgaGVhZGVyKQogICAgICAgICAg ICAgbV9yZXNwb25zZS5zZXRUZXh0RW5jb2RpbmdOYW1lKGV4dHJhY3RDaGFyc2V0RnJvbU1lZGlh VHlwZShtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgiQ29udGVudC1UeXBlIikpKTsKICAgICAg ICAgICAgIG1fcmVzcG9uc2Uuc2V0U3VnZ2VzdGVkRmlsZW5hbWUoZmlsZW5hbWVGcm9tSFRUUENv bnRlbnREaXNwb3NpdGlvbihtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgiQ29udGVudC1EaXNw b3NpdGlvbiIpKSk7CiAKLSAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQ8Q3VybERvd25sb2Fk KiwgQ3VybERvd25sb2FkKj4ocmVjZWl2ZWRSZXNwb25zZUNhbGxiYWNrLCB0aGlzKTsKKyAgICAg ICAgICAgIGNhbGxPbk1haW5UaHJlYWQoTWFpblRocmVhZFRhc2socmVjZWl2ZWRSZXNwb25zZUNh bGxiYWNrLCB0aGlzKSk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBpbnQgc3Bs aXRQb3MgPSBoZWFkZXIuZmluZCgiOiIpOwpAQCAtNDEzLDcgKzQxMyw3IEBAIHZvaWQgQ3VybERv d25sb2FkOjpkaWRSZWNlaXZlRGF0YSh2b2lkKiBkYXRhLCBpbnQgc2l6ZSkKIHsKICAgICBNdXRl eExvY2tlciBsb2NrZXIobV9tdXRleCk7CiAKLSAgICBjYWxsT25NYWluVGhyZWFkPEN1cmxEb3du bG9hZCosIEN1cmxEb3dubG9hZCosIGludCwgaW50PihyZWNlaXZlZERhdGFDYWxsYmFjaywgdGhp cywgc2l6ZSk7CisgICAgY2FsbE9uTWFpblRocmVhZChNYWluVGhyZWFkVGFzayhyZWNlaXZlZERh dGFDYWxsYmFjaywgdGhpcywgc2l6ZSkpOwogCiAgICAgd3JpdGVEYXRhVG9GaWxlKHN0YXRpY19j YXN0PGNvbnN0IGNoYXIqPihkYXRhKSwgc2l6ZSk7CiB9Cg==