200588 2019-08-09 14:07:04 -0700 [iOS WK2] Remove context menu hints on navigation 2019-08-10 16:54:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser thorton webkit-bug-importer oldest_to_newest 1560009 0 simon.fraser 2019-08-09 14:07:04 -0700 [iOS WK2] Remove context menu previews on navigation 1560012 1 375950 simon.fraser 2019-08-09 14:08:36 -0700 Created attachment 375950 Patch 1560013 2 simon.fraser 2019-08-09 14:08:38 -0700 <rdar://problem/54061796> 1560015 3 375950 thorton 2019-08-09 14:10:38 -0700 Comment on attachment 375950 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375950&action=review > Source/WebKit/ChangeLog:9 > + Make sure the context menu preview doesn't linger across navigations by hosting it in its hint! the preview is the platter that is presented above the context menu. > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3954 > + [self _hideContextMenu]; You don't hide the menu, just the hint > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:6397 > + if (_contextMenuContainerView) { Ditto 1560034 4 375956 simon.fraser 2019-08-09 14:19:51 -0700 Created attachment 375956 Patch 1560066 5 375956 commit-queue 2019-08-09 15:01:46 -0700 Comment on attachment 375956 Patch Clearing flags on attachment: 375956 Committed r248481: <https://trac.webkit.org/changeset/248481> 1560077 6 375956 ap 2019-08-09 15:30:09 -0700 Comment on attachment 375956 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375956&action=review > Source/WebKit/ChangeLog:15 > + (-[WKContentView _didCommitLoadForMainFrame]): The issue will still be happening for subframe navigations, correct? 1560287 7 simon.fraser 2019-08-10 16:54:56 -0700 Yes, but we can fix that separately. 375950 2019-08-09 14:08:36 -0700 2019-08-09 14:10:38 -0700 Patch bug-200588-20190809140835.patch text/plain 4753 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiN2U2ODQxMGY3YWE5MzAw NmM4OTVjYTA4N2M2NDRhNzE0MjE1YTguLjE0YWIwM2RhMWMwOTcxNmY5ODE5ZTUyNjEzMDYyNjEz NTYyOTEzYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDgtMDkgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXSzJdIFJlbW92 ZSBjb250ZXh0IG1lbnUgcHJldmlld3Mgb24gbmF2aWdhdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNTg4CisgICAgICAgIHJkYXI6Ly9wcm9i bGVtLzU0MDYxNzk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTWFrZSBzdXJlIHRoZSBjb250ZXh0IG1lbnUgcHJldmlldyBkb2Vzbid0IGxpbmdlciBh Y3Jvc3MgbmF2aWdhdGlvbnMgYnkgaG9zdGluZyBpdCBpbiBpdHMKKyAgICAgICAgb3duIGNvbnRh aW5lciB2aWV3IChzaGFyZWQgd2l0aCBkcmFnIHByZXZpZXdzKSwgYW5kIGhpZGluZyB0aGF0IHZp ZXcgb24gbmF2aWdhdGlvbiAodW5wYXJlbnRpbmcKKyAgICAgICAgbWF5IGhhdmUgYmFkIGNvbnNl cXVlbmNlcykuIFdlIHJlbW92ZSB0aGUgdmlldyB3aGVuIHRoZSBhbmltYXRpb24gZW5kcy4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWVdKToKKyAgICAgICAg KC1bV0tDb250ZW50VmlldyBjb250YWluZXJWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3c10pOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IF9oaWRlQ29udGV4dE1lbnVdKToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBjb250ZXh0TWVudUludGVyYWN0aW9uOndpbGxFbmRGb3JDb25maWd1cmF0aW9u OmFuaW1hdG9yOl0pOgorCiAyMDE5LTA4LTA5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGlzYWJsZSBDU1NPTSBWaWV3IFNjcm9sbGluZyBB UEkgZm9yIElNRGIgaU9TIGFwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4IGRjMGEzYTlkNGVkZjU0MGQ2N2Ji ZjliZDg1YTBjYmRjYjUxY2U4ZWUuLjc1ZjcxNjYwZTQxMGM2YTQ5ZTQxMjAzZTRlYjhhZDcwMWY0 MzY0NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTIzOSw2ICsyMzksNyBAQCBzdHJ1Y3QgV0tBdXRvQ29y cmVjdGlvbkRhdGEgewogICAgIFJldGFpblB0cjxVSVdlYkZvcm1BY2Nlc3Nvcnk+IF9mb3JtQWNj ZXNzb3J5VmlldzsKICAgICBSZXRhaW5QdHI8X1VJSGlnaGxpZ2h0Vmlldz4gX2hpZ2hsaWdodFZp ZXc7CiAgICAgUmV0YWluUHRyPFVJVmlldz4gX2ludGVyYWN0aW9uVmlld3NDb250YWluZXJWaWV3 OworICAgIFJldGFpblB0cjxVSVZpZXc+IF9jb250ZXh0TWVudUNvbnRhaW5lclZpZXc7CiAgICAg UmV0YWluUHRyPE5TU3RyaW5nPiBfbWFya2VkVGV4dDsKICAgICBSZXRhaW5QdHI8V0tBY3Rpb25T aGVldEFzc2lzdGFudD4gX2FjdGlvblNoZWV0QXNzaXN0YW50OwogI2lmIEVOQUJMRShBSVJQTEFZ X1BJQ0tFUikKQEAgLTQ1OCw2ICs0NTksNyBAQCBGT1JfRUFDSF9QUklWQVRFX1dLQ09OVEVOVFZJ RVdfQUNUSU9OKERFQ0xBUkVfV0tDT05URU5UVklFV19BQ1RJT05fRk9SX1dFQl9WSUVXKQogLSAo dm9pZClfaGFuZGxlU21hcnRNYWduaWZpY2F0aW9uSW5mb3JtYXRpb25Gb3JQb3RlbnRpYWxUYXA6 KHVpbnQ2NF90KXJlcXVlc3RJRCByZW5kZXJSZWN0Oihjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3Qm KXJlbmRlclJlY3QgZml0RW50aXJlUmVjdDooQk9PTClmaXRFbnRpcmVSZWN0IHZpZXdwb3J0TWlu aW11bVNjYWxlOihkb3VibGUpdmlld3BvcnRNaW5pbXVtU2NhbGUgdmlld3BvcnRNYXhpbXVtU2Nh bGU6KGRvdWJsZSl2aWV3cG9ydE1heGltdW1TY2FsZTsKIC0gKHZvaWQpX2VsZW1lbnREaWRGb2N1 czooY29uc3QgV2ViS2l0OjpGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uJilpbmZvcm1hdGlvbiB1 c2VySXNJbnRlcmFjdGluZzooQk9PTCl1c2VySXNJbnRlcmFjdGluZyBibHVyUHJldmlvdXNOb2Rl OihCT09MKWJsdXJQcmV2aW91c05vZGUgYWN0aXZpdHlTdGF0ZUNoYW5nZXM6KE9wdGlvblNldDxX ZWJDb3JlOjpBY3Rpdml0eVN0YXRlOjpGbGFnPilhY3Rpdml0eVN0YXRlQ2hhbmdlcyB1c2VyT2Jq ZWN0OihOU09iamVjdCA8TlNTZWN1cmVDb2Rpbmc+ICopdXNlck9iamVjdDsKIC0gKHZvaWQpX2Vs ZW1lbnREaWRCbHVyOworLSAodm9pZClfaGlkZUNvbnRleHRNZW51OwogLSAodm9pZClfZGlkVXBk YXRlSW5wdXRNb2RlOihXZWJDb3JlOjpJbnB1dE1vZGUpbW9kZTsKIC0gKHZvaWQpX2RpZFJlY2Vp dmVFZGl0b3JTdGF0ZVVwZGF0ZUFmdGVyRm9jdXM7CiAtICh2b2lkKV9oYXJkd2FyZUtleWJvYXJk QXZhaWxhYmlsaXR5Q2hhbmdlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGE3MDkyYmMwYWYwZGIzZmUx ZmM4YmU1OTNkMzQ3N2EyMWNiMDJjMzYuLjhlNDMzNDMwMmVlZjFkNjI0MjljZmE4Nzc1YzE2MjU2 ODZmZmU5MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtMzk1MSw2ICszOTUxLDcgQEAgLSAodm9pZClf ZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZQogI2VuZGlmCiAgICAgW3NlbGYgX2VsZW1lbnREaWRC bHVyXTsKICAgICBbc2VsZiBfY2FuY2VsTG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXJdOworICAg IFtzZWxmIF9oaWRlQ29udGV4dE1lbnVdOwogICAgIFtfd2ViVmlldyBfZGlkQ29tbWl0TG9hZEZv ck1haW5GcmFtZV07CiB9CiAKQEAgLTYzOTMsNyArNjM5NCwyMyBAQCAtIChCT09MKV9zaG91bGRB dm9pZFNjcm9sbGluZ1doZW5Gb2N1c2VkQ29udGVudElzVmlzaWJsZQogCiAtIChVSVZpZXcgKilj b250YWluZXJWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3cwogewotICAgIHJldHVybiBzZWxmLnVuc2Nh bGVkVmlldyA/OiBzZWxmOworICAgIGlmIChfY29udGV4dE1lbnVDb250YWluZXJWaWV3KSB7Cisg ICAgICAgIEFTU0VSVChbX2NvbnRleHRNZW51Q29udGFpbmVyVmlldyBzdXBlcnZpZXddKTsKKyAg ICAgICAgW19jb250ZXh0TWVudUNvbnRhaW5lclZpZXcgc2V0SGlkZGVuOk5PXTsKKyAgICAgICAg cmV0dXJuIF9jb250ZXh0TWVudUNvbnRhaW5lclZpZXcuZ2V0KCk7CisgICAgfQorCisgICAgX2Nv bnRleHRNZW51Q29udGFpbmVyVmlldyA9IGFkb3B0TlMoW1tVSVZpZXcgYWxsb2NdIGluaXRdKTsK KyAgICBbX2NvbnRleHRNZW51Q29udGFpbmVyVmlldyBsYXllcl0uYW5jaG9yUG9pbnQgPSBDR1Bv aW50WmVybzsKKyAgICBbX2NvbnRleHRNZW51Q29udGFpbmVyVmlldyBsYXllcl0ubmFtZSA9IEAi Q29udGV4dCBNZW51IENvbnRhaW5lciI7CisgICAgW19pbnRlcmFjdGlvblZpZXdzQ29udGFpbmVy VmlldyBhZGRTdWJ2aWV3Ol9jb250ZXh0TWVudUNvbnRhaW5lclZpZXcuZ2V0KCldOworCisgICAg cmV0dXJuIF9jb250ZXh0TWVudUNvbnRhaW5lclZpZXcuZ2V0KCk7Cit9CisKKy0gKHZvaWQpX2hp ZGVDb250ZXh0TWVudQoreworICAgIFtfY29udGV4dE1lbnVDb250YWluZXJWaWV3IHNldEhpZGRl bjpZRVNdOwogfQogCiAjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKQEAgLTgzNjAsNiArODM3Nywx MSBAQCAtICh2b2lkKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFj dGlvbiAqKWludGVyYWN0aW9uIHdpbGxFbmRGbwogICAgIF9jb250ZXh0TWVudUxlZ2FjeU1lbnUg PSBudWxscHRyOwogICAgIF9jb250ZXh0TWVudUhhc1JlcXVlc3RlZExlZ2FjeURhdGEgPSBOTzsK ICAgICBfY29udGV4dE1lbnVFbGVtZW50SW5mbyA9IG51bGxwdHI7CisKKyAgICBbYW5pbWF0b3Ig YWRkQ29tcGxldGlvbjpbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxXS0NvbnRlbnRWaWV3PihzZWxm KV0gKCkgeworICAgICAgICBpZiAoYXV0byBzdHJvbmdTZWxmID0gd2Vha1NlbGYuZ2V0KCkpCisg ICAgICAgICAgICBbc3RkOjpleGNoYW5nZShzdHJvbmdTZWxmLT5fY29udGV4dE1lbnVDb250YWlu ZXJWaWV3LCBuaWwpIHJlbW92ZUZyb21TdXBlcnZpZXddOworICAgIH1dOwogfQogCiAjZW5kaWYg Ly8gVVNFKFVJQ09OVEVYVE1FTlUpCg== 375956 2019-08-09 14:19:51 -0700 2019-08-09 15:01:46 -0700 Patch bug-200588-20190809141950.patch text/plain 5011 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiN2U2ODQxMGY3YWE5MzAw NmM4OTVjYTA4N2M2NDRhNzE0MjE1YTguLmJhNTVhNTVhMDJhNDI4MTg2ZDU2ZGY0NGYxY2YwNTE4 MWM2NWNmNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDgtMDkgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXSzJdIFJlbW92 ZSBjb250ZXh0IG1lbnUgaGludHMgb24gbmF2aWdhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNTg4CisgICAgICAgIHJkYXI6Ly9wcm9ibGVt LzU0MDYxNzk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBN YWtlIHN1cmUgdGhlIGNvbnRleHQgbWVudSBoaW50IGRvZXNuJ3QgbGluZ2VyIGFjcm9zcyBuYXZp Z2F0aW9ucyBieSBob3N0aW5nIGl0IGluIGl0cworICAgICAgICBvd24gY29udGFpbmVyIHZpZXcg KHNoYXJlZCB3aXRoIGRyYWcgcHJldmlld3MpLCBhbmQgaGlkaW5nIHRoYXQgdmlldyBvbiBuYXZp Z2F0aW9uICh1bnBhcmVudGluZworICAgICAgICBtYXkgaGF2ZSBiYWQgY29uc2VxdWVuY2VzKS4g V2UgcmVtb3ZlIHRoZSB2aWV3IHdoZW4gdGhlIGFuaW1hdGlvbiBlbmRzLgorCisgICAgICAgICog VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZV0pOgorICAgICAgICAoLVtXS0NvbnRl bnRWaWV3IGNvbnRhaW5lclZpZXdGb3JUYXJnZXRlZFByZXZpZXdzXSk6CisgICAgICAgICgtW1dL Q29udGVudFZpZXcgX2hpZGVDb250ZXh0TWVudV0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3 IGNvbnRleHRNZW51SW50ZXJhY3Rpb246d2lsbEVuZEZvckNvbmZpZ3VyYXRpb246YW5pbWF0b3I6 XSk6CisKIDIwMTktMDgtMDkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBEaXNhYmxlIENTU09NIFZpZXcgU2Nyb2xsaW5nIEFQSSBmb3IgSU1E YiBpT1MgYXBwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggZGMwYTNhOWQ0ZWRmNTQwZDY3YmJmOWJkODVhMGNi ZGNiNTFjZThlZS4uMTI3ZTM1MmRmZWE2OTA4OWU1NDU5M2U0YWI2NWE0ZjA1N2I4OTIzMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24uaApAQCAtMjM5LDYgKzIzOSw3IEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0 YSB7CiAgICAgUmV0YWluUHRyPFVJV2ViRm9ybUFjY2Vzc29yeT4gX2Zvcm1BY2Nlc3NvcnlWaWV3 OwogICAgIFJldGFpblB0cjxfVUlIaWdobGlnaHRWaWV3PiBfaGlnaGxpZ2h0VmlldzsKICAgICBS ZXRhaW5QdHI8VUlWaWV3PiBfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5lclZpZXc7CisgICAgUmV0 YWluUHRyPFVJVmlldz4gX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXc7CiAgICAgUmV0YWlu UHRyPE5TU3RyaW5nPiBfbWFya2VkVGV4dDsKICAgICBSZXRhaW5QdHI8V0tBY3Rpb25TaGVldEFz c2lzdGFudD4gX2FjdGlvblNoZWV0QXNzaXN0YW50OwogI2lmIEVOQUJMRShBSVJQTEFZX1BJQ0tF UikKQEAgLTQ1OCw2ICs0NTksNyBAQCBGT1JfRUFDSF9QUklWQVRFX1dLQ09OVEVOVFZJRVdfQUNU SU9OKERFQ0xBUkVfV0tDT05URU5UVklFV19BQ1RJT05fRk9SX1dFQl9WSUVXKQogLSAodm9pZClf aGFuZGxlU21hcnRNYWduaWZpY2F0aW9uSW5mb3JtYXRpb25Gb3JQb3RlbnRpYWxUYXA6KHVpbnQ2 NF90KXJlcXVlc3RJRCByZW5kZXJSZWN0Oihjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKXJlbmRl clJlY3QgZml0RW50aXJlUmVjdDooQk9PTClmaXRFbnRpcmVSZWN0IHZpZXdwb3J0TWluaW11bVNj YWxlOihkb3VibGUpdmlld3BvcnRNaW5pbXVtU2NhbGUgdmlld3BvcnRNYXhpbXVtU2NhbGU6KGRv dWJsZSl2aWV3cG9ydE1heGltdW1TY2FsZTsKIC0gKHZvaWQpX2VsZW1lbnREaWRGb2N1czooY29u c3QgV2ViS2l0OjpGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uJilpbmZvcm1hdGlvbiB1c2VySXNJ bnRlcmFjdGluZzooQk9PTCl1c2VySXNJbnRlcmFjdGluZyBibHVyUHJldmlvdXNOb2RlOihCT09M KWJsdXJQcmV2aW91c05vZGUgYWN0aXZpdHlTdGF0ZUNoYW5nZXM6KE9wdGlvblNldDxXZWJDb3Jl OjpBY3Rpdml0eVN0YXRlOjpGbGFnPilhY3Rpdml0eVN0YXRlQ2hhbmdlcyB1c2VyT2JqZWN0OihO U09iamVjdCA8TlNTZWN1cmVDb2Rpbmc+ICopdXNlck9iamVjdDsKIC0gKHZvaWQpX2VsZW1lbnRE aWRCbHVyOworLSAodm9pZClfaGlkZUNvbnRleHRNZW51SGludENvbnRhaW5lcjsKIC0gKHZvaWQp X2RpZFVwZGF0ZUlucHV0TW9kZTooV2ViQ29yZTo6SW5wdXRNb2RlKW1vZGU7CiAtICh2b2lkKV9k aWRSZWNlaXZlRWRpdG9yU3RhdGVVcGRhdGVBZnRlckZvY3VzOwogLSAodm9pZClfaGFyZHdhcmVL ZXlib2FyZEF2YWlsYWJpbGl0eUNoYW5nZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBhNzA5MmJjMGFm MGRiM2ZlMWZjOGJlNTkzZDM0NzdhMjFjYjAyYzM2Li4wMTQwYWE4MGQwYmVlZjYzNGI3MWIyODFl MDJlMzdhMDZlNGIxNDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTM5NTEsNiArMzk1MSw3IEBAIC0g KHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUKICNlbmRpZgogICAgIFtzZWxmIF9lbGVt ZW50RGlkQmx1cl07CiAgICAgW3NlbGYgX2NhbmNlbExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVy XTsKKyAgICBbc2VsZiBfaGlkZUNvbnRleHRNZW51SGludENvbnRhaW5lcl07CiAgICAgW193ZWJW aWV3IF9kaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lXTsKIH0KIApAQCAtNjM5MSw5ICs2MzkyLDI2 IEBAIC0gKEJPT0wpX3Nob3VsZEF2b2lkU2Nyb2xsaW5nV2hlbkZvY3VzZWRDb250ZW50SXNWaXNp YmxlCiAgICAgcmV0dXJuIF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnNob3VsZEF2b2lkU2Ny b2xsaW5nV2hlbkZvY3VzZWRDb250ZW50SXNWaXNpYmxlOwogfQogCisvLyBGSVhNRTogVGhpcyBp cyB1c2VkIGZvciBkcmFnIHByZXZpZXdzIGFuZCBjb250ZXh0IG1lbnUgaGludHM7IGl0IG5lZWRz IGEgYmV0dGVyIG5hbWUuCiAtIChVSVZpZXcgKiljb250YWluZXJWaWV3Rm9yVGFyZ2V0ZWRQcmV2 aWV3cwogewotICAgIHJldHVybiBzZWxmLnVuc2NhbGVkVmlldyA/OiBzZWxmOworICAgIGlmIChf Y29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldykgeworICAgICAgICBBU1NFUlQoW19jb250ZXh0 TWVudUhpbnRDb250YWluZXJWaWV3IHN1cGVydmlld10pOworICAgICAgICBbX2NvbnRleHRNZW51 SGludENvbnRhaW5lclZpZXcgc2V0SGlkZGVuOk5PXTsKKyAgICAgICAgcmV0dXJuIF9jb250ZXh0 TWVudUhpbnRDb250YWluZXJWaWV3LmdldCgpOworICAgIH0KKworICAgIF9jb250ZXh0TWVudUhp bnRDb250YWluZXJWaWV3ID0gYWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOworICAgIFtf Y29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldyBsYXllcl0uYW5jaG9yUG9pbnQgPSBDR1BvaW50 WmVybzsKKyAgICBbX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXcgbGF5ZXJdLm5hbWUgPSBA IkNvbnRleHQgTWVudSBDb250YWluZXIiOworICAgIFtfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5l clZpZXcgYWRkU3VidmlldzpfY29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldy5nZXQoKV07CisK KyAgICByZXR1cm4gX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXcuZ2V0KCk7Cit9CisKKy0g KHZvaWQpX2hpZGVDb250ZXh0TWVudUhpbnRDb250YWluZXIKK3sKKyAgICBbX2NvbnRleHRNZW51 SGludENvbnRhaW5lclZpZXcgc2V0SGlkZGVuOllFU107CiB9CiAKICNpZiBFTkFCTEUoRFJBR19T VVBQT1JUKQpAQCAtODM2MCw2ICs4Mzc4LDExIEBAIC0gKHZvaWQpY29udGV4dE1lbnVJbnRlcmFj dGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gd2lsbEVuZEZvCiAg ICAgX2NvbnRleHRNZW51TGVnYWN5TWVudSA9IG51bGxwdHI7CiAgICAgX2NvbnRleHRNZW51SGFz UmVxdWVzdGVkTGVnYWN5RGF0YSA9IE5POwogICAgIF9jb250ZXh0TWVudUVsZW1lbnRJbmZvID0g bnVsbHB0cjsKKworICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOlt3ZWFrU2VsZiA9IFdlYWtP YmpDUHRyPFdLQ29udGVudFZpZXc+KHNlbGYpXSAoKSB7CisgICAgICAgIGlmIChhdXRvIHN0cm9u Z1NlbGYgPSB3ZWFrU2VsZi5nZXQoKSkKKyAgICAgICAgICAgIFtzdGQ6OmV4Y2hhbmdlKHN0cm9u Z1NlbGYtPl9jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3LCBuaWwpIHJlbW92ZUZyb21TdXBl cnZpZXddOworICAgIH1dOwogfQogCiAjZW5kaWYgLy8gVVNFKFVJQ09OVEVYVE1FTlUpCg==