186927 2018-06-22 09:50:07 -0700 [WinCairo] ImageDiff should use DLLLauncher 2018-06-22 15:14:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ross.kirsling ross.kirsling achristensen bfulgham commit-queue don.olmstead pvollan webkit-bug-importer oldest_to_newest 1435470 0 ross.kirsling 2018-06-22 09:50:07 -0700 [WinCairo] ImageDiff should use DLLLauncher 1435472 1 343334 ross.kirsling 2018-06-22 09:52:47 -0700 Created attachment 343334 Patch 1435474 2 pvollan 2018-06-22 09:57:40 -0700 Could you also make this change for AppleWin? 1435482 3 ross.kirsling 2018-06-22 10:19:56 -0700 (In reply to Per Arne Vollan from comment #2) > Could you also make this change for AppleWin? Absolutely. Don and I thought perhaps you guys wouldn't want the extra overhead if you didn't need it. :) 1435489 4 pvollan 2018-06-22 10:29:32 -0700 (In reply to Ross Kirsling from comment #3) > (In reply to Per Arne Vollan from comment #2) > > Could you also make this change for AppleWin? > > Absolutely. Don and I thought perhaps you guys wouldn't want the extra > overhead if you didn't need it. :) Great. I think also AppleWin needs this. I've had issues where ImageDiff did not start because it couldn't find dlls. 1435497 5 343341 ross.kirsling 2018-06-22 10:34:19 -0700 Created attachment 343341 Patch 1435499 6 343341 pvollan 2018-06-22 10:42:53 -0700 Comment on attachment 343341 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343341&action=review Looks good. R=me. Please make sure EWS is green before landing. > Tools/ImageDiff/PlatformWin.cmake:15 > +set(IMAGE_DIFF_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp) > +set(IMAGE_DIFF_LIBRARIES shlwapi) Should IMAGE_DIFF_SOURCES and IMAGE_DIFF_LIBRARIES be set before being referenced, or isn't that necessary? 1435512 7 ross.kirsling 2018-06-22 10:59:23 -0700 (In reply to Per Arne Vollan from comment #6) > > Tools/ImageDiff/PlatformWin.cmake:15 > > +set(IMAGE_DIFF_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp) > > +set(IMAGE_DIFF_LIBRARIES shlwapi) > > Should IMAGE_DIFF_SOURCES and IMAGE_DIFF_LIBRARIES be set before being > referenced, or isn't that necessary? This is actually overwriting them -- the "real" sources/libs are redirected to ImageDiffLib and then ImageDiff becomes just the DLLLauncher wrapper. (This is the same as what DRT and TestWebKitAPI do, and appears to be necessitated by having two main() functions.) 1435614 8 ross.kirsling 2018-06-22 14:46:05 -0700 Note: AppleWin EWS has been failing since r233066 and force clean is failing. Going to land since the log suggests that ImageDiff.exe is being built successfully. 1435625 9 343341 commit-queue 2018-06-22 15:13:30 -0700 Comment on attachment 343341 Patch Clearing flags on attachment: 343341 Committed r233102: <https://trac.webkit.org/changeset/233102> 1435626 10 commit-queue 2018-06-22 15:13:31 -0700 All reviewed patches have been landed. Closing bug. 1435627 11 webkit-bug-importer 2018-06-22 15:14:20 -0700 <rdar://problem/41383999> 343334 2018-06-22 09:52:47 -0700 2018-06-22 10:34:17 -0700 Patch bug-186927-20180622095247.patch text/plain 2783 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMDgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDUyMjBhMmJmM2E2NmIzOWUzZjNlMWQyNWNkYWJkOGM1 NGVlOTMxNy4uODg4OGM5ZjNmZTg2Y2RkODQ3ZTgzMGU4MTBkODRiMzMxM2IxZjlmYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE4LTA2LTIyICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4K KworICAgICAgICBbV2luQ2Fpcm9dIEltYWdlRGlmZiBzaG91bGQgdXNlIERMTExhdW5jaGVyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY5MjcKKwor ICAgICAgICBJbWFnZURpZmYgbmVlZHMgdG8gZmluZCBDYWlybywgc28gaXQgc2hvdWxkIGJlIHVz aW5nIERMTExhdW5jaGVyIGluIHRoZSBzYW1lIGZhc2hpb24gYXMgRFJUICYgVGVzdFdlYktpdEFQ SS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIElt YWdlRGlmZi9DTWFrZUxpc3RzLnR4dDoKKyAgICAgICAgKiBJbWFnZURpZmYvSW1hZ2VEaWZmLmNw cDoKKyAgICAgICAgKGRsbExhdW5jaGVyRW50cnlQb2ludCk6CisgICAgICAgICogSW1hZ2VEaWZm L1BsYXRmb3JtV2luLmNtYWtlOgorCiAyMDE4LTA2LTIwICBEYXJpbiBBZGxlciAgPGRhcmluQGFw cGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFVzZSB0aGUgaXNEaXJlY3Rvcnk6IHZhcmlhbnRz IG9mIE5TVVJMIG1ldGhvZHMgbW9yZSB0byBlbGltaW5hdGUgdW5uZWNlc3NhcnkgZmlsZSBzeXN0 ZW0gYWN0aXZpdHkKZGlmZiAtLWdpdCBhL1Rvb2xzL0ltYWdlRGlmZi9DTWFrZUxpc3RzLnR4dCBi L1Rvb2xzL0ltYWdlRGlmZi9DTWFrZUxpc3RzLnR4dAppbmRleCAyYzFlYzhlYWQyNzEyOWEzMjgy NDBjNWFlZTUyNmI2ZmFmMTE2ODVkLi43YmE2MWRmNGFhMjI3ZjhjMGQwYzUzMjU1YmViMzNmNDZj Yjc3MGUyIDEwMDY0NAotLS0gYS9Ub29scy9JbWFnZURpZmYvQ01ha2VMaXN0cy50eHQKKysrIGIv VG9vbHMvSW1hZ2VEaWZmL0NNYWtlTGlzdHMudHh0CkBAIC0xNywzICsxNyw3IEBAIGluY2x1ZGVf ZGlyZWN0b3JpZXMoJHtJTUFHRV9ESUZGX0lOQ0xVREVfRElSRUNUT1JJRVN9KQogaW5jbHVkZV9k aXJlY3RvcmllcyhTWVNURU0gJHtJTUFHRV9ESUZGX1NZU1RFTV9JTkNMVURFX0RJUkVDVE9SSUVT fSkKIGFkZF9leGVjdXRhYmxlKEltYWdlRGlmZiAke0lNQUdFX0RJRkZfU09VUkNFU30pCiB0YXJn ZXRfbGlua19saWJyYXJpZXMoSW1hZ2VEaWZmICR7SU1BR0VfRElGRl9MSUJSQVJJRVN9KQorCitp ZiAoJHtXVEZfUExBVEZPUk1fV0lOX0NBSVJPfSkKKyAgICBhZGRfZGVwZW5kZW5jaWVzKEltYWdl RGlmZiBJbWFnZURpZmZMaWIpCitlbmRpZiAoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvSW1hZ2VEaWZm L0ltYWdlRGlmZi5jcHAgYi9Ub29scy9JbWFnZURpZmYvSW1hZ2VEaWZmLmNwcAppbmRleCBmOGE5 ODNiODM5MDVjYjYyMmY0ODAxMGUyNjJlNTc0OTgwYTJjYTc0Li4xMjNhNDMxY2FkZjRhNmE2NTc0 YmVhMTVlMzVmOGFiNmEzYzRmZDBkIDEwMDY0NAotLS0gYS9Ub29scy9JbWFnZURpZmYvSW1hZ2VE aWZmLmNwcAorKysgYi9Ub29scy9JbWFnZURpZmYvSW1hZ2VEaWZmLmNwcApAQCAtMzksNiArMzks MTAgQEAKICNpbmNsdWRlIDxpby5oPgogI2VuZGlmCiAKKyNpZmRlZiBXSU5fQ0FJUk8KKyNpbmNs dWRlIDx3aW5kb3dzLmg+CisjZW5kaWYKKwogdXNpbmcgbmFtZXNwYWNlIEltYWdlRGlmZjsKIAog I2lmZGVmIF9XSU4zMgpAQCAtMTM2LDMgKzE0MCwxMCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29u c3QgY2hhciogYXJndltdKQogCiAgICAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KKworI2lmZGVm IFdJTl9DQUlSTworZXh0ZXJuICJDIiBfX2RlY2xzcGVjKGRsbGV4cG9ydCkgaW50IFdJTkFQSSBk bGxMYXVuY2hlckVudHJ5UG9pbnQoaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKK3sKKyAg ICByZXR1cm4gbWFpbihhcmdjLCBhcmd2KTsKK30KKyNlbmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMv SW1hZ2VEaWZmL1BsYXRmb3JtV2luLmNtYWtlIGIvVG9vbHMvSW1hZ2VEaWZmL1BsYXRmb3JtV2lu LmNtYWtlCmluZGV4IDJiOWE4NjA0MGZlMGUxNTFmMmE1YjZjODA5MmM4ZTU2MjM1OWZmMGYuLjUz YzUyZGU2NzAwOGQ2ZGE2N2RkNmQ2M2EwZDA1MTdhYzFkYTg0OWIgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0ltYWdlRGlmZi9QbGF0Zm9ybVdpbi5jbWFrZQorKysgYi9Ub29scy9JbWFnZURpZmYvUGxhdGZv cm1XaW4uY21ha2UKQEAgLTEsNSArMSwxMyBAQAogaWYgKCR7V1RGX1BMQVRGT1JNX1dJTl9DQUlS T30pCiAgICAgaW5jbHVkZShDYWlyby5jbWFrZSkKKworICAgIGFkZF9kZWZpbml0aW9ucygtRFdJ Tl9DQUlSTyAtRFVTRV9DT05TT0xFX0VOVFJZX1BPSU5UKQorCisgICAgYWRkX2xpYnJhcnkoSW1h Z2VEaWZmTGliIFNIQVJFRCAke0lNQUdFX0RJRkZfU09VUkNFU30pCisgICAgdGFyZ2V0X2xpbmtf bGlicmFyaWVzKEltYWdlRGlmZkxpYiAke0lNQUdFX0RJRkZfTElCUkFSSUVTfSkKKworICAgIHNl dChJTUFHRV9ESUZGX1NPVVJDRVMgJHtUT09MU19ESVJ9L3dpbi9ETExMYXVuY2hlci9ETExMYXVu Y2hlck1haW4uY3BwKQorICAgIHNldChJTUFHRV9ESUZGX0xJQlJBUklFUyBzaGx3YXBpKQogZWxz ZSAoKQogICAgIGluY2x1ZGUoUGxhdGZvcm1NYWMuY21ha2UpCiBlbmRpZiAoKQo= 343341 2018-06-22 10:34:19 -0700 2018-06-22 15:13:30 -0700 Patch bug-186927-20180622103418.patch text/plain 2749 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMDgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDUyMjBhMmJmM2E2NmIzOWUzZjNlMWQyNWNkYWJkOGM1 NGVlOTMxNy4uM2NkZDU0MTA0YjNmNWY3YjNiYzY4MjQxNTI3NTcxOTU5ZTBhODJhYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE4LTA2LTIyICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4K KworICAgICAgICBbV2luXSBJbWFnZURpZmYgc2hvdWxkIHVzZSBETExMYXVuY2hlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2OTI3CisKKyAgICAg ICAgSW1hZ2VEaWZmIHNob3VsZCB1c2UgRExMTGF1bmNoZXIgdG8gZmluZCBETExzIHVuZGVyIFdF QktJVF9MSUJSQVJJRVMsIGluIHRoZSBzYW1lIHdheSBhcyBEUlQgJiBUZXN0V2ViS2l0QVBJLgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogSW1hZ2VE aWZmL0NNYWtlTGlzdHMudHh0OgorICAgICAgICAqIEltYWdlRGlmZi9JbWFnZURpZmYuY3BwOgor ICAgICAgICAoZGxsTGF1bmNoZXJFbnRyeVBvaW50KToKKyAgICAgICAgKiBJbWFnZURpZmYvUGxh dGZvcm1XaW4uY21ha2U6CisKIDIwMTgtMDYtMjAgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtDb2NvYV0gVXNlIHRoZSBpc0RpcmVjdG9yeTogdmFyaWFudHMgb2Yg TlNVUkwgbWV0aG9kcyBtb3JlIHRvIGVsaW1pbmF0ZSB1bm5lY2Vzc2FyeSBmaWxlIHN5c3RlbSBh Y3Rpdml0eQpkaWZmIC0tZ2l0IGEvVG9vbHMvSW1hZ2VEaWZmL0NNYWtlTGlzdHMudHh0IGIvVG9v bHMvSW1hZ2VEaWZmL0NNYWtlTGlzdHMudHh0CmluZGV4IDJjMWVjOGVhZDI3MTI5YTMyODI0MGM1 YWVlNTI2YjZmYWYxMTY4NWQuLjljNThjYzU1NTEzNWEyMTQ3OTI2ZGU4OGUzNzk3ZGZiNmRkNzA5 ZmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0ltYWdlRGlmZi9DTWFrZUxpc3RzLnR4dAorKysgYi9Ub29s cy9JbWFnZURpZmYvQ01ha2VMaXN0cy50eHQKQEAgLTE3LDMgKzE3LDcgQEAgaW5jbHVkZV9kaXJl Y3Rvcmllcygke0lNQUdFX0RJRkZfSU5DTFVERV9ESVJFQ1RPUklFU30pCiBpbmNsdWRlX2RpcmVj dG9yaWVzKFNZU1RFTSAke0lNQUdFX0RJRkZfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVN9KQog YWRkX2V4ZWN1dGFibGUoSW1hZ2VEaWZmICR7SU1BR0VfRElGRl9TT1VSQ0VTfSkKIHRhcmdldF9s aW5rX2xpYnJhcmllcyhJbWFnZURpZmYgJHtJTUFHRV9ESUZGX0xJQlJBUklFU30pCisKK2lmIChX SU4zMikKKyAgICBhZGRfZGVwZW5kZW5jaWVzKEltYWdlRGlmZiBJbWFnZURpZmZMaWIpCitlbmRp ZiAoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvSW1hZ2VEaWZmL0ltYWdlRGlmZi5jcHAgYi9Ub29scy9J bWFnZURpZmYvSW1hZ2VEaWZmLmNwcAppbmRleCBmOGE5ODNiODM5MDVjYjYyMmY0ODAxMGUyNjJl NTc0OTgwYTJjYTc0Li45ODQ5ZjZmZDVkMGIwYmU0MmNkNDZjMmQ5Yjc5ZTdiY2I3ZDg0MWI1IDEw MDY0NAotLS0gYS9Ub29scy9JbWFnZURpZmYvSW1hZ2VEaWZmLmNwcAorKysgYi9Ub29scy9JbWFn ZURpZmYvSW1hZ2VEaWZmLmNwcApAQCAtMzcsNiArMzcsNyBAQAogI2lmZGVmIF9XSU4zMgogI2lu Y2x1ZGUgPGZjbnRsLmg+CiAjaW5jbHVkZSA8aW8uaD4KKyNpbmNsdWRlIDx3aW5kb3dzLmg+CiAj ZW5kaWYKIAogdXNpbmcgbmFtZXNwYWNlIEltYWdlRGlmZjsKQEAgLTEzNiwzICsxMzcsMTAgQEAg aW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKIAogICAgIHJldHVybiBFWElU X1NVQ0NFU1M7CiB9CisKKyNpZmRlZiBfV0lOMzIKK2V4dGVybiAiQyIgX19kZWNsc3BlYyhkbGxl eHBvcnQpIGludCBXSU5BUEkgZGxsTGF1bmNoZXJFbnRyeVBvaW50KGludCBhcmdjLCBjb25zdCBj aGFyKiBhcmd2W10pCit7CisgICAgcmV0dXJuIG1haW4oYXJnYywgYXJndik7Cit9CisjZW5kaWYK ZGlmZiAtLWdpdCBhL1Rvb2xzL0ltYWdlRGlmZi9QbGF0Zm9ybVdpbi5jbWFrZSBiL1Rvb2xzL0lt YWdlRGlmZi9QbGF0Zm9ybVdpbi5jbWFrZQppbmRleCAyYjlhODYwNDBmZTBlMTUxZjJhNWI2Yzgw OTJjOGU1NjIzNTlmZjBmLi4wOGQ0OWY3NTk2YTg1ODBhMGQ0OTlhYjZmMzJmOTFjZGRkM2FlOTA3 IDEwMDY0NAotLS0gYS9Ub29scy9JbWFnZURpZmYvUGxhdGZvcm1XaW4uY21ha2UKKysrIGIvVG9v bHMvSW1hZ2VEaWZmL1BsYXRmb3JtV2luLmNtYWtlCkBAIC0xLDUgKzEsMTUgQEAKIGlmICgke1dU Rl9QTEFURk9STV9XSU5fQ0FJUk99KQorICAgIGFkZF9kZWZpbml0aW9ucygtRFdJTl9DQUlSTykK KwogICAgIGluY2x1ZGUoQ2Fpcm8uY21ha2UpCiBlbHNlICgpCiAgICAgaW5jbHVkZShQbGF0Zm9y bU1hYy5jbWFrZSkKIGVuZGlmICgpCisKK2FkZF9saWJyYXJ5KEltYWdlRGlmZkxpYiBTSEFSRUQg JHtJTUFHRV9ESUZGX1NPVVJDRVN9KQordGFyZ2V0X2xpbmtfbGlicmFyaWVzKEltYWdlRGlmZkxp YiAke0lNQUdFX0RJRkZfTElCUkFSSUVTfSkKKworYWRkX2RlZmluaXRpb25zKC1EVVNFX0NPTlNP TEVfRU5UUllfUE9JTlQpCisKK3NldChJTUFHRV9ESUZGX1NPVVJDRVMgJHtUT09MU19ESVJ9L3dp bi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwKQorc2V0KElNQUdFX0RJRkZfTElCUkFS SUVTIHNobHdhcGkpCg==