10171 2006-07-31 12:03:53 -0700 REGRESSION: failing layout test: fast/events/objc-event-api.html 2006-07-31 22:54:14 -0700 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 RESOLVED FIXED P1 Normal --- 1 ggaren darin jonas.witt oldest_to_newest 51218 0 ggaren 2006-07-31 12:03:53 -0700 This check-in caused the regression: Index: WebKitTools/ChangeLog =================================================================== --- WebKitTools/ChangeLog (revision 15045) +++ WebKitTools/ChangeLog (revision 15046) @@ -1,3 +1,14 @@ +2006-06-26 Jonas Witt <jonas.witt@gmail.com> + + Reviewed by Darin. + + Bug 9579: LayoutTests/fast/events/objc-event-api.html failing due to screenY output + http://bugzilla.opendarwin.org/show_bug.cgi?id=9579 + + Report screenY values as (height of zero screen - screenY) + + * DumpRenderTree/EventSendingController.m: (-[EventSendingController handleEvent:]): + 2006-06-25 Timothy Hatcher <timothy@apple.com> Reviewed by Geoff. Here's the diff: --- /Users/buildbot/Desktop/BuildData/WebKit-BuildSlave/post-commit-powerpc-mac-os-x/build/LayoutTests/fast/events/objc-event-api-expected.txt 2006-07-31 01:46:45.000000000 -0700 +++ layout-test-results/fast/events/objc-event-api-actual.txt 2006-07-31 02:43:06.000000000 -0700 @@ -274,8 +274,8 @@ detail: 0 view: OK (document: OK) button: 0 - screenX: 0 - screenY: 0 (flipped) + screenX: -1 + screenY: -1 (flipped) clientX: -1 clientY: 601 modifier keys: c:0 s:0 a:0 m:0 51274 1 darin 2006-07-31 21:52:04 -0700 Strangely, on my local machine the results I get are -1 for screenX but 0 for screenY. The expected results have 0 for both, and the buildbot results have -1 for both. 51276 2 darin 2006-07-31 21:58:42 -0700 Reading the test code more closely, I don't see how flipping the screen Y coordinate could possibly be correct. 51280 3 9789 darin 2006-07-31 22:49:55 -0700 Created attachment 9789 patch to fix the issue, which was a flaw in DumpRenderTree 51281 4 9789 mjs 2006-07-31 22:52:12 -0700 Comment on attachment 9789 patch to fix the issue, which was a flaw in DumpRenderTree r=me 51282 5 darin 2006-07-31 22:54:14 -0700 Committed revision 15731. 9789 2006-07-31 22:49:55 -0700 2006-07-31 22:52:12 -0700 patch to fix the issue, which was a flaw in DumpRenderTree MouseTestPatch.txt text/plain 13163 darin SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1NzMwKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMDYtMDctMzEgIERhcmluIEFkbGVyICA8ZGFy aW5AYXBwbGUuY29tPgorCisgICAgICAgIC0gZml4IGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2lu Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNzEKKyAgICAgICAgICBSRUdSRVNTSU9OOiBmYWlsaW5n IGxheW91dCB0ZXN0OiBmYXN0L2V2ZW50cy9vYmpjLWV2ZW50LWFwaS5odG1sCisKKyAgICAgICAg KiBmYXN0L2V2ZW50cy9vYmpjLWV2ZW50LWFwaS1leHBlY3RlZC50eHQ6IFVwZGF0ZWQgdGVzdCBy ZXN1bHRzIGZvciBjaGFuZ2VzIGluIHRoZQorICAgICAgICBEdW1wUmVuZGVyVHJlZSB0b29sLgor CiAyMDA2LTA3LTMxICBNYXJrIFJvd2UgIDxvcGVuZGFyd2luLm9yZ0BiZGFzaC5uZXQubno+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9ldmVu dHMvb2JqYy1ldmVudC1hcGktZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3QvZXZlbnRzL29iamMtZXZlbnQtYXBpLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTU3MjMp CisrKyBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9vYmpjLWV2ZW50LWFwaS1leHBlY3RlZC50eHQJ KHdvcmtpbmcgY29weSkKQEAgLTYsMTAgKzYsMTAgQEAgZXZlbnQgdHlwZTogICAgICBtb3VzZW92 ZXIKICAgZGV0YWlsOiAgICAgICAgMAogICB2aWV3OiAgICAgICAgICBPSyAoZG9jdW1lbnQ6IE9L KQogICBidXR0b246ICAgICAgICAwCi0gIHNjcmVlblg6ICAgICAgIC05OTAwCi0gIHNjcmVlblk6 ICAgICAgIC05NTAwIChmbGlwcGVkKQogICBjbGllbnRYOiAgICAgICAxMDAKICAgY2xpZW50WTog ICAgICAgMTAwCisgIHNjcmVlblg6ICAgICAgIC05OTAwCisgIHNjcmVlblk6ICAgICAgIC05OTAw CiAgIG1vZGlmaWVyIGtleXM6IGM6MCBzOjAgYTowIG06MAogZXZlbnQgdHlwZTogICAgICBtb3Vz ZWRvd24KICAgdGFyZ2V0OiAgICAgICAgPGRpdj4KQEAgLTE5LDEwICsxOSwxMCBAQCBldmVudCB0 eXBlOiAgICAgIG1vdXNlZG93bgogICBkZXRhaWw6ICAgICAgICAxCiAgIHZpZXc6ICAgICAgICAg IE9LIChkb2N1bWVudDogT0spCiAgIGJ1dHRvbjogICAgICAgIDAKLSAgc2NyZWVuWDogICAgICAg LTk5MDAKLSAgc2NyZWVuWTogICAgICAgLTk1MDAgKGZsaXBwZWQpCiAgIGNsaWVudFg6ICAgICAg IDEwMAogICBjbGllbnRZOiAgICAgICAxMDAKKyAgc2NyZWVuWDogICAgICAgLTk5MDAKKyAgc2Ny ZWVuWTogICAgICAgLTk5MDAKICAgbW9kaWZpZXIga2V5czogYzowIHM6MCBhOjAgbTowCiBldmVu dCB0eXBlOiAgICAgIHNlbGVjdHN0YXJ0CiAgIHRhcmdldDogICAgICAgIDxkaXY+CkBAIC0zOSwx MCArMzksMTAgQEAgZXZlbnQgdHlwZTogICAgICBtb3VzZXVwCiAgIGRldGFpbDogICAgICAgIDEK ICAgdmlldzogICAgICAgICAgT0sgKGRvY3VtZW50OiBPSykKICAgYnV0dG9uOiAgICAgICAgMAot ICBzY3JlZW5YOiAgICAgICAtOTkwMAotICBzY3JlZW5ZOiAgICAgICAtOTUwMCAoZmxpcHBlZCkK ICAgY2xpZW50WDogICAgICAgMTAwCiAgIGNsaWVudFk6ICAgICAgIDEwMAorICBzY3JlZW5YOiAg ICAgICAtOTkwMAorICBzY3JlZW5ZOiAgICAgICAtOTkwMAogICBtb2RpZmllciBrZXlzOiBjOjAg czowIGE6MCBtOjAKIGV2ZW50IHR5cGU6ICAgICAgY2xpY2sKICAgdGFyZ2V0OiAgICAgICAgPGRp dj4KQEAgLTUyLDEwICs1MiwyMyBAQCBldmVudCB0eXBlOiAgICAgIGNsaWNrCiAgIGRldGFpbDog ICAgICAgIDEKICAgdmlldzogICAgICAgICAgT0sgKGRvY3VtZW50OiBPSykKICAgYnV0dG9uOiAg ICAgICAgMAorICBjbGllbnRYOiAgICAgICAxMDAKKyAgY2xpZW50WTogICAgICAgMTAwCiAgIHNj cmVlblg6ICAgICAgIC05OTAwCi0gIHNjcmVlblk6ICAgICAgIC05NTAwIChmbGlwcGVkKQorICBz Y3JlZW5ZOiAgICAgICAtOTkwMAorICBtb2RpZmllciBrZXlzOiBjOjAgczowIGE6MCBtOjAKK2V2 ZW50IHR5cGU6ICAgICAgbW91c2Vtb3ZlCisgIHRhcmdldDogICAgICAgIDxkaXY+CisgIGV2ZW50 UGhhc2U6ICAgIDMKKyAgYnViYmxlczogICAgICAgMQorICBjYW5jZWxhYmxlOiAgICAwCisgIGRl dGFpbDogICAgICAgIDAKKyAgdmlldzogICAgICAgICAgT0sgKGRvY3VtZW50OiBPSykKKyAgYnV0 dG9uOiAgICAgICAgMAogICBjbGllbnRYOiAgICAgICAxMDAKICAgY2xpZW50WTogICAgICAgMTAw CisgIHNjcmVlblg6ICAgICAgIC05OTAwCisgIHNjcmVlblk6ICAgICAgIC05OTAwCiAgIG1vZGlm aWVyIGtleXM6IGM6MCBzOjAgYTowIG06MAogZXZlbnQgdHlwZTogICAgICBrZXlkb3duCiAgIHRh cmdldDogICAgICAgIDxib2R5PgpAQCAtMTYxLDEwICsxNzQsMTAgQEAgZXZlbnQgdHlwZTogICAg ICBtb3VzZW1vdmUKICAgZGV0YWlsOiAgICAgICAgMAogICB2aWV3OiAgICAgICAgICBPSyAoZG9j dW1lbnQ6IE9LKQogICBidXR0b246ICAgICAgICAwCi0gIHNjcmVlblg6ICAgICAgIC05NjAwCi0g IHNjcmVlblk6ICAgICAgIC05NTUwIChmbGlwcGVkKQogICBjbGllbnRYOiAgICAgICA0MDAKICAg Y2xpZW50WTogICAgICAgMTUwCisgIHNjcmVlblg6ICAgICAgIC05NjAwCisgIHNjcmVlblk6ICAg ICAgIC05ODUwCiAgIG1vZGlmaWVyIGtleXM6IGM6MCBzOjAgYTowIG06MAogZXZlbnQgdHlwZTog ICAgICBtb3VzZWRvd24KICAgdGFyZ2V0OiAgICAgICAgPGRpdj4KQEAgLTE3NCwxMCArMTg3LDEw IEBAIGV2ZW50IHR5cGU6ICAgICAgbW91c2Vkb3duCiAgIGRldGFpbDogICAgICAgIDIKICAgdmll dzogICAgICAgICAgT0sgKGRvY3VtZW50OiBPSykKICAgYnV0dG9uOiAgICAgICAgMAotICBzY3Jl ZW5YOiAgICAgICAtOTYwMAotICBzY3JlZW5ZOiAgICAgICAtOTU1MCAoZmxpcHBlZCkKICAgY2xp ZW50WDogICAgICAgNDAwCiAgIGNsaWVudFk6ICAgICAgIDE1MAorICBzY3JlZW5YOiAgICAgICAt OTYwMAorICBzY3JlZW5ZOiAgICAgICAtOTg1MAogICBtb2RpZmllciBrZXlzOiBjOjAgczowIGE6 MCBtOjAKIGV2ZW50IHR5cGU6ICAgICAgc2VsZWN0c3RhcnQKICAgdGFyZ2V0OiAgICAgICAgPGRp dj4KQEAgLTE5NCwxMCArMjA3LDEwIEBAIGV2ZW50IHR5cGU6ICAgICAgbW91c2Vkb3duCiAgIGRl dGFpbDogICAgICAgIDMKICAgdmlldzogICAgICAgICAgT0sgKGRvY3VtZW50OiBPSykKICAgYnV0 dG9uOiAgICAgICAgMAotICBzY3JlZW5YOiAgICAgICAtOTYwMAotICBzY3JlZW5ZOiAgICAgICAt OTU1MCAoZmxpcHBlZCkKICAgY2xpZW50WDogICAgICAgNDAwCiAgIGNsaWVudFk6ICAgICAgIDE1 MAorICBzY3JlZW5YOiAgICAgICAtOTYwMAorICBzY3JlZW5ZOiAgICAgICAtOTg1MAogICBtb2Rp ZmllciBrZXlzOiBjOjAgczowIGE6MCBtOjAKIGV2ZW50IHR5cGU6ICAgICAgc2VsZWN0c3RhcnQK ICAgdGFyZ2V0OiAgICAgICAgPGRpdj4KQEAgLTIxNCwxMCArMjI3LDEwIEBAIGV2ZW50IHR5cGU6 ICAgICAgbW91c2VvdXQKICAgZGV0YWlsOiAgICAgICAgMAogICB2aWV3OiAgICAgICAgICBPSyAo ZG9jdW1lbnQ6IE9LKQogICBidXR0b246ICAgICAgICAwCi0gIHNjcmVlblg6ICAgICAgIC05OTk5 Ci0gIHNjcmVlblk6ICAgICAgIC05NDAxIChmbGlwcGVkKQogICBjbGllbnRYOiAgICAgICAxCiAg IGNsaWVudFk6ICAgICAgIDEKKyAgc2NyZWVuWDogICAgICAgLTk5OTkKKyAgc2NyZWVuWTogICAg ICAgLTk5OTkKICAgbW9kaWZpZXIga2V5czogYzowIHM6MCBhOjAgbTowCiAgIHJlbGF0ZWRUYXJn ZXQ6IERPTUhUTUxIdG1sRWxlbWVudCAobm9kZU5hbWU6IEhUTUwpCiBldmVudCB0eXBlOiAgICAg IG1vdXNlb3ZlcgpAQCAtMjI4LDEwICsyNDEsMTAgQEAgZXZlbnQgdHlwZTogICAgICBtb3VzZW92 ZXIKICAgZGV0YWlsOiAgICAgICAgMAogICB2aWV3OiAgICAgICAgICBPSyAoZG9jdW1lbnQ6IE9L KQogICBidXR0b246ICAgICAgICAwCi0gIHNjcmVlblg6ICAgICAgIC05OTk5Ci0gIHNjcmVlblk6 ICAgICAgIC05NDAxIChmbGlwcGVkKQogICBjbGllbnRYOiAgICAgICAxCiAgIGNsaWVudFk6ICAg ICAgIDEKKyAgc2NyZWVuWDogICAgICAgLTk5OTkKKyAgc2NyZWVuWTogICAgICAgLTk5OTkKICAg bW9kaWZpZXIga2V5czogYzowIHM6MCBhOjAgbTowCiAgIHJlbGF0ZWRUYXJnZXQ6IERPTUhUTUxE aXZFbGVtZW50IChub2RlTmFtZTogRElWKQogZXZlbnQgdHlwZTogICAgICBtb3VzZW1vdmUKQEAg LTI0MiwxMCArMjU1LDEwIEBAIGV2ZW50IHR5cGU6ICAgICAgbW91c2Vtb3ZlCiAgIGRldGFpbDog ICAgICAgIDAKICAgdmlldzogICAgICAgICAgT0sgKGRvY3VtZW50OiBPSykKICAgYnV0dG9uOiAg ICAgICAgMAotICBzY3JlZW5YOiAgICAgICAtOTk5OQotICBzY3JlZW5ZOiAgICAgICAtOTQwMSAo ZmxpcHBlZCkKICAgY2xpZW50WDogICAgICAgMQogICBjbGllbnRZOiAgICAgICAxCisgIHNjcmVl blg6ICAgICAgIC05OTk5CisgIHNjcmVlblk6ICAgICAgIC05OTk5CiAgIG1vZGlmaWVyIGtleXM6 IGM6MCBzOjAgYTowIG06MAogZXZlbnQgdHlwZTogICAgICBzZWxlY3RzdGFydAogICB0YXJnZXQ6 ICAgICAgICA8aHRtbD4KQEAgLTI2MSwyMyArMjc0LDIzIEBAIGV2ZW50IHR5cGU6ICAgICAgbW91 c2V1cAogICBkZXRhaWw6ICAgICAgICAwCiAgIHZpZXc6ICAgICAgICAgIE9LIChkb2N1bWVudDog T0spCiAgIGJ1dHRvbjogICAgICAgIDAKLSAgc2NyZWVuWDogICAgICAgLTk5OTkKLSAgc2NyZWVu WTogICAgICAgLTk0MDEgKGZsaXBwZWQpCiAgIGNsaWVudFg6ICAgICAgIDEKICAgY2xpZW50WTog ICAgICAgMQorICBzY3JlZW5YOiAgICAgICAtOTk5OQorICBzY3JlZW5ZOiAgICAgICAtOTk5OQog ICBtb2RpZmllciBrZXlzOiBjOjAgczowIGE6MCBtOjAKLWV2ZW50IHR5cGU6ICAgICAgbW91c2Vv dXQKK2V2ZW50IHR5cGU6ICAgICAgbW91c2Vtb3ZlCiAgIHRhcmdldDogICAgICAgIDxodG1sPgog ICBldmVudFBoYXNlOiAgICAzCiAgIGJ1YmJsZXM6ICAgICAgIDEKLSAgY2FuY2VsYWJsZTogICAg MQorICBjYW5jZWxhYmxlOiAgICAwCiAgIGRldGFpbDogICAgICAgIDAKICAgdmlldzogICAgICAg ICAgT0sgKGRvY3VtZW50OiBPSykKICAgYnV0dG9uOiAgICAgICAgMAotICBzY3JlZW5YOiAgICAg ICAwCi0gIHNjcmVlblk6ICAgICAgIDAgKGZsaXBwZWQpCi0gIGNsaWVudFg6ICAgICAgIC0xCi0g IGNsaWVudFk6ICAgICAgIDYwMQorICBjbGllbnRYOiAgICAgICAxCisgIGNsaWVudFk6ICAgICAg IDEKKyAgc2NyZWVuWDogICAgICAgLTk5OTkKKyAgc2NyZWVuWTogICAgICAgLTk5OTkKICAgbW9k aWZpZXIga2V5czogYzowIHM6MCBhOjAgbTowCiBUZXN0CiBUaGlzIHRlc3RzIHRoYXQgRE9NRXZl bnRzIGFyZSBjb3JyZWN0bHkgaGFuZGVkIHRvIHRoZSBPYmpDIEFQSS4gU2VlIGJ1ZyA5MTgxLgpJ bmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0No YW5nZUxvZwkocmV2aXNpb24gMTU3MzApCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwyNiBAQAorMjAwNi0wNy0zMSAgRGFyaW4gQWRsZXIgIDxkYXJp bkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgLSBmaXggaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDE3MQorICAgICAgICAgIFJFR1JFU1NJT046IGZhaWxpbmcgbGF5b3V0IHRlc3Q6IGZhc3Qv ZXZlbnRzL29iamMtZXZlbnQtYXBpLmh0bWwKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0R1 bXBSZW5kZXJUcmVlLm06CisgICAgICAgIChtYWluKTogQWRkIHBvc2Ugc28gd2UgY2FuIGltcGxl bWVudCArW05TRXZlbnQgbW91c2VMb2NhdGlvbl0uIFB1dCB0aGUgd2luZG93IGF0IGEgcHJlZGlj dGFibGUKKyAgICAgICAgbG9jYXRpb24gaW4gZmxpcHBlZCBjb29yZGluYXRlcywgc2luY2UgdGhv c2UgYXJlIHRoZSBjb29yZGluYXRlcyB0aGF0IHdlIHVzZS4KKyAgICAgICAgKCtbRHVtcFJlbmRl clRyZWVFdmVudCBtb3VzZUxvY2F0aW9uXSk6IEltcGxlbWVudCB0aGlzLCBzaW5jZSBpdCdzIHVz ZWQgZm9yIG1vdXNlIGV2ZW50IGhhbmRsaW5nCisgICAgICAgIGluc2lkZSBXZWJIVE1MVmlldy4K KworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIubToKKyAg ICAgICAgKCtbRXZlbnRTZW5kaW5nQ29udHJvbGxlciBpbml0aWFsaXplXSk6IFJlbW92ZWQgdW51 c2VkIHdlYmtpdERvbUV2ZW50UHJvcGVydGllcyBhcnJheS4KKyAgICAgICAgKC1bRXZlbnRTZW5k aW5nQ29udHJvbGxlciBpbml0XSk6IFJlbW92ZWQsIHNpbmNlIHRoZSB3aG9sZSB0aGluZyB3YXMg YSBuby1vcC4KKyAgICAgICAgKC1bRXZlbnRTZW5kaW5nQ29udHJvbGxlciBtb3VzZU1vdmVUb1g6 WTpdKTogQ29udmVydCB0aGUgeCx5IHBhaXIgdG8gd2luZG93IGNvb3JkaW5hdGVzLiBUaGUgb2xk IGNvZGUKKyAgICAgICAgcHJvYmFibHkgd29ya2VkIE9LLCBidXQgdGhpcyBpcyBuZWVkZWQgdG8g YmUgY29ycmVjdC4KKyAgICAgICAgKC1bRXZlbnRTZW5kaW5nQ29udHJvbGxlciBoYW5kbGVFdmVu dDpdKTogUHV0IGNsaWVudFgvWSBiZWZvcmUgc2NyZWVuWC9ZIGFuZCByZW1vdmVkIHRoZSBmbGlw cGluZworICAgICAgICBjb2RlIGZyb20gc2NyZWVuWS4gV2UgZGlkbid0IHJlYWxseSBuZWVkIHRv IGZsaXAgc2NyZWVuWSAtLSB3aGF0IHdhcyBhY3R1YWxseSBoYXBwZW5pbmcgd2FzIHRoYXQgdGhl CisgICAgICAgIHBvc2l0aW9uIHRoYXQgRHVtcFJlbmRlclRyZWUgY2hvc2Ugd2FzIGluIG5vbi1m bGlwcGVkIGNvb3JkaW5hdGVzLCBhbmQgd2l0aCB0aGF0IGZpeGVkIHdlIGNhbiBqdXN0CisgICAg ICAgIGR1bXAgdGhlIHNjcmVlblkgYXMtaXMuCisKIDIwMDYtMDctMzEgIE1hcmsgUm93ZSAgPG9w ZW5kYXJ3aW4ub3JnQGJkYXNoLm5ldC5uej4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4K SW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUubQkocmV2 aXNpb24gMTU3MjMpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJl ZS5tCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw2ICs2Nyw5IEBACiBAaW50ZXJmYWNlIER1bXBSZW5k ZXJUcmVlUGFzdGVib2FyZCA6IE5TUGFzdGVib2FyZAogQGVuZAogCitAaW50ZXJmYWNlIER1bXBS ZW5kZXJUcmVlRXZlbnQgOiBOU0V2ZW50CitAZW5kCisKIEBpbnRlcmZhY2UgV2FpdFVudGlsRG9u ZURlbGVnYXRlIDogTlNPYmplY3QKIEBlbmQKIApAQCAtMTk4LDcgKzIwMSw4IEBAIGludCBtYWlu KGludCBhcmdjLCBjb25zdCBjaGFyICphcmd2W10pCiAKICAgICBjbGFzc19wb3NlQXMob2JqY19n ZXRDbGFzcygiRHVtcFJlbmRlclRyZWVQYXN0ZWJvYXJkIiksIG9iamNfZ2V0Q2xhc3MoIk5TUGFz dGVib2FyZCIpKTsKICAgICBjbGFzc19wb3NlQXMob2JqY19nZXRDbGFzcygiRHVtcFJlbmRlclRy ZWVXaW5kb3ciKSwgb2JqY19nZXRDbGFzcygiTlNXaW5kb3ciKSk7Ci0gICAgCisgICAgY2xhc3Nf cG9zZUFzKG9iamNfZ2V0Q2xhc3MoIkR1bXBSZW5kZXJUcmVlRXZlbnQiKSwgb2JqY19nZXRDbGFz cygiTlNFdmVudCIpKTsKKwogICAgIHN0cnVjdCBvcHRpb24gb3B0aW9uc1tdID0gewogICAgICAg ICB7ImR1bXAtYWxsLXBpeGVscyIsIG5vX2FyZ3VtZW50LCAmZHVtcEFsbFBpeGVscywgWUVTfSwK ICAgICAgICAgeyJob3Jpem9udGFsLXN3ZWVwIiwgbm9fYXJndW1lbnQsICZyZXBhaW50U3dlZXBI b3Jpem9udGFsbHlEZWZhdWx0LCBZRVN9LApAQCAtMjc5LDcgKzI4Myw4IEBAIGludCBtYWluKGlu dCBhcmdjLCBjb25zdCBjaGFyICphcmd2W10pCiAgICAgW1t3ZWJWaWV3IGJhY2tGb3J3YXJkTGlz dF0gc2V0UGFnZUNhY2hlU2l6ZTowXTsKIAogICAgIC8vIFRvIG1ha2UgdGhpbmdzIGxpa2UgY2Vy dGFpbiBOU1ZpZXdzLCBkcmFnZ2luZywgYW5kIHBsdWctaW5zIHdvcmssIHB1dCB0aGUgV2ViVmll dyBhIHdpbmRvdywgYnV0IHB1dCBpdCBvZmYtc2NyZWVuIHNvIHlvdSBkb24ndCBzZWUgaXQuCi0g ICAgTlNSZWN0IHdpbmRvd1JlY3QgPSBOU09mZnNldFJlY3QocmVjdCwgLTEwMDAwLCAtMTAwMDAp OworICAgIC8vIFB1dCBpdCBhdCAtMTAwMDAsIC0xMDAwMCBpbiAiZmxpcHBlZCBjb29yZGluYXRl cyIsIHNpbmNlIFdlYkNvcmUgYW5kIHRoZSBET00gdXNlIGZsaXBwZWQgY29vcmRpbmF0ZXMuCisg ICAgTlNSZWN0IHdpbmRvd1JlY3QgPSBOU09mZnNldFJlY3QocmVjdCwgLTEwMDAwLCBbW1tOU1Nj cmVlbiBzY3JlZW5zXSBvYmplY3RBdEluZGV4OjBdIGZyYW1lXS5zaXplLmhlaWdodCAtIHJlY3Qu c2l6ZS5oZWlnaHQgKyAxMDAwMCk7CiAgICAgTlNXaW5kb3cgKndpbmRvdyA9IFtbTlNXaW5kb3cg YWxsb2NdIGluaXRXaXRoQ29udGVudFJlY3Q6d2luZG93UmVjdCBzdHlsZU1hc2s6TlNCb3JkZXJs ZXNzV2luZG93TWFzayBiYWNraW5nOk5TQmFja2luZ1N0b3JlQnVmZmVyZWQgZGVmZXI6WUVTXTsK ICAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gYWRkU3Vidmlldzp3ZWJWaWV3XTsKICAgICBbd2lu ZG93IG9yZGVyQmFjazpuaWxdOwpAQCAtODE1LDMgKzgyMCwxMiBAQCBzdGF0aWMgTlNTdHJpbmcg Km1kNUhhc2hTdHJpbmdGb3JCaXRtYXAoCiB9CiAKIEBlbmQKKworQGltcGxlbWVudGF0aW9uIER1 bXBSZW5kZXJUcmVlRXZlbnQKKworKyAoTlNQb2ludCltb3VzZUxvY2F0aW9uCit7CisgICAgcmV0 dXJuIFtbW2ZyYW1lIHdlYlZpZXddIHdpbmRvd10gY29udmVydEJhc2VUb1NjcmVlbjpsYXN0TW91 c2VQb3NpdGlvbl07Cit9CisKK0BlbmQKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIubQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9FdmVudFNlbmRpbmdDb250cm9sbGVyLm0JKHJldmlzaW9uIDE1NzIzKQorKysg V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvRXZlbnRTZW5kaW5nQ29udHJvbGxlci5tCSh3b3Jr aW5nIGNvcHkpCkBAIC0zOCwxMSArMzgsMTEgQEAKIAogTlNQb2ludCBsYXN0TW91c2VQb3NpdGlv bjsKIE5TQXJyYXkgKndlYmtpdERvbUV2ZW50TmFtZXM7Ci1OU0FycmF5ICp3ZWJraXREb21FdmVu dFByb3BlcnRpZXM7CiAKIEBpbXBsZW1lbnRhdGlvbiBFdmVudFNlbmRpbmdDb250cm9sbGVyCiAK LSsgKHZvaWQpaW5pdGlhbGl6ZSB7CisrICh2b2lkKWluaXRpYWxpemUKK3sKICAgICB3ZWJraXRE b21FdmVudE5hbWVzID0gW1tOU0FycmF5IGFsbG9jXSBpbml0V2l0aE9iamVjdHM6CiAgICAgICAg IEAiYWJvcnQiLAogICAgICAgICBAImJlZm9yZWNvcHkiLApAQCAtODksMTEgKzg5LDYgQEAgTlNB cnJheSAqd2Via2l0RG9tRXZlbnRQcm9wZXJ0aWVzOwogICAgICAgICBAInVubG9hZCIsCiAgICAg ICAgIEAiem9vbSIsCiAgICAgICAgIG5pbF07Ci0gICAgCi0gICAgd2Via2l0RG9tRXZlbnRQcm9w ZXJ0aWVzID0gW1tOU0FycmF5IGFsbG9jXSBpbml0V2l0aE9iamVjdHM6Ci0gICAgICAgIEAiY2xp ZW50WCIsCi0gICAgICAgIEAiY2xpZW50WSIsCi0gICAgICAgIG5pbF07CiB9CiAKICsgKEJPT0wp aXNTZWxlY3RvckV4Y2x1ZGVkRnJvbVdlYlNjcmlwdDooU0VMKWFTZWxlY3RvcgpAQCAtMTIyLDE1 ICsxMTcsNiBAQCBOU0FycmF5ICp3ZWJraXREb21FdmVudFByb3BlcnRpZXM7CiAgICAgcmV0dXJu IG5pbDsKIH0KIAotLSAoaWQpaW5pdAotewotICAgIGxhc3RNb3VzZVBvc2l0aW9uID0gTlNNYWtl UG9pbnQoMCwgMCk7Ci0gICAgZG93biA9IE5POwotICAgIGNsaWNrQ291bnQgPSAwOwotICAgIGxh c3RDbGljayA9IDA7Ci0gICAgcmV0dXJuIHNlbGY7Ci19Ci0KIC0gKGRvdWJsZSljdXJyZW50RXZl bnRUaW1lCiB7CiAgICAgcmV0dXJuIEdldEN1cnJlbnRFdmVudFRpbWUoKSArIHRpbWVPZmZzZXQ7 CkBAIC0xOTksMTIgKzE4NSwxMyBAQCBOU0FycmF5ICp3ZWJraXREb21FdmVudFByb3BlcnRpZXM7 CiAKIC0gKHZvaWQpbW91c2VNb3ZlVG9YOihpbnQpeCBZOihpbnQpeQogewotICAgIGxhc3RNb3Vz ZVBvc2l0aW9uID0gTlNNYWtlUG9pbnQoeCwgW1tmcmFtZSB3ZWJWaWV3XSBmcmFtZV0uc2l6ZS5o ZWlnaHQgLSB5KTsKKyAgICBOU1ZpZXcgKnZpZXcgPSBbZnJhbWUgd2ViVmlld107CisgICAgbGFz dE1vdXNlUG9zaXRpb24gPSBbdmlldyBjb252ZXJ0UG9pbnQ6TlNNYWtlUG9pbnQoeCwgW3ZpZXcg ZnJhbWVdLnNpemUuaGVpZ2h0IC0geSkgdG9WaWV3Om5pbF07CiAgICAgTlNFdmVudCAqZXZlbnQg PSBbTlNFdmVudCBtb3VzZUV2ZW50V2l0aFR5cGU6KGRvd24gPyBOU0xlZnRNb3VzZURyYWdnZWQg OiBOU01vdXNlTW92ZWQpIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxvY2F0aW9uOmxhc3RNb3VzZVBvc2l0aW9uIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBtb2RpZmllckZsYWdzOm5pbCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRpbWVzdGFtcDpbc2VsZiBjdXJyZW50RXZlbnRUaW1lXQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgd2luZG93TnVtYmVyOltbW2ZyYW1lIHdlYlZpZXddIHdp bmRvd10gd2luZG93TnVtYmVyXSAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHdpbmRvd051bWJlcjpbW3ZpZXcgd2luZG93XSB3aW5kb3dOdW1iZXJdIAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0OltOU0dyYXBoaWNzQ29udGV4dCBj dXJyZW50Q29udGV4dF0gCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZl bnROdW1iZXI6KytldmVudE51bWJlciAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgY2xpY2tDb3VudDooZG93biA/IGNsaWNrQ291bnQgOiAwKSAKQEAgLTM0NCwxMCArMzMx LDEwIEBAIE5TQXJyYXkgKndlYmtpdERvbUV2ZW50UHJvcGVydGllczsKICAgICAKICAgICBpZiAo W2V2ZW50IGlzS2luZE9mQ2xhc3M6W0RPTU1vdXNlRXZlbnQgY2xhc3NdXSkgewogICAgICAgICBw cmludGYoIiAgYnV0dG9uOiAgICAgICAgJWRcbiIsIFsoRE9NTW91c2VFdmVudCopZXZlbnQgYnV0 dG9uXSk7Ci0gICAgICAgIHByaW50ZigiICBzY3JlZW5YOiAgICAgICAlZFxuIiwgWyhET01Nb3Vz ZUV2ZW50KilldmVudCBzY3JlZW5YXSk7Ci0gICAgICAgIHByaW50ZigiICBzY3JlZW5ZOiAgICAg ICAlZCAoZmxpcHBlZClcbiIsIChpbnQpIFtbW05TU2NyZWVuIHNjcmVlbnNdIG9iamVjdEF0SW5k ZXg6MF0gZnJhbWVdLnNpemUuaGVpZ2h0IC0gWyhET01Nb3VzZUV2ZW50KilldmVudCBzY3JlZW5Z XSk7CiAgICAgICAgIHByaW50ZigiICBjbGllbnRYOiAgICAgICAlZFxuIiwgWyhET01Nb3VzZUV2 ZW50KilldmVudCBjbGllbnRYXSk7CiAgICAgICAgIHByaW50ZigiICBjbGllbnRZOiAgICAgICAl ZFxuIiwgWyhET01Nb3VzZUV2ZW50KilldmVudCBjbGllbnRZXSk7CisgICAgICAgIHByaW50Zigi ICBzY3JlZW5YOiAgICAgICAlZFxuIiwgWyhET01Nb3VzZUV2ZW50KilldmVudCBzY3JlZW5YXSk7 CisgICAgICAgIHByaW50ZigiICBzY3JlZW5ZOiAgICAgICAlZFxuIiwgWyhET01Nb3VzZUV2ZW50 KilldmVudCBzY3JlZW5ZXSk7CiAgICAgICAgIHByaW50ZigiICBtb2RpZmllciBrZXlzOiBjOiVk IHM6JWQgYTolZCBtOiVkXG4iLCAKICAgICAgICAgICAgICAgIFsoRE9NTW91c2VFdmVudCopZXZl bnQgY3RybEtleV0gPyAxIDogMCwgCiAgICAgICAgICAgICAgICBbKERPTU1vdXNlRXZlbnQqKWV2 ZW50IHNoaWZ0S2V5XSA/IDEgOiAwLCAKQEAgLTM3NiwxMCArMzYzLDEwIEBAIE5TQXJyYXkgKndl YmtpdERvbUV2ZW50UHJvcGVydGllczsKICAgICB9CiAgICAgCiAgICAgaWYgKFtldmVudCBpc0tp bmRPZkNsYXNzOltET01XaGVlbEV2ZW50IGNsYXNzXV0pIHsKLSAgICAgICAgcHJpbnRmKCIgIHNj cmVlblg6ICAgICAgICVkXG4iLCBbKERPTVdoZWVsRXZlbnQqKWV2ZW50IHNjcmVlblhdKTsKLSAg ICAgICAgcHJpbnRmKCIgIHNjcmVlblk6ICAgICAgICVkIChmbGlwcGVkKVxuIiwgKGludCkgW1tb TlNTY3JlZW4gc2NyZWVuc10gb2JqZWN0QXRJbmRleDowXSBmcmFtZV0uc2l6ZS5oZWlnaHQgLSBb KERPTVdoZWVsRXZlbnQqKWV2ZW50IHNjcmVlblldKTsKICAgICAgICAgcHJpbnRmKCIgIGNsaWVu dFg6ICAgICAgICVkXG4iLCBbKERPTVdoZWVsRXZlbnQqKWV2ZW50IGNsaWVudFhdKTsKICAgICAg ICAgcHJpbnRmKCIgIGNsaWVudFk6ICAgICAgICVkXG4iLCBbKERPTVdoZWVsRXZlbnQqKWV2ZW50 IGNsaWVudFldKTsKKyAgICAgICAgcHJpbnRmKCIgIHNjcmVlblg6ICAgICAgICVkXG4iLCBbKERP TVdoZWVsRXZlbnQqKWV2ZW50IHNjcmVlblhdKTsKKyAgICAgICAgcHJpbnRmKCIgIHNjcmVlblk6 ICAgICAgICVkXG4iLCBbKERPTVdoZWVsRXZlbnQqKWV2ZW50IHNjcmVlblldKTsKICAgICAgICAg cHJpbnRmKCIgIG1vZGlmaWVyIGtleXM6IGM6JWQgczolZCBhOiVkIG06JWRcbiIsIAogICAgICAg ICAgICAgICAgWyhET01XaGVlbEV2ZW50KilldmVudCBjdHJsS2V5XSA/IDEgOiAwLCAKICAgICAg ICAgICAgICAgIFsoRE9NV2hlZWxFdmVudCopZXZlbnQgc2hpZnRLZXldID8gMSA6IDAsIAo=