201840 2019-09-16 13:28:05 -0700 AX: USER: VO: Messages > Message > Shift-VO-M doesn't reveal correct actions 2019-09-16 16:58:33 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 ericliang webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni ericliang ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1571239 0 ericliang 2019-09-16 13:28:05 -0700 Seed user reports that in Messages, when VO cursor is focused on a message, Shift-VO-M doesn’t reveal the Tapback command (or other commands) user is presented with when they Control Click on a Message. https://sitewatch.apple.com/watches/acker-public-seed/issues/342853 Steps To Reproduce: 1. Enable VoiceOver 2. Messages > focus VO cursor on a Message > Shift-VO-M > control click on message > control click outside of message Results: Shift-VO-M: only delivers ‘Clear Chat Transcript’ command. User expected Tapback command. Regression: Reproduced in 16C27 Notes: What’s interesting is that the ‘Clear Chat Transcript’ command appears when Control-Click outside of message. This seems to indicate some weirdness with the focus, however, interacting with text of message doesn’t address the behavior. 1571240 1 ericliang 2019-09-16 13:28:32 -0700 rdar://problem/28872781 1571246 2 378892 ericliang 2019-09-16 13:33:23 -0700 Created attachment 378892 Patch 1571267 3 378892 cfleizach 2019-09-16 14:22:01 -0700 Comment on attachment 378892 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378892&action=review > Source/WebCore/ChangeLog:8 > + menuForEvent: expects event-position in window’s space, but we pass the position in Core’s space. In this case, we need to convert core’s space to window’s space. can you use ascii characters here instead of unicode > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:3767 > + ScrollView *scrollView = downcast<AccessibilityScrollView>(*parent).scrollView(); can you change this to auto scrollView while we're here. should probably also do // just to ensure we have a scrollView if (auto scrollView = ...) { } 1571270 4 378894 ericliang 2019-09-16 14:30:35 -0700 Created attachment 378894 Patch 1571271 5 378895 ericliang 2019-09-16 14:32:04 -0700 Created attachment 378895 Patch 1571337 6 378895 commit-queue 2019-09-16 16:58:31 -0700 Comment on attachment 378895 Patch Clearing flags on attachment: 378895 Committed r249930: <https://trac.webkit.org/changeset/249930> 1571338 7 commit-queue 2019-09-16 16:58:33 -0700 All reviewed patches have been landed. Closing bug. 378892 2019-09-16 13:33:23 -0700 2019-09-16 14:30:33 -0700 Patch bug-201840-20190916133323.patch text/plain 2585 ericliang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc1M2Q1OTU5N2I1Nzc0 NWQwYmIwYzU4MjYyN2JkMzQ4MWRhMjYyYS4uNWQwNDI2ZTZhZmI2N2NhNTI4YzBmM2VmNjE3YWUy MDZmNmQwY2QzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTA5LTE2ICBFcmlj IExpYW5nICA8ZXJpY2xpYW5nQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogVVNFUjogVk86IE1l c3NhZ2VzID4gTWVzc2FnZSA+IFNoaWZ0LVZPLU0gZG9lc24ndCByZXZlYWwgY29ycmVjdCBhY3Rp b25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE4 NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtZW51 Rm9yRXZlbnQ6IGV4cGVjdHMgZXZlbnQtcG9zaXRpb24gaW4gd2luZG934oCZcyBzcGFjZSwgYnV0 IHdlIHBhc3MgdGhlIHBvc2l0aW9uIGluIENvcmXigJlzIHNwYWNlLiBJbiB0aGlzIGNhc2UsIHdl IG5lZWQgdG8gY29udmVydCBjb3Jl4oCZcyBzcGFjZSB0byB3aW5kb3figJlzIHNwYWNlLgorICAg ICAgICBUZXN0ZWQgdGhhdCBleGlzdGluZyB0ZXN0cyBwYXNzZWQgd2l0aCBXSzEgYW5kIFdLMgor CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vz c2liaWxpdHlTaG93Q29udGV4dE1lbnVdKToKKwogMjAxOS0wOS0xMSAgRGVhbiBKYWNrc29uICA8 ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgUHJvdmlkZSBhIHByb3RvdHlwZSBmb3IgQVIgUXVp Y2tMb29rIHRvIHRyaWdnZXIgcHJvY2Vzc2luZyBpbiB0aGUgb3JpZ2luYXRpbmcgcGFnZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRleCAwYWYxOGI1MTJiYjc0YzQ5 ZTk0OWQ1OGY3NmM2MmIxYzA1NDVjYmUzLi5mNjQzYzc3MmQwYmE2ZDcyMzY2MWU1ODlhZTMyMDE3 ODNkOGIxMDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAt Mzc2MCwxNyArMzc2MCwyMCBAQCBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAg ICAKICAgICAvLyBPbiBXSzIsIHdlIG5lZWQgdG8gYWNjb3VudCBmb3IgdGhlIHNjcm9sbCBwb3Np dGlvbi4KICAgICAvLyBPbiBXSzEsIHRoaXMgaXNuJ3QgbmVjZXNzYXJ5LCBpdCdzIHRha2VuIGNh cmUgb2YgYnkgdGhlIGF0dGFjaG1lbnQgdmlld3MuCi0gICAgaWYgKGZyYW1lVmlldyAmJiAhZnJh bWVWaWV3LT5wbGF0Zm9ybVdpZGdldCgpKSB7CisgICAgaWYgKGZyYW1lVmlldykgewogICAgICAg ICAvLyBGaW5kIHRoZSBhcHByb3ByaWF0ZSBzY3JvbGwgdmlldyB0byB1c2UgdG8gY29udmVydCB0 aGUgY29udGVudHMgdG8gdGhlIHdpbmRvdy4KICAgICAgICAgZm9yIChBY2Nlc3NpYmlsaXR5T2Jq ZWN0KiBwYXJlbnQgPSBtX29iamVjdC0+cGFyZW50T2JqZWN0KCk7IHBhcmVudDsgcGFyZW50ID0g cGFyZW50LT5wYXJlbnRPYmplY3QoKSkgewogICAgICAgICAgICAgaWYgKGlzPEFjY2Vzc2liaWxp dHlTY3JvbGxWaWV3PigqcGFyZW50KSkgewotICAgICAgICAgICAgICAgIFNjcm9sbFZpZXcqIHNj cm9sbFZpZXcgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldz4oKnBhcmVudCkuc2Ny b2xsVmlldygpOwotICAgICAgICAgICAgICAgIHJlY3QgPSBzY3JvbGxWaWV3LT5jb250ZW50c1Rv Um9vdFZpZXcocmVjdCk7CisgICAgICAgICAgICAgICAgU2Nyb2xsVmlldyAqc2Nyb2xsVmlldyA9 IGRvd25jYXN0PEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3PigqcGFyZW50KS5zY3JvbGxWaWV3KCk7 CisgICAgICAgICAgICAgICAgaWYgKCFmcmFtZVZpZXctPnBsYXRmb3JtV2lkZ2V0KCkpCisgICAg ICAgICAgICAgICAgICAgIHJlY3QgPSBzY3JvbGxWaWV3LT5jb250ZW50c1RvUm9vdFZpZXcocmVj dCk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICByZWN0ID0gc2Ny b2xsVmlldy0+Y29udGVudHNUb1dpbmRvdyhyZWN0KTsKICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KLSAgICAKKwogICAgIHBhZ2UtPmNvbnRl eHRNZW51Q29udHJvbGxlcigpLnNob3dDb250ZXh0TWVudUF0KHBhZ2UtPm1haW5GcmFtZSgpLCBy ZWN0LmNlbnRlcigpKTsKIH0KIAo= 378894 2019-09-16 14:30:35 -0700 2019-09-16 14:32:03 -0700 Patch bug-201840-20190916143034.patch text/plain 2874 ericliang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc1M2Q1OTU5N2I1Nzc0 NWQwYmIwYzU4MjYyN2JkMzQ4MWRhMjYyYS4uMTdkZWNjNWFmYzkzMTczMWY3ZDQxNTVhZTEwYmU4 OTgzOTAyNGVlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTA5LTE2ICBFcmlj IExpYW5nICA8ZXJpY2xpYW5nQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogVVNFUjogVk86IE1l c3NhZ2VzID4gTWVzc2FnZSA+IFNoaWZ0LVZPLU0gZG9lc24ndCByZXZlYWwgY29ycmVjdCBhY3Rp b25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE4 NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtZW51 Rm9yRXZlbnQ6IGV4cGVjdHMgZXZlbnQtcG9zaXRpb24gaW4gd2luZG93J3Mgc3BhY2UsIGJ1dCB3 ZSBwYXNzIHRoZSBwb3NpdGlvbiBpbiBDb3JlJ3Mgc3BhY2UuIEluIHRoaXMgY2FzZSwgd2UgbmVl ZCB0byBjb252ZXJ0IGNvcmUncyBzcGFjZSB0byB3aW5kb3cncyBzcGFjZS4KKyAgICAgICAgVGVz dGVkIHRoYXQgZXhpc3RpbmcgdGVzdHMgcGFzc2VkIHdpdGggV0sxIGFuZCBXSzIKKworICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1t OgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5 U2hvd0NvbnRleHRNZW51XSk6CisKIDIwMTktMDktMTEgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBw bGUuY29tPgogCiAgICAgICAgIFByb3ZpZGUgYSBwcm90b3R5cGUgZm9yIEFSIFF1aWNrTG9vayB0 byB0cmlnZ2VyIHByb2Nlc3NpbmcgaW4gdGhlIG9yaWdpbmF0aW5nIHBhZ2UKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KaW5kZXggMGFmMThiNTEyYmI3NGM0OWU5NDlkNThm NzZjNjJiMWMwNTQ1Y2JlMy4uNmEyOGNkMjI3ZWZjMzYzZmU0MTM2OGNiMjJkMmJiNzkyNjUzMzU0 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KQEAgLTM3NTgsMTkg KzM3NTgsMjMgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgSW50UmVj dCByZWN0ID0gc25hcHBlZEludFJlY3QobV9vYmplY3QtPmVsZW1lbnRSZWN0KCkpOwogICAgIEZy YW1lVmlldyogZnJhbWVWaWV3ID0gbV9vYmplY3QtPmRvY3VtZW50RnJhbWVWaWV3KCk7CiAgICAg Ci0gICAgLy8gT24gV0syLCB3ZSBuZWVkIHRvIGFjY291bnQgZm9yIHRoZSBzY3JvbGwgcG9zaXRp b24uCi0gICAgLy8gT24gV0sxLCB0aGlzIGlzbid0IG5lY2Vzc2FyeSwgaXQncyB0YWtlbiBjYXJl IG9mIGJ5IHRoZSBhdHRhY2htZW50IHZpZXdzLgotICAgIGlmIChmcmFtZVZpZXcgJiYgIWZyYW1l Vmlldy0+cGxhdGZvcm1XaWRnZXQoKSkgeworICAgIC8vIE9uIFdLMiwgd2UgbmVlZCB0byBhY2Nv dW50IGZvciB0aGUgc2Nyb2xsIHBvc2l0aW9uIHdpdGggcmVnYXJkcyB0byByb290IHZpZXcuCisg ICAgLy8gT24gV0sxLCB3ZSBuZWVkIHRvIGNvbnZlcnQgcmVjdCBpbiB3aW5kb3cgc3BhY2UuCisg ICAgaWYgKGZyYW1lVmlldykgewogICAgICAgICAvLyBGaW5kIHRoZSBhcHByb3ByaWF0ZSBzY3Jv bGwgdmlldyB0byB1c2UgdG8gY29udmVydCB0aGUgY29udGVudHMgdG8gdGhlIHdpbmRvdy4KICAg ICAgICAgZm9yIChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBwYXJlbnQgPSBtX29iamVjdC0+cGFyZW50 T2JqZWN0KCk7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT5wYXJlbnRPYmplY3QoKSkgewogICAg ICAgICAgICAgaWYgKGlzPEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3PigqcGFyZW50KSkgewotICAg ICAgICAgICAgICAgIFNjcm9sbFZpZXcqIHNjcm9sbFZpZXcgPSBkb3duY2FzdDxBY2Nlc3NpYmls aXR5U2Nyb2xsVmlldz4oKnBhcmVudCkuc2Nyb2xsVmlldygpOwotICAgICAgICAgICAgICAgIHJl Y3QgPSBzY3JvbGxWaWV3LT5jb250ZW50c1RvUm9vdFZpZXcocmVjdCk7CisgICAgICAgICAgICAg ICAgaWYgKGF1dG8gc2Nyb2xsVmlldyA9IGRvd25jYXN0PEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3 PigqcGFyZW50KS5zY3JvbGxWaWV3KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFmcmFt ZVZpZXctPnBsYXRmb3JtV2lkZ2V0KCkpCisgICAgICAgICAgICAgICAgICAgICAgICByZWN0ID0g c2Nyb2xsVmlldy0+Y29udGVudHNUb1Jvb3RWaWV3KHJlY3QpOworICAgICAgICAgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICByZWN0ID0gc2Nyb2xsVmlldy0+Y29udGVu dHNUb1dpbmRvdyhyZWN0KTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9Ci0gICAgCisKICAgICBwYWdlLT5j b250ZXh0TWVudUNvbnRyb2xsZXIoKS5zaG93Q29udGV4dE1lbnVBdChwYWdlLT5tYWluRnJhbWUo KSwgcmVjdC5jZW50ZXIoKSk7CiB9CiAK 378895 2019-09-16 14:32:04 -0700 2019-09-16 16:58:31 -0700 Patch bug-201840-20190916143204.patch text/plain 2898 ericliang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc1M2Q1OTU5N2I1Nzc0 NWQwYmIwYzU4MjYyN2JkMzQ4MWRhMjYyYS4uMTdkZWNjNWFmYzkzMTczMWY3ZDQxNTVhZTEwYmU4 OTgzOTAyNGVlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTA5LTE2ICBFcmlj IExpYW5nICA8ZXJpY2xpYW5nQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogVVNFUjogVk86IE1l c3NhZ2VzID4gTWVzc2FnZSA+IFNoaWZ0LVZPLU0gZG9lc24ndCByZXZlYWwgY29ycmVjdCBhY3Rp b25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE4 NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtZW51 Rm9yRXZlbnQ6IGV4cGVjdHMgZXZlbnQtcG9zaXRpb24gaW4gd2luZG93J3Mgc3BhY2UsIGJ1dCB3 ZSBwYXNzIHRoZSBwb3NpdGlvbiBpbiBDb3JlJ3Mgc3BhY2UuIEluIHRoaXMgY2FzZSwgd2UgbmVl ZCB0byBjb252ZXJ0IGNvcmUncyBzcGFjZSB0byB3aW5kb3cncyBzcGFjZS4KKyAgICAgICAgVGVz dGVkIHRoYXQgZXhpc3RpbmcgdGVzdHMgcGFzc2VkIHdpdGggV0sxIGFuZCBXSzIKKworICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1t OgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5 U2hvd0NvbnRleHRNZW51XSk6CisKIDIwMTktMDktMTEgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBw bGUuY29tPgogCiAgICAgICAgIFByb3ZpZGUgYSBwcm90b3R5cGUgZm9yIEFSIFF1aWNrTG9vayB0 byB0cmlnZ2VyIHByb2Nlc3NpbmcgaW4gdGhlIG9yaWdpbmF0aW5nIHBhZ2UKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KaW5kZXggMGFmMThiNTEyYmI3NGM0OWU5NDlkNThm NzZjNjJiMWMwNTQ1Y2JlMy4uNTkxZjFhNzVjZmU1ZjNhYTliZDlmNTVlNmYyOTZhMDA2YThmMDc0 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KQEAgLTM3NTgsMTkg KzM3NTgsMjMgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgSW50UmVj dCByZWN0ID0gc25hcHBlZEludFJlY3QobV9vYmplY3QtPmVsZW1lbnRSZWN0KCkpOwogICAgIEZy YW1lVmlldyogZnJhbWVWaWV3ID0gbV9vYmplY3QtPmRvY3VtZW50RnJhbWVWaWV3KCk7CiAgICAg Ci0gICAgLy8gT24gV0syLCB3ZSBuZWVkIHRvIGFjY291bnQgZm9yIHRoZSBzY3JvbGwgcG9zaXRp b24uCi0gICAgLy8gT24gV0sxLCB0aGlzIGlzbid0IG5lY2Vzc2FyeSwgaXQncyB0YWtlbiBjYXJl IG9mIGJ5IHRoZSBhdHRhY2htZW50IHZpZXdzLgotICAgIGlmIChmcmFtZVZpZXcgJiYgIWZyYW1l Vmlldy0+cGxhdGZvcm1XaWRnZXQoKSkgeworICAgIC8vIE9uIFdLMiwgd2UgbmVlZCB0byBhY2Nv dW50IGZvciB0aGUgc2Nyb2xsIHBvc2l0aW9uIHdpdGggcmVnYXJkcyB0byByb290IHZpZXcuCisg ICAgLy8gT24gV0sxLCB3ZSBuZWVkIHRvIGNvbnZlcnQgcmVjdCB0byB3aW5kb3cgc3BhY2UgdG8g bWF0Y2ggbW91c2UgY2xpY2tpbmcuCisgICAgaWYgKGZyYW1lVmlldykgewogICAgICAgICAvLyBG aW5kIHRoZSBhcHByb3ByaWF0ZSBzY3JvbGwgdmlldyB0byB1c2UgdG8gY29udmVydCB0aGUgY29u dGVudHMgdG8gdGhlIHdpbmRvdy4KICAgICAgICAgZm9yIChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBw YXJlbnQgPSBtX29iamVjdC0+cGFyZW50T2JqZWN0KCk7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50 LT5wYXJlbnRPYmplY3QoKSkgewogICAgICAgICAgICAgaWYgKGlzPEFjY2Vzc2liaWxpdHlTY3Jv bGxWaWV3PigqcGFyZW50KSkgewotICAgICAgICAgICAgICAgIFNjcm9sbFZpZXcqIHNjcm9sbFZp ZXcgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldz4oKnBhcmVudCkuc2Nyb2xsVmll dygpOwotICAgICAgICAgICAgICAgIHJlY3QgPSBzY3JvbGxWaWV3LT5jb250ZW50c1RvUm9vdFZp ZXcocmVjdCk7CisgICAgICAgICAgICAgICAgaWYgKGF1dG8gc2Nyb2xsVmlldyA9IGRvd25jYXN0 PEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3PigqcGFyZW50KS5zY3JvbGxWaWV3KCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgaWYgKCFmcmFtZVZpZXctPnBsYXRmb3JtV2lkZ2V0KCkpCisgICAgICAg ICAgICAgICAgICAgICAgICByZWN0ID0gc2Nyb2xsVmlldy0+Y29udGVudHNUb1Jvb3RWaWV3KHJl Y3QpOworICAgICAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBy ZWN0ID0gc2Nyb2xsVmlldy0+Y29udGVudHNUb1dpbmRvdyhyZWN0KTsKKyAgICAgICAgICAgICAg ICB9CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9Ci0gICAgCisKICAgICBwYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIoKS5zaG93Q29udGV4 dE1lbnVBdChwYWdlLT5tYWluRnJhbWUoKSwgcmVjdC5jZW50ZXIoKSk7CiB9CiAK