147384 2015-07-28 16:56:23 -0700 Clean up RefPtrCairo.cpp 2015-07-29 07:32:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro commit-queue mcatanzaro mrobinson oldest_to_newest 1112934 0 mcatanzaro 2015-07-28 16:56:23 -0700 Coding standards say: "Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons." 1112937 1 257702 mcatanzaro 2015-07-28 16:57:49 -0700 Created attachment 257702 Patch 1112938 2 257702 mrobinson 2015-07-28 17:03:16 -0700 Comment on attachment 257702 Patch I cannot recall if this was due to an issue with LIKELY on some platforms. If all the bots are green though, feel free to land this. 1112977 3 mcatanzaro 2015-07-28 17:55:17 -0700 Windows bot has been broken for a week now, and if there was an issue with LIKELY I bet it was on Windows. :( Would you mind if I simply get rid of all the uses of LIKELY in this patch as well? I'm pretty sure it's hocus pocus. http://stackoverflow.com/a/1851905 has a good explanation.... 1112981 4 mrobinson 2015-07-28 17:59:53 -0700 (In reply to comment #3) > Windows bot has been broken for a week now, and if there was an issue with > LIKELY I bet it was on Windows. :( > > Would you mind if I simply get rid of all the uses of LIKELY in this patch > as well? I'm pretty sure it's hocus pocus. > http://stackoverflow.com/a/1851905 has a good explanation.... That comment also says: "Besides the useless branch hint for the predictor, __builtin_expect has its use, the compiler may reorder the code to improve cache usage or save memory." 1113009 5 257702 mcatanzaro 2015-07-28 19:36:30 -0700 Comment on attachment 257702 Patch OK, I'll keep LIKELY then, although if Intel recommends against using it I think it's _likely_ safe to remove. If it's a problem for WinCairo I guess we'll find out when the EWS is fixed... if that even is a WinCairo bot, I think it's probably AppleWindows.... 1113010 6 257702 commit-queue 2015-07-28 19:37:57 -0700 Comment on attachment 257702 Patch Rejecting attachment 257702 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 257702, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: -apply', '--force', '--reviewer', u'Martin Robinson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 2 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/ChangeLog.rej patching file Source/WebCore/platform/graphics/cairo/RefPtrCairo.cpp Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Martin Robinson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/6204930801008640 1113078 7 mcatanzaro 2015-07-29 07:28:12 -0700 I don't understand why webkit-patch and the commit-queue can't handle changelog updates anymore. I don't see any changes to the tools, and I'm not doing anything differently.... 1113079 8 mcatanzaro 2015-07-29 07:32:18 -0700 Committed r187546: <http://trac.webkit.org/changeset/187546> 257702 2015-07-28 16:57:49 -0700 2015-07-28 19:37:57 -0700 Patch bug-147384-20150728185627.patch text/plain 3565 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzk3N2EyNWE0OWRhZGQx YmI3ODBkNjBmZWM2NTY3YTM4YzMyMGEwYi4uMDE3M2E5ZmMwNGExM2I5ZDY5OTMyNGIyNWQ1YjY3 ODcyNGI4MzQxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACisyMDE1LTA3LTI4ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBDbGVhbiB1 cCBSZWZQdHJDYWlyby5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NzM4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRlc3RzIGZvciBudWxsL25vbi1udWxsIHNob3VsZCBhbGwgYmUgZG9uZSB3aXRo b3V0IGVxdWFsaXR5IGNvbXBhcmlzb25zLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vUmVmUHRyQ2Fpcm8uY3BwOgorICAgICAgICAoV1RGOjpyZWZJZk5vdE51bGwpOgorICAg ICAgICAoV1RGOjpkZXJlZklmTm90TnVsbCk6CisKIDIwMTUtMDctMjggIE1pY2hhZWwgQ2F0YW56 YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGcmVldHlwZV0gQWx3YXlz IGFsbG93IGZvbnQgbWF0Y2hpbmcgZm9yIHN0cm9uZyBhbGlhc2VzCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwNTcKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUmVmUHRyQ2Fpcm8uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUmVmUHRyQ2Fpcm8uY3BwCmluZGV4 IGMzY2Y5NmRkMGNjMmJjODA5YWMyYzNiYTlmMGE4YWIwN2FkMjA2NWMuLjYxYTAzNjlmNWRmMTY1 ZDNlYzRkMGI0OGYyZGEzZmFlZjA3OGU2MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL1JlZlB0ckNhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9SZWZQdHJDYWlyby5jcHAKQEAgLTMyLDk4ICszMiw5 OCBAQCBuYW1lc3BhY2UgV1RGIHsKIAogdGVtcGxhdGU8PiB2b2lkIHJlZklmTm90TnVsbChjYWly b190KiBwdHIpCiB7Ci0gICAgaWYgKExJS0VMWShwdHIgIT0gMCkpCisgICAgaWYgKExJS0VMWShw dHIpKQogICAgICAgICBjYWlyb19yZWZlcmVuY2UocHRyKTsKIH0KIAogdGVtcGxhdGU8PiB2b2lk IGRlcmVmSWZOb3ROdWxsKGNhaXJvX3QqIHB0cikKIHsKLSAgICBpZiAoTElLRUxZKHB0ciAhPSAw KSkKKyAgICBpZiAoTElLRUxZKHB0cikpCiAgICAgICAgIGNhaXJvX2Rlc3Ryb3kocHRyKTsKIH0K IAogdGVtcGxhdGU8PiB2b2lkIHJlZklmTm90TnVsbChjYWlyb19zdXJmYWNlX3QqIHB0cikKIHsK LSAgICBpZiAoTElLRUxZKHB0ciAhPSAwKSkKKyAgICBpZiAoTElLRUxZKHB0cikpCiAgICAgICAg IGNhaXJvX3N1cmZhY2VfcmVmZXJlbmNlKHB0cik7CiB9CiAKIHRlbXBsYXRlPD4gdm9pZCBkZXJl ZklmTm90TnVsbChjYWlyb19zdXJmYWNlX3QqIHB0cikKIHsKLSAgICBpZiAoTElLRUxZKHB0ciAh PSAwKSkKKyAgICBpZiAoTElLRUxZKHB0cikpCiAgICAgICAgIGNhaXJvX3N1cmZhY2VfZGVzdHJv eShwdHIpOwogfQogCiB0ZW1wbGF0ZTw+IHZvaWQgcmVmSWZOb3ROdWxsKGNhaXJvX2ZvbnRfZmFj ZV90KiBwdHIpCiB7Ci0gICAgaWYgKExJS0VMWShwdHIgIT0gMCkpCisgICAgaWYgKExJS0VMWShw dHIpKQogICAgICAgICBjYWlyb19mb250X2ZhY2VfcmVmZXJlbmNlKHB0cik7CiB9CiAKIHRlbXBs YXRlPD4gdm9pZCBkZXJlZklmTm90TnVsbChjYWlyb19mb250X2ZhY2VfdCogcHRyKQogewotICAg IGlmIChMSUtFTFkocHRyICE9IDApKQorICAgIGlmIChMSUtFTFkocHRyKSkKICAgICAgICAgY2Fp cm9fZm9udF9mYWNlX2Rlc3Ryb3kocHRyKTsKIH0KIAogdGVtcGxhdGU8PiB2b2lkIHJlZklmTm90 TnVsbChjYWlyb19zY2FsZWRfZm9udF90KiBwdHIpCiB7Ci0gICAgaWYgKExJS0VMWShwdHIgIT0g MCkpCisgICAgaWYgKExJS0VMWShwdHIpKQogICAgICAgICBjYWlyb19zY2FsZWRfZm9udF9yZWZl cmVuY2UocHRyKTsKIH0KIAogdGVtcGxhdGU8PiB2b2lkIGRlcmVmSWZOb3ROdWxsKGNhaXJvX3Nj YWxlZF9mb250X3QqIHB0cikKIHsKLSAgICBpZiAoTElLRUxZKHB0ciAhPSAwKSkKKyAgICBpZiAo TElLRUxZKHB0cikpCiAgICAgICAgIGNhaXJvX3NjYWxlZF9mb250X2Rlc3Ryb3kocHRyKTsKIH0K IAogdGVtcGxhdGU8PiB2b2lkIHJlZklmTm90TnVsbChjYWlyb19wYXR0ZXJuX3QqIHB0cikKIHsK LSAgICBpZiAoTElLRUxZKHB0ciAhPSAwKSkKKyAgICBpZiAoTElLRUxZKHB0cikpCiAgICAgICAg IGNhaXJvX3BhdHRlcm5fcmVmZXJlbmNlKHB0cik7CiB9CiAKIHRlbXBsYXRlPD4gdm9pZCBkZXJl ZklmTm90TnVsbChjYWlyb19wYXR0ZXJuX3QqIHB0cikKIHsKLSAgICBpZiAoTElLRUxZKHB0ciAh PSAwKSkKKyAgICBpZiAoTElLRUxZKHB0cikpCiAgICAgICAgIGNhaXJvX3BhdHRlcm5fZGVzdHJv eShwdHIpOwogfQogCiB0ZW1wbGF0ZTw+IHZvaWQgcmVmSWZOb3ROdWxsKGNhaXJvX3JlZ2lvbl90 KiBwdHIpCiB7Ci0gICAgaWYgKExJS0VMWShwdHIgIT0gMCkpCisgICAgaWYgKExJS0VMWShwdHIp KQogICAgICAgICBjYWlyb19yZWdpb25fcmVmZXJlbmNlKHB0cik7CiB9CiAKIHRlbXBsYXRlPD4g dm9pZCBkZXJlZklmTm90TnVsbChjYWlyb19yZWdpb25fdCogcHRyKQogewotICAgIGlmIChMSUtF TFkocHRyICE9IDApKQorICAgIGlmIChMSUtFTFkocHRyKSkKICAgICAgICAgY2Fpcm9fcmVnaW9u X2Rlc3Ryb3kocHRyKTsKIH0KIAogI2lmIFVTRShGUkVFVFlQRSkKIHRlbXBsYXRlPD4gdm9pZCBy ZWZJZk5vdE51bGwoRmNQYXR0ZXJuKiBwdHIpCiB7Ci0gICAgaWYgKExJS0VMWShwdHIgIT0gMCkp CisgICAgaWYgKExJS0VMWShwdHIpKQogICAgICAgICBGY1BhdHRlcm5SZWZlcmVuY2UocHRyKTsK IH0KIAogdGVtcGxhdGU8PiB2b2lkIGRlcmVmSWZOb3ROdWxsKEZjUGF0dGVybiogcHRyKQogewot ICAgIGlmIChMSUtFTFkocHRyICE9IDApKQorICAgIGlmIChMSUtFTFkocHRyKSkKICAgICAgICAg RmNQYXR0ZXJuRGVzdHJveShwdHIpOwogfQogCiB0ZW1wbGF0ZTw+IHZvaWQgcmVmSWZOb3ROdWxs KEZjQ29uZmlnKiBwdHIpCiB7Ci0gICAgaWYgKExJS0VMWShwdHIgIT0gbnVsbHB0cikpCisgICAg aWYgKExJS0VMWShwdHIpKQogICAgICAgICBGY0NvbmZpZ1JlZmVyZW5jZShwdHIpOwogfQogCiB0 ZW1wbGF0ZTw+IHZvaWQgZGVyZWZJZk5vdE51bGwoRmNDb25maWcqIHB0cikKIHsKLSAgICBpZiAo TElLRUxZKHB0ciAhPSBudWxscHRyKSkKKyAgICBpZiAoTElLRUxZKHB0cikpCiAgICAgICAgIEZj Q29uZmlnRGVzdHJveShwdHIpOwogfQogI2VuZGlmCg==