42987 2010-07-26 11:52:41 -0700 [chromium] Absolute Mouse coordinates getting lost in translation 2010-08-03 10:53:53 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 gene webkit-unassigned darin fishd japhet oldest_to_newest 256141 0 gene 2010-07-26 11:52:41 -0700 In chromium absolute mouse coordinates getting lost and only adjusted (multiplied by zoom factor) saved. In caused controls and plugins on the zoomed in/out pages to respond incorrectly to mouse events. 256208 1 62601 gene 2010-07-26 13:49:33 -0700 Created attachment 62601 Added absolute (not multiplied by zoom level) mouse coordinates to WebMouseEvent Added absolute (not multiplied by zoom level) mouse coordinates to WebMouseEvent 256216 2 62601 japhet 2010-07-26 13:56:12 -0700 Comment on attachment 62601 Added absolute (not multiplied by zoom level) mouse coordinates to WebMouseEvent The code looks fine to me, but you need to update the auto-generated ChangeLog entry with a real bug URL and description (the first line with OOPS! will be auto-corrected by the commit-queue, but the second won't). 256228 3 62605 gene 2010-07-26 14:09:05 -0700 Created attachment 62605 Added bug URL and description to the ChangeLog Thanks Nate, I've added bug URL and description to the ChangeLog 256229 4 62605 japhet 2010-07-26 14:11:13 -0700 Comment on attachment 62605 Added bug URL and description to the ChangeLog Excellent, thanks! I'm going to wait to actually send this to commit-queue until Darin has had a chance to look at it. 256253 5 62605 fishd 2010-07-26 14:44:26 -0700 Comment on attachment 62605 Added bug URL and description to the ChangeLog WebKit/chromium/public/WebInputEvent.h:244 + int absoluteX; I think this really deserves some comments to explain the meaning of all of these coordinates. It was possible to guess before, but now it could be pretty confusing to developers. Also, did you confirm that NPAPI plugins still require zoomed coordinates? I'm concerned that we are adding absoluteX,Y when in fact we should just be changing the meaning of windowX,Y. 257350 6 62875 gene 2010-07-28 14:05:17 -0700 Created attachment 62875 Fix mouse coordinate conversion. WindowX,Y is an absolute mouse coordinates within browser window, x,y - are coordinates relative to the origin of the widget. Fix mouse coordinate conversion. WindowX,Y is an absolute mouse coordinates within browser window, x,y - are coordinates relative to the origin of the widget. 257434 7 fishd 2010-07-28 16:32:33 -0700 Landed as http://trac.webkit.org/changeset/64243 259545 8 nail000 2010-08-03 10:53:53 -0700 This fixes bug 26424. https://bugs.webkit.org/show_bug.cgi?id=26424 62601 2010-07-26 13:49:33 -0700 2010-07-26 14:09:05 -0700 Added absolute (not multiplied by zoom level) mouse coordinates to WebMouseEvent absolute_mouse_coord.txt text/plain 1858 gene SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2NDA3MCkKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNy0yNiAgR2Vu ZSBHdXRuaWsgIDxnZW5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJM IChPT1BTISkKKworICAgICAgICAqIHB1YmxpYy9XZWJJbnB1dEV2ZW50Lmg6CisgICAgICAgIChX ZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQpOgorICAgICAgICAqIHNyYy9XZWJJ bnB1dEV2ZW50Q29udmVyc2lvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnRC dWlsZGVyOjpXZWJNb3VzZUV2ZW50QnVpbGRlcik6CisKIDIwMTAtMDctMjYgIFNhdGlzaCBTYW1w YXRoICA8c2F0aXNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTdGV2ZSBC bG9jay4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRFdmVudC5oDQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgJKHJldmlz aW9uIDYzOTkwKQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgJKHdv cmtpbmcgY29weSkKQEAgLTI0MSw2ICsyNDEsOCBAQCBwdWJsaWM6CiAgICAgaW50IHdpbmRvd1k7 CiAgICAgaW50IGdsb2JhbFg7CiAgICAgaW50IGdsb2JhbFk7CisgICAgaW50IGFic29sdXRlWDsK KyAgICBpbnQgYWJzb2x1dGVZOwogICAgIGludCBjbGlja0NvdW50OwogCiAgICAgV2ViTW91c2VF dmVudCh1bnNpZ25lZCBzaXplUGFyYW0gPSBzaXplb2YoV2ViTW91c2VFdmVudCkpCkBAIC0yNTIs NiArMjU0LDggQEAgcHVibGljOgogICAgICAgICAsIHdpbmRvd1koMCkKICAgICAgICAgLCBnbG9i YWxYKDApCiAgICAgICAgICwgZ2xvYmFsWSgwKQorICAgICAgICAsIGFic29sdXRlWCgwKQorICAg ICAgICAsIGFic29sdXRlWSgwKQogICAgICAgICAsIGNsaWNrQ291bnQoMCkKICAgICB7CiAgICAg fQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAN Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RXZlbnRDb252ZXJz aW9uLmNwcAkocmV2aXNpb24gNjM5OTApCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0 RXZlbnRDb252ZXJzaW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjg0LDYgKzI4NCw4IEBAIFdl Yk1vdXNlRXZlbnRCdWlsZGVyOjpXZWJNb3VzZUV2ZW50QnVpbGQKICAgICAgICAgfQogICAgIH0K ICAgICBJbnRQb2ludCBwID0gdmlldy0+Y29udGVudHNUb1dpbmRvdyhJbnRQb2ludChldmVudC5w YWdlWCgpLCBldmVudC5wYWdlWSgpKSk7CisgICAgYWJzb2x1dGVYID0gZXZlbnQuYWJzb2x1dGVM b2NhdGlvbigpLngoKTsKKyAgICBhYnNvbHV0ZVkgPSBldmVudC5hYnNvbHV0ZUxvY2F0aW9uKCku eSgpOwogICAgIGdsb2JhbFggPSBldmVudC5zY3JlZW5YKCk7CiAgICAgZ2xvYmFsWSA9IGV2ZW50 LnNjcmVlblkoKTsKICAgICB3aW5kb3dYID0gcC54KCk7Cg== 62605 2010-07-26 14:09:05 -0700 2010-07-28 14:05:17 -0700 Added bug URL and description to the ChangeLog absolute_mouse_coord_1.txt text/plain 1950 gene SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2NDA3MCkKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNy0yNiAgR2Vu ZSBHdXRuaWsgIDxnZW5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYWJzb2x1dGUgKG5vdCBtdWx0aXBsaWVkIGJ5IHpv b20gbGV2ZWwpIG1vdXNlIGNvb3JkaW5hdGVzIHRvIFdlYk1vdXNlRXZlbnQuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mjk4NworCisgICAgICAgICog cHVibGljL1dlYklucHV0RXZlbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViTW91c2VFdmVudDo6 V2ViTW91c2VFdmVudCk6CisgICAgICAgICogc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViTW91c2VFdmVudEJ1aWxkZXI6OldlYk1vdXNlRXZlbnRC dWlsZGVyKToKKwogMjAxMC0wNy0yNiAgU2F0aXNoIFNhbXBhdGggIDxzYXRpc2hAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFN0ZXZlIEJsb2NrLgpJbmRleDogV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYklucHV0RXZlbnQuaAkocmV2aXNpb24gNjM5OTApCisrKyBXZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYklucHV0RXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjQxLDYg KzI0MSw4IEBAIHB1YmxpYzoKICAgICBpbnQgd2luZG93WTsKICAgICBpbnQgZ2xvYmFsWDsKICAg ICBpbnQgZ2xvYmFsWTsKKyAgICBpbnQgYWJzb2x1dGVYOworICAgIGludCBhYnNvbHV0ZVk7CiAg ICAgaW50IGNsaWNrQ291bnQ7CiAKICAgICBXZWJNb3VzZUV2ZW50KHVuc2lnbmVkIHNpemVQYXJh bSA9IHNpemVvZihXZWJNb3VzZUV2ZW50KSkKQEAgLTI1Miw2ICsyNTQsOCBAQCBwdWJsaWM6CiAg ICAgICAgICwgd2luZG93WSgwKQogICAgICAgICAsIGdsb2JhbFgoMCkKICAgICAgICAgLCBnbG9i YWxZKDApCisgICAgICAgICwgYWJzb2x1dGVYKDApCisgICAgICAgICwgYWJzb2x1dGVZKDApCiAg ICAgICAgICwgY2xpY2tDb3VudCgwKQogICAgIHsKICAgICB9CkluZGV4OiBXZWJLaXQvY2hyb21p dW0vc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcA0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24uY3BwCShyZXZpc2lvbiA2Mzk5 MCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yODQsNiArMjg0LDggQEAgV2ViTW91c2VFdmVudEJ1aWxkZXI6Oldl Yk1vdXNlRXZlbnRCdWlsZAogICAgICAgICB9CiAgICAgfQogICAgIEludFBvaW50IHAgPSB2aWV3 LT5jb250ZW50c1RvV2luZG93KEludFBvaW50KGV2ZW50LnBhZ2VYKCksIGV2ZW50LnBhZ2VZKCkp KTsKKyAgICBhYnNvbHV0ZVggPSBldmVudC5hYnNvbHV0ZUxvY2F0aW9uKCkueCgpOworICAgIGFi c29sdXRlWSA9IGV2ZW50LmFic29sdXRlTG9jYXRpb24oKS55KCk7CiAgICAgZ2xvYmFsWCA9IGV2 ZW50LnNjcmVlblgoKTsKICAgICBnbG9iYWxZID0gZXZlbnQuc2NyZWVuWSgpOwogICAgIHdpbmRv d1ggPSBwLngoKTsK 62875 2010-07-28 14:05:17 -0700 2010-07-28 16:29:57 -0700 Fix mouse coordinate conversion. WindowX,Y is an absolute mouse coordinates within browser window, x,y - are coordinates relative to the origin of the widget. absolute_mouse_coord_2.txt text/plain 5419 gene SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2NDIyOSkKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wNy0yOCAgR2Vu ZSBHdXRuaWsgIDxnZW5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRml4IG1vdXNlIGNvb3JkaW5hdGUgY29udmVyc2lvbi4gV2lu ZG93WCxZIGlzIGFuIGFic29sdXRlCisgICAgICAgIG1vdXNlIGNvb3JkaW5hdGVzIHdpdGhpbiBi cm93c2VyIHdpbmRvdywgeCx5IC0gYXJlIGNvb3JkaW5hdGVzCisgICAgICAgIHJlbGF0aXZlIHRv IHRoZSBwbHVnaW4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00Mjk4NworCisgICAgICAgICogc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViTW91c2VFdmVudEJ1aWxkZXI6OldlYk1vdXNlRXZlbnRCdWls ZGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViTW91c2VXaGVlbEV2ZW50QnVpbGRlcjo6V2ViTW91 c2VXaGVlbEV2ZW50QnVpbGRlcik6CisgICAgICAgICogc3JjL1dlYklucHV0RXZlbnRDb252ZXJz aW9uLmg6CisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVNb3VzZUV2ZW50KToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6aGFuZGxlV2hlZWxFdmVudCk6 CisKIDIwMTAtMDctMjggIEJyZXR0IFdpbHNvbiAgPGJyZXR0d0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hy b21pdW0vc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcAkocmV2aXNpb24gNjM5OTApCisr KyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjQxLDcgKzI0MSw3IEBAIHN0YXRpYyBpbnQgZ2V0V2ViSW5wdXRNb2RpZmll cnMoY29uc3QgVUkKICAgICByZXR1cm4gbW9kaWZpZXJzOwogfQogCi1XZWJNb3VzZUV2ZW50QnVp bGRlcjo6V2ViTW91c2VFdmVudEJ1aWxkZXIoY29uc3QgU2Nyb2xsVmlldyogdmlldywgY29uc3Qg TW91c2VFdmVudCYgZXZlbnQpCitXZWJNb3VzZUV2ZW50QnVpbGRlcjo6V2ViTW91c2VFdmVudEJ1 aWxkZXIoY29uc3QgV2lkZ2V0KiB3aWRnZXQsIGNvbnN0IE1vdXNlRXZlbnQmIGV2ZW50KQogewog ICAgIGlmIChldmVudC50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2ZW50KQogICAg ICAgICB0eXBlID0gV2ViSW5wdXRFdmVudDo6TW91c2VNb3ZlOwpAQCAtMjgzLDMwICsyODMsMzQg QEAgV2ViTW91c2VFdmVudEJ1aWxkZXI6OldlYk1vdXNlRXZlbnRCdWlsZAogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIH0KICAgICB9Ci0gICAgSW50UG9pbnQgcCA9IHZpZXctPmNvbnRlbnRz VG9XaW5kb3coSW50UG9pbnQoZXZlbnQucGFnZVgoKSwgZXZlbnQucGFnZVkoKSkpOworICAgIFNj cm9sbFZpZXcqIHZpZXcgPSB3aWRnZXQtPnBhcmVudCgpOworICAgIEludFBvaW50IHAgPSB2aWV3 LT5jb250ZW50c1RvV2luZG93KAorICAgICAgICBJbnRQb2ludChldmVudC5hYnNvbHV0ZUxvY2F0 aW9uKCkueCgpLCBldmVudC5hYnNvbHV0ZUxvY2F0aW9uKCkueSgpKSk7CiAgICAgZ2xvYmFsWCA9 IGV2ZW50LnNjcmVlblgoKTsKICAgICBnbG9iYWxZID0gZXZlbnQuc2NyZWVuWSgpOwogICAgIHdp bmRvd1ggPSBwLngoKTsKICAgICB3aW5kb3dZID0gcC55KCk7Ci0gICAgeCA9IGV2ZW50Lm9mZnNl dFgoKTsKLSAgICB5ID0gZXZlbnQub2Zmc2V0WSgpOworICAgIHggPSBldmVudC5hYnNvbHV0ZUxv Y2F0aW9uKCkueCgpIC0gd2lkZ2V0LT5wb3MoKS54KCk7CisgICAgeSA9IGV2ZW50LmFic29sdXRl TG9jYXRpb24oKS55KCkgLSB3aWRnZXQtPnBvcygpLnkoKTsKICAgICBjbGlja0NvdW50ID0gZXZl bnQuZGV0YWlsKCk7CiB9CiAKLVdlYk1vdXNlV2hlZWxFdmVudEJ1aWxkZXI6OldlYk1vdXNlV2hl ZWxFdmVudEJ1aWxkZXIoY29uc3QgU2Nyb2xsVmlldyogdmlldywgY29uc3QgV2hlZWxFdmVudCYg ZXZlbnQpCitXZWJNb3VzZVdoZWVsRXZlbnRCdWlsZGVyOjpXZWJNb3VzZVdoZWVsRXZlbnRCdWls ZGVyKGNvbnN0IFdpZGdldCogd2lkZ2V0LCBjb25zdCBXaGVlbEV2ZW50JiBldmVudCkKIHsKICAg ICBpZiAoZXZlbnQudHlwZSgpICE9IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQpCiAgICAg ICAgIHJldHVybjsKICAgICB0eXBlID0gV2ViSW5wdXRFdmVudDo6TW91c2VXaGVlbDsKICAgICB0 aW1lU3RhbXBTZWNvbmRzID0gZXZlbnQudGltZVN0YW1wKCkgKiAxLjBlLTM7CiAgICAgbW9kaWZp ZXJzID0gZ2V0V2ViSW5wdXRNb2RpZmllcnMoZXZlbnQpOwotICAgIEludFBvaW50IHAgPSB2aWV3 LT5jb250ZW50c1RvV2luZG93KEludFBvaW50KGV2ZW50LnBhZ2VYKCksIGV2ZW50LnBhZ2VZKCkp KTsKKyAgICBTY3JvbGxWaWV3KiB2aWV3ID0gd2lkZ2V0LT5wYXJlbnQoKTsKKyAgICBJbnRQb2lu dCBwID0gdmlldy0+Y29udGVudHNUb1dpbmRvdygKKyAgICAgICAgSW50UG9pbnQoZXZlbnQuYWJz b2x1dGVMb2NhdGlvbigpLngoKSwgZXZlbnQuYWJzb2x1dGVMb2NhdGlvbigpLnkoKSkpOwogICAg IGdsb2JhbFggPSBldmVudC5zY3JlZW5YKCk7CiAgICAgZ2xvYmFsWSA9IGV2ZW50LnNjcmVlblko KTsKICAgICB3aW5kb3dYID0gcC54KCk7CiAgICAgd2luZG93WSA9IHAueSgpOwotICAgIHggPSBl dmVudC5vZmZzZXRYKCk7Ci0gICAgeSA9IGV2ZW50Lm9mZnNldFkoKTsKKyAgICB4ID0gZXZlbnQu YWJzb2x1dGVMb2NhdGlvbigpLngoKSAtIHdpZGdldC0+cG9zKCkueCgpOworICAgIHkgPSBldmVu dC5hYnNvbHV0ZUxvY2F0aW9uKCkueSgpIC0gd2lkZ2V0LT5wb3MoKS55KCk7CiAgICAgZGVsdGFY ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGV2ZW50LnJhd0RlbHRhWCgpKTsKICAgICBkZWx0YVkgPSBz dGF0aWNfY2FzdDxmbG9hdD4oZXZlbnQucmF3RGVsdGFZKCkpOwogICAgIC8vIFRoZSAxMjAgaXMg ZnJvbSBXaGVlbEV2ZW50Ojppbml0V2hlZWxFdmVudCgpLgpJbmRleDogV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2No cm9taXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5oCShyZXZpc2lvbiA2Mzk5MCkKKysr IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24uaAkod29ya2luZyBj b3B5KQpAQCAtOTEsMTQgKzkxLDE0IEBAIHB1YmxpYzoKIC8vIGJlIHNldCB0byBVbmRlZmluZWQu CiBjbGFzcyBXZWJNb3VzZUV2ZW50QnVpbGRlciA6IHB1YmxpYyBXZWJNb3VzZUV2ZW50IHsKIHB1 YmxpYzoKLSAgICBXZWJNb3VzZUV2ZW50QnVpbGRlcihjb25zdCBXZWJDb3JlOjpTY3JvbGxWaWV3 KiwgY29uc3QgV2ViQ29yZTo6TW91c2VFdmVudCYpOworICAgIFdlYk1vdXNlRXZlbnRCdWlsZGVy KGNvbnN0IFdlYkNvcmU6OldpZGdldCosIGNvbnN0IFdlYkNvcmU6Ok1vdXNlRXZlbnQmKTsKIH07 CiAKIC8vIENvbnZlcnRzIGEgV2ViQ29yZTo6V2hlZWxFdmVudCB0byBhIGNvcnJlc3BvbmRpbmcg V2ViTW91c2VXaGVlbEV2ZW50LgogLy8gSWYgdGhlIGV2ZW50IG1hcHBpbmcgZmFpbHMsIHRoZSBl dmVudCB0eXBlIHdpbGwgYmUgc2V0IHRvIFVuZGVmaW5lZC4KIGNsYXNzIFdlYk1vdXNlV2hlZWxF dmVudEJ1aWxkZXIgOiBwdWJsaWMgV2ViTW91c2VXaGVlbEV2ZW50IHsKIHB1YmxpYzoKLSAgICBX ZWJNb3VzZVdoZWVsRXZlbnRCdWlsZGVyKGNvbnN0IFdlYkNvcmU6OlNjcm9sbFZpZXcqLCBjb25z dCBXZWJDb3JlOjpXaGVlbEV2ZW50Jik7CisgICAgV2ViTW91c2VXaGVlbEV2ZW50QnVpbGRlcihj b25zdCBXZWJDb3JlOjpXaWRnZXQqLCBjb25zdCBXZWJDb3JlOjpXaGVlbEV2ZW50Jik7CiB9Owog CiAvLyBDb252ZXJ0cyBhIFdlYkNvcmU6OktleWJvYXJkRXZlbnQgdG8gYSBjb3JyZXNwb25kaW5n IFdlYktleWJvYXJkRXZlbnQuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNv bnRhaW5lckltcGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQ bHVnaW5Db250YWluZXJJbXBsLmNwcAkocmV2aXNpb24gNjM5OTApCisrKyBXZWJLaXQvY2hyb21p dW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDMs NyArNDAzLDcgQEAgdm9pZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVNb3VzZQogICAg IC8vIGluIHRoZSBjYWxsIHRvIEhhbmRsZUV2ZW50LiBTZWUgaHR0cDovL2IvaXNzdWU/aWQ9MTM2 Mjk0OAogICAgIEZyYW1lVmlldyogcGFyZW50VmlldyA9IHN0YXRpY19jYXN0PEZyYW1lVmlldyo+ KHBhcmVudCgpKTsKIAotICAgIFdlYk1vdXNlRXZlbnRCdWlsZGVyIHdlYkV2ZW50KHBhcmVudFZp ZXcsICpldmVudCk7CisgICAgV2ViTW91c2VFdmVudEJ1aWxkZXIgd2ViRXZlbnQodGhpcywgKmV2 ZW50KTsKICAgICBpZiAod2ViRXZlbnQudHlwZSA9PSBXZWJJbnB1dEV2ZW50OjpVbmRlZmluZWQp CiAgICAgICAgIHJldHVybjsKIApAQCAtNDMzLDggKzQzMyw3IEBAIHZvaWQgV2ViUGx1Z2luQ29u dGFpbmVySW1wbDo6aGFuZGxlTW91c2UKIAogdm9pZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpo YW5kbGVXaGVlbEV2ZW50KFdoZWVsRXZlbnQqIGV2ZW50KQogewotICAgIEZyYW1lVmlldyogcGFy ZW50VmlldyA9IHN0YXRpY19jYXN0PEZyYW1lVmlldyo+KHBhcmVudCgpKTsKLSAgICBXZWJNb3Vz ZVdoZWVsRXZlbnRCdWlsZGVyIHdlYkV2ZW50KHBhcmVudFZpZXcsICpldmVudCk7CisgICAgV2Vi TW91c2VXaGVlbEV2ZW50QnVpbGRlciB3ZWJFdmVudCh0aGlzLCAqZXZlbnQpOwogICAgIGlmICh3 ZWJFdmVudC50eXBlID09IFdlYklucHV0RXZlbnQ6OlVuZGVmaW5lZCkKICAgICAgICAgcmV0dXJu OwogCg==