214773 2020-07-24 17:50:53 -0700 Trying to lookup when WebView is in a popover causes process to hang. 2020-07-27 10:05:23 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner hi thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1674938 0 megan_gardner 2020-07-24 17:50:53 -0700 Trying to lookup when WebView is in a popover causes process to hang. 1674942 1 405210 megan_gardner 2020-07-24 18:19:17 -0700 Created attachment 405210 Patch 1674965 2 405210 hi 2020-07-24 19:19:14 -0700 Comment on attachment 405210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405210&action=review > Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm:355 > + if (!(((webView.get().window._childWindowOrderingPriority == NSWindowChildOrderingPriorityPopover) || [NSUserDefaults.standardUserDefaults boolForKey:@"LULookupDisabled"]) && items[i].action() == ContextMenuItemTagLookUpInDictionary)) Can we move the `((webView.get().window._childWindowOrderingPriority == NSWindowChildOrderingPriorityPopover) || [NSUserDefaults.standardUserDefaults boolForKey:@"LULookupDisabled"])` to a variable outside this loop so that it doesn't have to be recalculated in each iteration? ``` bool isPopover = m_webView->get().window._childWindowOrderingPriority == NSWindowChildOrderingPriorityPopover; bool isLookupDisabled = [NSUserDefaults.standardUserDefaults boolForKey:@"LULookupDisabled"]; for (auto& item : items) { if (item.action() != ContextMenuItemTagLookUpInDictionary || (!isLookupDisabled && !isPopover)) filteredItems.uncheckedAppend(item); } ``` 1674975 3 405210 wenson_hsieh 2020-07-24 20:04:37 -0700 Comment on attachment 405210 Patch It looks like you’ll need to add NSWindowChildOrderingPriorityPopover to NSWindowSPI.h as well. 1675247 4 405276 megan_gardner 2020-07-27 08:28:05 -0700 Created attachment 405276 Patch 1675264 5 405276 hi 2020-07-27 09:07:26 -0700 Comment on attachment 405276 Patch r=me 1675283 6 ews-feeder 2020-07-27 10:04:03 -0700 Committed r264928: <https://trac.webkit.org/changeset/264928> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405276. 1675284 7 webkit-bug-importer 2020-07-27 10:05:23 -0700 <rdar://problem/66168314> 405210 2020-07-24 18:19:17 -0700 2020-07-27 08:28:02 -0700 Patch bug-214773-20200724191916.patch text/plain 4873 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0ODE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCAyMzY5YTA1 MDQ3NzkyNTQ4NThjNjlmOTMyMGM0NjdhY2EzMzM5NTA5Li4zNWEyNGU3MzI0NGQzYWQ1Y2RlMDZj ZmZhODNhMGI0MzMxM2I4N2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAyMC0wNy0yNCAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisg ICAgICAgIFRyeWluZyB0byBsb29rdXAgd2hlbiBXZWJWaWV3IGlzIGluIGEgcG9wb3ZlciBjYXVz ZXMgcHJvY2VzcyB0byBoYW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE0NzczCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MjMxNzc2Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhbC9zcGkv bWFjL05TV2luZG93U1BJLmg6CisKIDIwMjAtMDctMjMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBTcGxpdCBXaW5kb3dzIHBhcnRzIGZyb20g Q0ZOZXR3b3JrU1BJLmggdG8gQ0ZOZXR3b3JrU1BJV2luLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYzgxN2ZmN2Ji Njg2NDIwMTUzMTBmZmFlNGY0ZTMyMzMwYjJkM2M0Ny4uZjdjNWNlZjY0Yzg4MjcyZDU4NGU2NmZm ZDFmZGY3ZDRmOGJjYWM2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wNy0yNCAg TWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIFRyeWlu ZyB0byBsb29rdXAgd2hlbiBXZWJWaWV3IGlzIGluIGEgcG9wb3ZlciBjYXVzZXMgcHJvY2VzcyB0 byBoYW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE0NzczCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MjMxNzc2Mj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgTG9va3VwIGZyYW1ld29yayBk b2VzIG5vdCBwb3B1bGF0ZSB0aGUgbWVudXMgdGhhdCBpdCB2ZW5kcyB3aXRoIHRoZSBvcHRpb24g dG8gJ2xvb2t1cCcKKyAgICAgICAgd29yZHMgdGhhdCBhcmUgc2VsZWN0ZWQgaW4gcG9wb3ZlcnMu IFdlYktpdCBzaG91bGQgZm9sbG93IHRoZSBwYXR0ZXJuIGFuZCBub3QgcHV0IHRoZQorICAgICAg ICBpdGVtIGluIHRoZSBtZW51IGFzIExvb2t1cCBpcyBub3QgYWJsZSB0byBoYW5kbGUgdGhpcyBz aXR1YXRpb24uIEFsc28gaWYgTG9va3VwIGlzIGRpc2FibGVkCisgICAgICAgIHZpYSBkZWZhdWx0 cywgd2Ugc2hvdWxkIG5vdCBzaG93IGl0IGluIHRoZSBtZW51LgorCisgICAgICAgICogVUlQcm9j ZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJD b250ZXh0TWVudVByb3h5TWFjOjpnZXRDb250ZXh0TWVudUZyb21JdGVtcyk6CisKIDIwMjAtMDct MjQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBvbmUg c29ja2V0IHNlcnZlciBmb3IgdGhlIHdob2xlIG5ldHdvcmsgcHJvY2VzcyBpbnN0ZWFkIG9mIG9u ZSBzb2NrZXQgc2VydmVyIHBlciB3ZWIgcHJvY2VzcyBjb25uZWN0aW9uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMvTlNXaW5kb3dTUEkuaCBiL1NvdXJjZS9XZWJD b3JlL1BBTC9wYWwvc3BpL21hYy9OU1dpbmRvd1NQSS5oCmluZGV4IGM1Njk0MjRhYzlmYmQ0ZjRi YTFkYWUyOTc2NmYxZDBiNjQwYTBlN2MuLjhiMDBlNjBjMmRlMTAxMmM0OWFlMWNmMDYxMGUzYzMw YjkzODE2Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU1dp bmRvd1NQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU1dpbmRvd1NQ SS5oCkBAIC00Miw2ICs0Miw4IEBACiAtICh2b2lkKV9zZXRDdXJzb3JGb3JNb3VzZUxvY2F0aW9u OihOU1BvaW50KXBvaW50OwogLSAodm9pZClleGl0RnVsbFNjcmVlbk1vZGU6KGlkKXNlbmRlcjsK IC0gKHZvaWQpZW50ZXJGdWxsU2NyZWVuTW9kZTooaWQpc2VuZGVyOworCistIChOU0ludGVnZXIp X2NoaWxkV2luZG93T3JkZXJpbmdQcmlvcml0eTsKIEBlbmQKIAogZW51bSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCmlu ZGV4IGE2NGUxMzZhY2Q5NTJmMjM5NDM3YzM5ZTUxZjhlYjkxZDY5OGE2MDUuLmU1OGJlZTMwOTA3 NTI3YWE2MTQ0MmUwMjZjMGU5ZmQ0NWRkZWQ1OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCkBAIC00Miw2ICs0Miw3 IEBACiAjaW1wb3J0IDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4KICNpbXBvcnQgPHBhbC9z cGkvbWFjL05TTWVudVNQSS5oPgogI2ltcG9ydCA8cGFsL3NwaS9tYWMvTlNTaGFyaW5nU2Vydmlj ZVBpY2tlclNQSS5oPgorI2ltcG9ydCA8cGFsL3NwaS9tYWMvTlNXaW5kb3dTUEkuaD4KICNpbXBv cnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAogQGludGVyZmFjZSBXS1VzZXJEYXRhV3JhcHBlciA6IE5T T2JqZWN0IHsKQEAgLTM0NSw5ICszNDYsMTggQEAgdm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFj OjpnZXRDb250ZXh0TWVudUZyb21JdGVtcyhjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnUKICAg ICAgICAgY29tcGxldGlvbkhhbmRsZXIobWVudS5nZXQoKSk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CisgICAgCisgICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+IGZpbHRlcmVkSXRl bXM7CisgICAgZmlsdGVyZWRJdGVtcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGl0ZW1zLnNpemUo KSk7CisgICAgYXV0byB3ZWJWaWV3ID0gbV93ZWJWaWV3LmdldCgpOworICAgIAorICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgaXRlbXMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgaWYgKCEoKCh3 ZWJWaWV3LmdldCgpLndpbmRvdy5fY2hpbGRXaW5kb3dPcmRlcmluZ1ByaW9yaXR5ID09IE5TV2lu ZG93Q2hpbGRPcmRlcmluZ1ByaW9yaXR5UG9wb3ZlcikgfHwgW05TVXNlckRlZmF1bHRzLnN0YW5k YXJkVXNlckRlZmF1bHRzIGJvb2xGb3JLZXk6QCJMVUxvb2t1cERpc2FibGVkIl0pICYmIGl0ZW1z W2ldLmFjdGlvbigpID09IENvbnRleHRNZW51SXRlbVRhZ0xvb2tVcEluRGljdGlvbmFyeSkpCisg ICAgICAgICAgICBmaWx0ZXJlZEl0ZW1zLnVuY2hlY2tlZEFwcGVuZChpdGVtc1tpXSk7CisgICAg fQogCiAgICAgYXV0byBzcGFyc2VNZW51SXRlbXMgPSByZXRhaW5QdHIoW05TUG9pbnRlckFycmF5 IHN0cm9uZ09iamVjdHNQb2ludGVyQXJyYXldKTsKLSAgICBhdXRvIGluc2VydE1lbnVJdGVtID0g bWFrZUJsb2NrUHRyKFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpLCBpdGVtc1JlbWFpbmluZyA9IGl0ZW1zLnNpemUoKSwgbWVudSA9IFdURk1vdmUobWVudSks IHNwYXJzZU1lbnVJdGVtc10oTlNNZW51SXRlbSAqaXRlbSwgTlNVSW50ZWdlciBpbmRleCkgbXV0 YWJsZSB7CisgICAgYXV0byBpbnNlcnRNZW51SXRlbSA9IG1ha2VCbG9ja1B0cihbY29tcGxldGlv bkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgaXRlbXNSZW1haW5pbmcgPSBm aWx0ZXJlZEl0ZW1zLnNpemUoKSwgbWVudSA9IFdURk1vdmUobWVudSksIHNwYXJzZU1lbnVJdGVt c10oTlNNZW51SXRlbSAqaXRlbSwgTlNVSW50ZWdlciBpbmRleCkgbXV0YWJsZSB7CiAgICAgICAg IEFTU0VSVChpbmRleCA8IFtzcGFyc2VNZW51SXRlbXMgY291bnRdKTsKICAgICAgICAgQVNTRVJU KCFbc3BhcnNlTWVudUl0ZW1zIHBvaW50ZXJBdEluZGV4OmluZGV4XSk7CiAgICAgICAgIFtzcGFy c2VNZW51SXRlbXMgcmVwbGFjZVBvaW50ZXJBdEluZGV4OmluZGV4IHdpdGhQb2ludGVyOml0ZW1d OwpAQCAtMzU4LDkgKzM2OCw5IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6Z2V0Q29u dGV4dE1lbnVGcm9tSXRlbXMoY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51CiAgICAgICAgIGNv bXBsZXRpb25IYW5kbGVyKG1lbnUuZ2V0KCkpOwogICAgIH0pOwogCi0gICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBpdGVtcy5zaXplKCk7ICsraSkgeworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgZmlsdGVyZWRJdGVtcy5zaXplKCk7ICsraSkgewogICAgICAgICBbc3BhcnNlTWVudUl0ZW1z IGFkZFBvaW50ZXI6bnVsbHB0cl07Ci0gICAgICAgIGdldENvbnRleHRNZW51SXRlbShpdGVtc1tp XSwgW2luc2VydE1lbnVJdGVtLCBpXShOU01lbnVJdGVtICptZW51SXRlbSkgeworICAgICAgICBn ZXRDb250ZXh0TWVudUl0ZW0oZmlsdGVyZWRJdGVtc1tpXSwgW2luc2VydE1lbnVJdGVtLCBpXShO U01lbnVJdGVtICptZW51SXRlbSkgewogICAgICAgICAgICAgaW5zZXJ0TWVudUl0ZW0obWVudUl0 ZW0sIGkpOwogICAgICAgICB9KTsKICAgICB9Cg== 405276 2020-07-27 08:28:05 -0700 2020-07-27 10:04:03 -0700 Patch bug-214773-20200727092804.patch text/plain 4988 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0ODE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCAyMzY5YTA1 MDQ3NzkyNTQ4NThjNjlmOTMyMGM0NjdhY2EzMzM5NTA5Li4zNWEyNGU3MzI0NGQzYWQ1Y2RlMDZj ZmZhODNhMGI0MzMxM2I4N2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAyMC0wNy0yNCAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisg ICAgICAgIFRyeWluZyB0byBsb29rdXAgd2hlbiBXZWJWaWV3IGlzIGluIGEgcG9wb3ZlciBjYXVz ZXMgcHJvY2VzcyB0byBoYW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE0NzczCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MjMxNzc2Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhbC9zcGkv bWFjL05TV2luZG93U1BJLmg6CisKIDIwMjAtMDctMjMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBTcGxpdCBXaW5kb3dzIHBhcnRzIGZyb20g Q0ZOZXR3b3JrU1BJLmggdG8gQ0ZOZXR3b3JrU1BJV2luLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYzgxN2ZmN2Ji Njg2NDIwMTUzMTBmZmFlNGY0ZTMyMzMwYjJkM2M0Ny4uZjdjNWNlZjY0Yzg4MjcyZDU4NGU2NmZm ZDFmZGY3ZDRmOGJjYWM2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wNy0yNCAg TWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIFRyeWlu ZyB0byBsb29rdXAgd2hlbiBXZWJWaWV3IGlzIGluIGEgcG9wb3ZlciBjYXVzZXMgcHJvY2VzcyB0 byBoYW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE0NzczCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MjMxNzc2Mj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgTG9va3VwIGZyYW1ld29yayBk b2VzIG5vdCBwb3B1bGF0ZSB0aGUgbWVudXMgdGhhdCBpdCB2ZW5kcyB3aXRoIHRoZSBvcHRpb24g dG8gJ2xvb2t1cCcKKyAgICAgICAgd29yZHMgdGhhdCBhcmUgc2VsZWN0ZWQgaW4gcG9wb3ZlcnMu IFdlYktpdCBzaG91bGQgZm9sbG93IHRoZSBwYXR0ZXJuIGFuZCBub3QgcHV0IHRoZQorICAgICAg ICBpdGVtIGluIHRoZSBtZW51IGFzIExvb2t1cCBpcyBub3QgYWJsZSB0byBoYW5kbGUgdGhpcyBz aXR1YXRpb24uIEFsc28gaWYgTG9va3VwIGlzIGRpc2FibGVkCisgICAgICAgIHZpYSBkZWZhdWx0 cywgd2Ugc2hvdWxkIG5vdCBzaG93IGl0IGluIHRoZSBtZW51LgorCisgICAgICAgICogVUlQcm9j ZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJD b250ZXh0TWVudVByb3h5TWFjOjpnZXRDb250ZXh0TWVudUZyb21JdGVtcyk6CisKIDIwMjAtMDct MjQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBvbmUg c29ja2V0IHNlcnZlciBmb3IgdGhlIHdob2xlIG5ldHdvcmsgcHJvY2VzcyBpbnN0ZWFkIG9mIG9u ZSBzb2NrZXQgc2VydmVyIHBlciB3ZWIgcHJvY2VzcyBjb25uZWN0aW9uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMvTlNXaW5kb3dTUEkuaCBiL1NvdXJjZS9XZWJD b3JlL1BBTC9wYWwvc3BpL21hYy9OU1dpbmRvd1NQSS5oCmluZGV4IGM1Njk0MjRhYzlmYmQ0ZjRi YTFkYWUyOTc2NmYxZDBiNjQwYTBlN2MuLjdiOTM5Y2I0MzZkMzZiN2MzMzcxZTU1MGU4MDI3NTk2 MTJkNWUxMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU1dp bmRvd1NQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU1dpbmRvd1NQ SS5oCkBAIC00Miw2ICs0MiwxMSBAQAogLSAodm9pZClfc2V0Q3Vyc29yRm9yTW91c2VMb2NhdGlv bjooTlNQb2ludClwb2ludDsKIC0gKHZvaWQpZXhpdEZ1bGxTY3JlZW5Nb2RlOihpZClzZW5kZXI7 CiAtICh2b2lkKWVudGVyRnVsbFNjcmVlbk1vZGU6KGlkKXNlbmRlcjsKKworZW51bSB7CisgICAg TlNXaW5kb3dDaGlsZE9yZGVyaW5nUHJpb3JpdHlQb3BvdmVyID0gMjAsCit9OworLSAoTlNJbnRl Z2VyKV9jaGlsZFdpbmRvd09yZGVyaW5nUHJpb3JpdHk7CiBAZW5kCiAKIGVudW0gewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMu bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5t bQppbmRleCBhNjRlMTM2YWNkOTUyZjIzOTQzN2MzOWU1MWY4ZWI5MWQ2OThhNjA1Li4xNDk1YWMx NDc2YmQ1MTNkOGE2MmY4MjU3MGRjOGJjY2EzYjA1NDIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQpAQCAtNDIsNiAr NDIsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6ZWRTdHJpbmdzLmg+CiAjaW1wb3J0IDxw YWwvc3BpL21hYy9OU01lbnVTUEkuaD4KICNpbXBvcnQgPHBhbC9zcGkvbWFjL05TU2hhcmluZ1Nl cnZpY2VQaWNrZXJTUEkuaD4KKyNpbXBvcnQgPHBhbC9zcGkvbWFjL05TV2luZG93U1BJLmg+CiAj aW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKIEBpbnRlcmZhY2UgV0tVc2VyRGF0YVdyYXBwZXIg OiBOU09iamVjdCB7CkBAIC0zNDUsOSArMzQ2LDIxIEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94 eU1hYzo6Z2V0Q29udGV4dE1lbnVGcm9tSXRlbXMoY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51 CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKG1lbnUuZ2V0KCkpOwogICAgICAgICByZXR1cm47 CiAgICAgfQorICAgIAorICAgIFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiBmaWx0ZXJl ZEl0ZW1zOworICAgIGZpbHRlcmVkSXRlbXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShpdGVtcy5z aXplKCkpOworICAgIGF1dG8gd2ViVmlldyA9IG1fd2ViVmlldy5nZXQoKTsKKyAgICAKKyAgICBi b29sIGlzUG9wb3ZlciA9IHdlYlZpZXcuZ2V0KCkud2luZG93Ll9jaGlsZFdpbmRvd09yZGVyaW5n UHJpb3JpdHkgPT0gTlNXaW5kb3dDaGlsZE9yZGVyaW5nUHJpb3JpdHlQb3BvdmVyOworICAgIGJv b2wgaXNMb29rdXBEaXNhYmxlZCA9IFtOU1VzZXJEZWZhdWx0cy5zdGFuZGFyZFVzZXJEZWZhdWx0 cyBib29sRm9yS2V5OkAiTFVMb29rdXBEaXNhYmxlZCJdOworCisgICAgZm9yIChhdXRvJiBpdGVt IDogaXRlbXMpIHsKKyAgICAgICAgaWYgKGl0ZW0uYWN0aW9uKCkgIT0gQ29udGV4dE1lbnVJdGVt VGFnTG9va1VwSW5EaWN0aW9uYXJ5IHx8ICghaXNMb29rdXBEaXNhYmxlZCAmJiAhaXNQb3BvdmVy KSkKKyAgICAgICAgICAgIGZpbHRlcmVkSXRlbXMudW5jaGVja2VkQXBwZW5kKGl0ZW0pOworICAg IH0KIAogICAgIGF1dG8gc3BhcnNlTWVudUl0ZW1zID0gcmV0YWluUHRyKFtOU1BvaW50ZXJBcnJh eSBzdHJvbmdPYmplY3RzUG9pbnRlckFycmF5XSk7Ci0gICAgYXV0byBpbnNlcnRNZW51SXRlbSA9 IG1ha2VCbG9ja1B0cihbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSwgaXRlbXNSZW1haW5pbmcgPSBpdGVtcy5zaXplKCksIG1lbnUgPSBXVEZNb3ZlKG1lbnUp LCBzcGFyc2VNZW51SXRlbXNdKE5TTWVudUl0ZW0gKml0ZW0sIE5TVUludGVnZXIgaW5kZXgpIG11 dGFibGUgeworICAgIGF1dG8gaW5zZXJ0TWVudUl0ZW0gPSBtYWtlQmxvY2tQdHIoW2NvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIGl0ZW1zUmVtYWluaW5nID0g ZmlsdGVyZWRJdGVtcy5zaXplKCksIG1lbnUgPSBXVEZNb3ZlKG1lbnUpLCBzcGFyc2VNZW51SXRl bXNdKE5TTWVudUl0ZW0gKml0ZW0sIE5TVUludGVnZXIgaW5kZXgpIG11dGFibGUgewogICAgICAg ICBBU1NFUlQoaW5kZXggPCBbc3BhcnNlTWVudUl0ZW1zIGNvdW50XSk7CiAgICAgICAgIEFTU0VS VCghW3NwYXJzZU1lbnVJdGVtcyBwb2ludGVyQXRJbmRleDppbmRleF0pOwogICAgICAgICBbc3Bh cnNlTWVudUl0ZW1zIHJlcGxhY2VQb2ludGVyQXRJbmRleDppbmRleCB3aXRoUG9pbnRlcjppdGVt XTsKQEAgLTM1OCw5ICszNzEsOSBAQCB2b2lkIFdlYkNvbnRleHRNZW51UHJveHlNYWM6OmdldENv bnRleHRNZW51RnJvbUl0ZW1zKGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudQogICAgICAgICBj b21wbGV0aW9uSGFuZGxlcihtZW51LmdldCgpKTsKICAgICB9KTsKIAotICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgaXRlbXMuc2l6ZSgpOyArK2kpIHsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IGZpbHRlcmVkSXRlbXMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgW3NwYXJzZU1lbnVJdGVt cyBhZGRQb2ludGVyOm51bGxwdHJdOwotICAgICAgICBnZXRDb250ZXh0TWVudUl0ZW0oaXRlbXNb aV0sIFtpbnNlcnRNZW51SXRlbSwgaV0oTlNNZW51SXRlbSAqbWVudUl0ZW0pIHsKKyAgICAgICAg Z2V0Q29udGV4dE1lbnVJdGVtKGZpbHRlcmVkSXRlbXNbaV0sIFtpbnNlcnRNZW51SXRlbSwgaV0o TlNNZW51SXRlbSAqbWVudUl0ZW0pIHsKICAgICAgICAgICAgIGluc2VydE1lbnVJdGVtKG1lbnVJ dGVtLCBpKTsKICAgICAgICAgfSk7CiAgICAgfQo=