227817 2021-07-08 15:20:19 -0700 [watchOS] Tapping "Done" in Scribble when focusing an editable element should dismiss Quickboard 2021-07-08 17:04:58 -0700 1 1 1 Unclassified WebKit Forms WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh cdumez hi megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1775824 0 wenson_hsieh 2021-07-08 15:20:19 -0700 rdar://79931134 1775830 1 433171 wenson_hsieh 2021-07-08 15:34:08 -0700 Created attachment 433171 Patch 1775839 2 433171 wenson_hsieh 2021-07-08 15:57:23 -0700 Comment on attachment 433171 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433171&action=review Thanks for the review! > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:6911 > + [[controller transitionCoordinator] animateAlongsideTransition:nil completion:[dispatchDidDismiss = WTFMove(dispatchDidDismiss)] (id <UIViewControllerTransitionCoordinatorContext>) mutable { (Devin pointed out that this `mutable` is unnecessary). 1775843 3 433177 wenson_hsieh 2021-07-08 16:01:59 -0700 Created attachment 433177 Patch 1775869 4 ews-feeder 2021-07-08 17:04:56 -0700 Committed r279764 (239534@main): <https://commits.webkit.org/239534@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433177. 433171 2021-07-08 15:34:08 -0700 2021-07-08 16:01:57 -0700 Patch bug-227817-20210708153407.patch text/plain 4409 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAyNzRlNGRmNmE2MmJjM2Y2 Zjk0MWVmNWQxMzI4Y2FlOGU5ODI4ZTAuLmIyODhkYmNlYjhkZmViZDM2ODJhMjI4NTZlNzdlMDQy MzA2ZDAzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDctMDggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW3dhdGNoT1NdIFRhcHBp bmcgIkRvbmUiIGluIFNjcmliYmxlIHdoZW4gZm9jdXNpbmcgYW4gZWRpdGFibGUgZWxlbWVudCBz aG91bGQgZGlzbWlzcyBRdWlja2JvYXJkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjc4MTcKKyAgICAgICAgcmRhcjovLzc5OTMxMTM0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWZ0ZXIgdXNpbmcgUFVJ Q1F1aWNrYm9hcmRNZXNzYWdlVmlld0NvbnRyb2xsZXIncyBQVUlDVGV4dElucHV0LWJhc2VkIG1v ZGUgZm9yIHByZXNlbnRpbmcgU2NyaWJibGUgVUksIHdlIGZhaWwKKyAgICAgICAgdG8gZGlzbWlz cyBQVUlDUXVpY2tib2FyZE1lc3NhZ2VWaWV3Q29udHJvbGxlciB1bmRlcm5lYXRoIGAtZGlzbWlz c0FsbElucHV0Vmlld0NvbnRyb2xsZXJzOmAsIHNpbmNlIFF1aWNrYm9hcmQKKyAgICAgICAgaXMg bm90IHRoZSB0b3AtbW9zdCB2aWV3IGNvbnRyb2xsZXIgKGluc3RlYWQsIGl0IGVuZHMgdXAgYmVp bmcgUFVJQ1F1aWNrYm9hcmRSZW1vdGVWaWV3Q29udHJvbGxlcikuIEFzIGEgcmVzdWx0LAorICAg ICAgICB0aGUgY2FsbCB0byBgLWRpc21pc3NWaWV3Q29udHJvbGxlckFuaW1hdGVkOmNvbXBsZXRp b246YCBvbiB0aGUgZnVsbHNjcmVlbiBpbnB1dCB2aWV3IGNvbnRyb2xsZXIgZW5kcyB1cCBiZWlu ZworICAgICAgICBkcm9wcGVkIG9uIHRoZSBmbG9vci4KKworICAgICAgICBQcmlvciB0byBhZG9w dGluZyBQVUlDUXVpY2tib2FyZE1lc3NhZ2VWaWV3Q29udHJvbGxlciBhbmQgcmVtb3RlIHRleHQg aW5wdXQgb24gd2F0Y2hPUywgdGhpcyB3b3JrZWQgYmVjYXVzZSB0aGUKKyAgICAgICAgZGVsZWdh dGUgbWV0aG9kIGAtcXVpY2tib2FyZDp0ZXh0RW50ZXJlZDpgIHdvdWxkIG9ubHkgYmUgaW52b2tl ZCBhZnRlciB0aGUgZnJvbnQtbW9zdCB2aWV3IGNvbnRyb2xsZXIgd2FzIGRvbmUKKyAgICAgICAg ZGlzbWlzc2luZywgc3VjaCB0aGF0IGNhbGxpbmcgYC1kaXNtaXNzVmlld0NvbnRyb2xsZXJBbmlt YXRlZDpjb21wbGV0aW9uOmAgb24gdGhlIGZ1bGxzY3JlZW4gaW5wdXQgdmlldworICAgICAgICBj b250cm9sbGVyIHdvdWxkIChjb3JyZWN0bHkpIGRpc21pc3MgaXQuCisKKyAgICAgICAgV2UgY2Fu IGFkZHJlc3MgdGhpcyBieSBjaGVja2luZyB3aGV0aGVyIHRoZSBmdWxsc2NyZWVuIGlucHV0IHZp ZXcgY29udHJvbGxlciBpdHNlbGYgaGFzIGEgcHJlc2VudGVkIHZpZXcKKyAgICAgICAgY29udHJv bGxlciBpbiBgLWRpc21pc3NBbGxJbnB1dFZpZXdDb250cm9sbGVyczpgLCBhbmQgZGlzbWlzc2lu ZyB0aGF0IGZpcnN0IGlmIG5lY2Vzc2FyeS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRpc21p c3NBbGxJbnB1dFZpZXdDb250cm9sbGVyczpdKToKKwogMjAyMS0wNy0wOCAgV2Vuc29uIEhzaWVo ICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbTGl2ZSBUZXh0XSBTZWxlY3Rp b24gaXMgbWlzYWxpZ25lZCBvbiBzb21lIGltYWdlcyBvbiB0d2l0dGVyLmNvbQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KaW5kZXggMzdlNmIzNzljYmYyYzdmZDRiOTJlOGFlYjI3NTQzNWYzNzQ4OGY0MC4uYzIyMWI1 MTM3OTkwYzgyZjA1ZTJkYmMyZjVlZDY2NTYwM2Y3ZjQ0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC02 ODk5LDE3ICs2ODk5LDI0IEBAIC0gKHZvaWQpZGlzbWlzc0FsbElucHV0Vmlld0NvbnRyb2xsZXJz OihCT09MKWFuaW1hdGVkCiAgICAgfQogCiAgICAgaWYgKGF1dG8gY29udHJvbGxlciA9IHN0ZDo6 ZXhjaGFuZ2UoX3ByZXNlbnRlZEZ1bGxTY3JlZW5JbnB1dFZpZXdDb250cm9sbGVyLCBuaWwpKSB7 Ci0gICAgICAgIGlmIChbbmF2aWdhdGlvbkNvbnRyb2xsZXIgdmlld0NvbnRyb2xsZXJzXS5sYXN0 T2JqZWN0ID09IGNvbnRyb2xsZXIuZ2V0KCkpCi0gICAgICAgICAgICBbbmF2aWdhdGlvbkNvbnRy b2xsZXIgcG9wVmlld0NvbnRyb2xsZXJBbmltYXRlZDphbmltYXRlZF07Ci0gICAgICAgIGVsc2UK LSAgICAgICAgICAgIFtjb250cm9sbGVyIGRpc21pc3NWaWV3Q29udHJvbGxlckFuaW1hdGVkOmFu aW1hdGVkIGNvbXBsZXRpb246bmlsXTsKLQotICAgICAgICBbW2NvbnRyb2xsZXIgdHJhbnNpdGlv bkNvb3JkaW5hdG9yXSBhbmltYXRlQWxvbmdzaWRlVHJhbnNpdGlvbjpuaWwgY29tcGxldGlvbjpb d2Vha1dlYlZpZXcgPSBXZWFrT2JqQ1B0cjxXS1dlYlZpZXc+KF93ZWJWaWV3KSwgY29udHJvbGxl cl0gKGlkIDxVSVZpZXdDb250cm9sbGVyVHJhbnNpdGlvbkNvb3JkaW5hdG9yQ29udGV4dD4pIHsK KyAgICAgICAgYXV0byBkaXNwYXRjaERpZERpc21pc3MgPSBtYWtlQmxvY2tQdHIoW3dlYWtXZWJW aWV3ID0gV2Vha09iakNQdHI8V0tXZWJWaWV3Pihfd2ViVmlldyksIGNvbnRyb2xsZXJdIHsKICAg ICAgICAgICAgIGF1dG8gc3Ryb25nV2ViVmlldyA9IHdlYWtXZWJWaWV3LmdldCgpOwogICAgICAg ICAgICAgaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+IHVpRGVsZWdhdGUgPSBzdGF0aWNfY2FzdDxp ZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4+KFtzdHJvbmdXZWJWaWV3IFVJRGVsZWdhdGVdKTsKICAg ICAgICAgICAgIGlmIChbdWlEZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93 ZWJWaWV3OmRpZERpc21pc3NGb2N1c2VkRWxlbWVudFZpZXdDb250cm9sbGVyOildKQogICAgICAg ICAgICAgICAgIFt1aURlbGVnYXRlIF93ZWJWaWV3OnN0cm9uZ1dlYlZpZXcuZ2V0KCkgZGlkRGlz bWlzc0ZvY3VzZWRFbGVtZW50Vmlld0NvbnRyb2xsZXI6Y29udHJvbGxlci5nZXQoKV07Ci0gICAg ICAgIH1dOworICAgICAgICB9KTsKKworICAgICAgICBpZiAoW25hdmlnYXRpb25Db250cm9sbGVy IHZpZXdDb250cm9sbGVyc10ubGFzdE9iamVjdCA9PSBjb250cm9sbGVyLmdldCgpKSB7CisgICAg ICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgcG9wVmlld0NvbnRyb2xsZXJBbmltYXRlZDph bmltYXRlZF07CisgICAgICAgICAgICBbW2NvbnRyb2xsZXIgdHJhbnNpdGlvbkNvb3JkaW5hdG9y XSBhbmltYXRlQWxvbmdzaWRlVHJhbnNpdGlvbjpuaWwgY29tcGxldGlvbjpbZGlzcGF0Y2hEaWRE aXNtaXNzID0gV1RGTW92ZShkaXNwYXRjaERpZERpc21pc3MpXSAoaWQgPFVJVmlld0NvbnRyb2xs ZXJUcmFuc2l0aW9uQ29vcmRpbmF0b3JDb250ZXh0PikgbXV0YWJsZSB7CisgICAgICAgICAgICAg ICAgZGlzcGF0Y2hEaWREaXNtaXNzKCk7CisgICAgICAgICAgICB9XTsKKyAgICAgICAgfSBlbHNl IGlmIChhdXRvIHByZXNlbnRlZFZpZXdDb250cm9sbGVyID0gcmV0YWluUHRyKFtjb250cm9sbGVy IHByZXNlbnRlZFZpZXdDb250cm9sbGVyXSkpIHsKKyAgICAgICAgICAgIFtwcmVzZW50ZWRWaWV3 Q29udHJvbGxlciBkaXNtaXNzVmlld0NvbnRyb2xsZXJBbmltYXRlZDphbmltYXRlZCBjb21wbGV0 aW9uOltjb250cm9sbGVyLCBhbmltYXRlZCwgZGlzcGF0Y2hEaWREaXNtaXNzID0gV1RGTW92ZShk aXNwYXRjaERpZERpc21pc3MpXSB7CisgICAgICAgICAgICAgICAgW2NvbnRyb2xsZXIgZGlzbWlz c1ZpZXdDb250cm9sbGVyQW5pbWF0ZWQ6YW5pbWF0ZWQgY29tcGxldGlvbjpkaXNwYXRjaERpZERp c21pc3MuZ2V0KCldOworICAgICAgICAgICAgfV07CisgICAgICAgIH0gZWxzZQorICAgICAgICAg ICAgW2NvbnRyb2xsZXIgZGlzbWlzc1ZpZXdDb250cm9sbGVyQW5pbWF0ZWQ6YW5pbWF0ZWQgY29t cGxldGlvbjpkaXNwYXRjaERpZERpc21pc3MuZ2V0KCldOwogICAgIH0KIAogI2lmIEhBVkUoUVVJ Q0tCT0FSRF9DT05UUk9MTEVSKQo= 433177 2021-07-08 16:01:59 -0700 2021-07-08 17:04:57 -0700 Patch bug-227817-20210708160158.patch text/plain 4414 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAyNzRlNGRmNmE2MmJjM2Y2 Zjk0MWVmNWQxMzI4Y2FlOGU5ODI4ZTAuLjNlYTkzOGRlNzk5ZjIyOGVhMjcwMmRlNmI1MmE4ZGZk NDc3NWMyMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDctMDggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW3dhdGNoT1NdIFRhcHBp bmcgIkRvbmUiIGluIFNjcmliYmxlIHdoZW4gZm9jdXNpbmcgYW4gZWRpdGFibGUgZWxlbWVudCBz aG91bGQgZGlzbWlzcyBRdWlja2JvYXJkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjc4MTcKKyAgICAgICAgcmRhcjovLzc5OTMxMTM0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbiBhbmQgRGV2aW4gUm91c3NvLgorCisgICAgICAgIEFm dGVyIHVzaW5nIFBVSUNRdWlja2JvYXJkTWVzc2FnZVZpZXdDb250cm9sbGVyJ3MgUFVJQ1RleHRJ bnB1dC1iYXNlZCBtb2RlIGZvciBwcmVzZW50aW5nIFNjcmliYmxlIFVJLCB3ZSBmYWlsCisgICAg ICAgIHRvIGRpc21pc3MgUFVJQ1F1aWNrYm9hcmRNZXNzYWdlVmlld0NvbnRyb2xsZXIgdW5kZXJu ZWF0aCBgLWRpc21pc3NBbGxJbnB1dFZpZXdDb250cm9sbGVyczpgLCBzaW5jZSBRdWlja2JvYXJk CisgICAgICAgIGlzIG5vdCB0aGUgdG9wLW1vc3QgdmlldyBjb250cm9sbGVyIChpbnN0ZWFkLCBp dCBlbmRzIHVwIGJlaW5nIFBVSUNRdWlja2JvYXJkUmVtb3RlVmlld0NvbnRyb2xsZXIpLiBBcyBh IHJlc3VsdCwKKyAgICAgICAgdGhlIGNhbGwgdG8gYC1kaXNtaXNzVmlld0NvbnRyb2xsZXJBbmlt YXRlZDpjb21wbGV0aW9uOmAgb24gdGhlIGZ1bGxzY3JlZW4gaW5wdXQgdmlldyBjb250cm9sbGVy IGVuZHMgdXAgYmVpbmcKKyAgICAgICAgZHJvcHBlZCBvbiB0aGUgZmxvb3IuCisKKyAgICAgICAg UHJpb3IgdG8gYWRvcHRpbmcgUFVJQ1F1aWNrYm9hcmRNZXNzYWdlVmlld0NvbnRyb2xsZXIgYW5k IHJlbW90ZSB0ZXh0IGlucHV0IG9uIHdhdGNoT1MsIHRoaXMgd29ya2VkIGJlY2F1c2UgdGhlCisg ICAgICAgIGRlbGVnYXRlIG1ldGhvZCBgLXF1aWNrYm9hcmQ6dGV4dEVudGVyZWQ6YCB3b3VsZCBv bmx5IGJlIGludm9rZWQgYWZ0ZXIgdGhlIGZyb250LW1vc3QgdmlldyBjb250cm9sbGVyIHdhcyBk b25lCisgICAgICAgIGRpc21pc3NpbmcsIHN1Y2ggdGhhdCBjYWxsaW5nIGAtZGlzbWlzc1ZpZXdD b250cm9sbGVyQW5pbWF0ZWQ6Y29tcGxldGlvbjpgIG9uIHRoZSBmdWxsc2NyZWVuIGlucHV0IHZp ZXcKKyAgICAgICAgY29udHJvbGxlciB3b3VsZCAoY29ycmVjdGx5KSBkaXNtaXNzIGl0LgorCisg ICAgICAgIFdlIGNhbiBhZGRyZXNzIHRoaXMgYnkgY2hlY2tpbmcgd2hldGhlciB0aGUgZnVsbHNj cmVlbiBpbnB1dCB2aWV3IGNvbnRyb2xsZXIgaXRzZWxmIGhhcyBhIHByZXNlbnRlZCB2aWV3Cisg ICAgICAgIGNvbnRyb2xsZXIgaW4gYC1kaXNtaXNzQWxsSW5wdXRWaWV3Q29udHJvbGxlcnM6YCwg YW5kIGRpc21pc3NpbmcgdGhhdCBmaXJzdCBpZiBuZWNlc3NhcnkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBkaXNtaXNzQWxsSW5wdXRWaWV3Q29udHJvbGxlcnM6XSk6CisKIDIwMjEtMDctMDgg IFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0xpdmUg VGV4dF0gU2VsZWN0aW9uIGlzIG1pc2FsaWduZWQgb24gc29tZSBpbWFnZXMgb24gdHdpdHRlci5j b20KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCmluZGV4IDM3ZTZiMzc5Y2JmMmM3ZmQ0YjkyZThhZWIyNzU0MzVmMzc0 ODhmNDAuLjY2OTUwNTIxNTBiMjY5NmY4NTZlMzVkNGY5YjVkM2JiNWRhZTMxZGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbQpAQCAtNjg5OSwxNyArNjg5OSwyNCBAQCAtICh2b2lkKWRpc21pc3NBbGxJbnB1dFZp ZXdDb250cm9sbGVyczooQk9PTClhbmltYXRlZAogICAgIH0KIAogICAgIGlmIChhdXRvIGNvbnRy b2xsZXIgPSBzdGQ6OmV4Y2hhbmdlKF9wcmVzZW50ZWRGdWxsU2NyZWVuSW5wdXRWaWV3Q29udHJv bGxlciwgbmlsKSkgewotICAgICAgICBpZiAoW25hdmlnYXRpb25Db250cm9sbGVyIHZpZXdDb250 cm9sbGVyc10ubGFzdE9iamVjdCA9PSBjb250cm9sbGVyLmdldCgpKQotICAgICAgICAgICAgW25h dmlnYXRpb25Db250cm9sbGVyIHBvcFZpZXdDb250cm9sbGVyQW5pbWF0ZWQ6YW5pbWF0ZWRdOwot ICAgICAgICBlbHNlCi0gICAgICAgICAgICBbY29udHJvbGxlciBkaXNtaXNzVmlld0NvbnRyb2xs ZXJBbmltYXRlZDphbmltYXRlZCBjb21wbGV0aW9uOm5pbF07Ci0KLSAgICAgICAgW1tjb250cm9s bGVyIHRyYW5zaXRpb25Db29yZGluYXRvcl0gYW5pbWF0ZUFsb25nc2lkZVRyYW5zaXRpb246bmls IGNvbXBsZXRpb246W3dlYWtXZWJWaWV3ID0gV2Vha09iakNQdHI8V0tXZWJWaWV3Pihfd2ViVmll dyksIGNvbnRyb2xsZXJdIChpZCA8VUlWaWV3Q29udHJvbGxlclRyYW5zaXRpb25Db29yZGluYXRv ckNvbnRleHQ+KSB7CisgICAgICAgIGF1dG8gZGlzcGF0Y2hEaWREaXNtaXNzID0gbWFrZUJsb2Nr UHRyKFt3ZWFrV2ViVmlldyA9IFdlYWtPYmpDUHRyPFdLV2ViVmlldz4oX3dlYlZpZXcpLCBjb250 cm9sbGVyXSB7CiAgICAgICAgICAgICBhdXRvIHN0cm9uZ1dlYlZpZXcgPSB3ZWFrV2ViVmlldy5n ZXQoKTsKICAgICAgICAgICAgIGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPiB1aURlbGVnYXRlID0g c3RhdGljX2Nhc3Q8aWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+Pihbc3Ryb25nV2ViVmlldyBVSURl bGVnYXRlXSk7CiAgICAgICAgICAgICBpZiAoW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3Rvcihfd2ViVmlldzpkaWREaXNtaXNzRm9jdXNlZEVsZW1lbnRWaWV3Q29udHJvbGxl cjopXSkKICAgICAgICAgICAgICAgICBbdWlEZWxlZ2F0ZSBfd2ViVmlldzpzdHJvbmdXZWJWaWV3 LmdldCgpIGRpZERpc21pc3NGb2N1c2VkRWxlbWVudFZpZXdDb250cm9sbGVyOmNvbnRyb2xsZXIu Z2V0KCldOwotICAgICAgICB9XTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgaWYgKFtuYXZpZ2F0 aW9uQ29udHJvbGxlciB2aWV3Q29udHJvbGxlcnNdLmxhc3RPYmplY3QgPT0gY29udHJvbGxlci5n ZXQoKSkgeworICAgICAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIHBvcFZpZXdDb250cm9s bGVyQW5pbWF0ZWQ6YW5pbWF0ZWRdOworICAgICAgICAgICAgW1tjb250cm9sbGVyIHRyYW5zaXRp b25Db29yZGluYXRvcl0gYW5pbWF0ZUFsb25nc2lkZVRyYW5zaXRpb246bmlsIGNvbXBsZXRpb246 W2Rpc3BhdGNoRGlkRGlzbWlzcyA9IFdURk1vdmUoZGlzcGF0Y2hEaWREaXNtaXNzKV0gKGlkIDxV SVZpZXdDb250cm9sbGVyVHJhbnNpdGlvbkNvb3JkaW5hdG9yQ29udGV4dD4pIHsKKyAgICAgICAg ICAgICAgICBkaXNwYXRjaERpZERpc21pc3MoKTsKKyAgICAgICAgICAgIH1dOworICAgICAgICB9 IGVsc2UgaWYgKGF1dG8gcHJlc2VudGVkVmlld0NvbnRyb2xsZXIgPSByZXRhaW5QdHIoW2NvbnRy b2xsZXIgcHJlc2VudGVkVmlld0NvbnRyb2xsZXJdKSkgeworICAgICAgICAgICAgW3ByZXNlbnRl ZFZpZXdDb250cm9sbGVyIGRpc21pc3NWaWV3Q29udHJvbGxlckFuaW1hdGVkOmFuaW1hdGVkIGNv bXBsZXRpb246W2NvbnRyb2xsZXIsIGFuaW1hdGVkLCBkaXNwYXRjaERpZERpc21pc3MgPSBXVEZN b3ZlKGRpc3BhdGNoRGlkRGlzbWlzcyldIHsKKyAgICAgICAgICAgICAgICBbY29udHJvbGxlciBk aXNtaXNzVmlld0NvbnRyb2xsZXJBbmltYXRlZDphbmltYXRlZCBjb21wbGV0aW9uOmRpc3BhdGNo RGlkRGlzbWlzcy5nZXQoKV07CisgICAgICAgICAgICB9XTsKKyAgICAgICAgfSBlbHNlCisgICAg ICAgICAgICBbY29udHJvbGxlciBkaXNtaXNzVmlld0NvbnRyb2xsZXJBbmltYXRlZDphbmltYXRl ZCBjb21wbGV0aW9uOmRpc3BhdGNoRGlkRGlzbWlzcy5nZXQoKV07CiAgICAgfQogCiAjaWYgSEFW RShRVUlDS0JPQVJEX0NPTlRST0xMRVIpCg==