210230 2020-04-08 17:32:02 -0700 Popovers are dismissed immediately when they try and bring up the keyboard. 2020-04-09 16:58:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner darin thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1639388 0 megan_gardner 2020-04-08 17:32:02 -0700 Correctly retain focus when popovers employ keyboard 1639389 1 395890 megan_gardner 2020-04-08 17:36:58 -0700 Created attachment 395890 Patch 1639390 2 megan_gardner 2020-04-08 17:37:20 -0700 <rdar://problem/60385504> 1639799 3 395890 darin 2020-04-09 12:56:51 -0700 Comment on attachment 395890 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395890&action=review Any way to make a test for this? > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:6669 > +- (void)preserveFocus > +{ > + [_webView _incrementFocusPreservationCount]; > +} > + > +- (void)releaseFocus > +{ > + [_webView _decrementFocusPreservationCount]; > +} Is there any risk that a WKContentView could be deallocated before releaseFocus is called, or have _webView set to null or any new value before this is called? Often, designs like this one can be dangerous if a stale count can be left behind. There are techniques to make them more resilient, like using objects and weak pointers, that are most costly but more foolproof. > Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm:341 > + if (_view.focusedElementInformation.elementType == InputType::Time || _view.focusedElementInformation.elementType == InputType::DateTimeLocal) > + [_view releaseFocus]; Maybe we could use a boolean _preservingFocus rather than repeating this check here. That way there’s no risk of the check in controlBeginEditing being out of sync with this one. 1639950 4 396022 megan_gardner 2020-04-09 16:17:45 -0700 Created attachment 396022 Patch for landing 1639957 5 396022 darin 2020-04-09 16:34:23 -0700 Comment on attachment 396022 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=396022&action=review > Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm:393 > + _preservingFocus = YES; > + [_view preserveFocus]; Could harden this slightly by wrapping this in: if (!_preservingFocus) { } 1639966 6 ews-feeder 2020-04-09 16:58:55 -0700 Committed r259840: <https://trac.webkit.org/changeset/259840> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396022. 395890 2020-04-08 17:36:58 -0700 2020-04-09 16:17:43 -0700 Patch bug-210230-20200408173657.patch text/plain 5058 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ5ZjFhZWFiOWQxMTg3YmRk NGExOGVhNWU5OTgzMjEwMjRiN2FiNTcuLjYzNDNlODBhN2M1NDY0MjYwMjI5MGI3ZDQyZTFhNjdl MWM2YmUwYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMDQtMDggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBDb3JyZWN0bHkgcmV0 YWluIGZvY3VzIHdoZW4gcG9wb3ZlcnMgZW1wbG95IGtleWJvYXJkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyMzAKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzYwMzg1NTA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdoZW4gcG9wb3ZlcnMgdXNlIGtleWJvYXJkcyB3ZSBkaXNtaXNzIHRoZW0gYmVj YXVzZSB0aGUKKyAgICAgICAgd2ViIHZpZXcgbG9zZXMgZmlyc3RSZXNwb25kZXIuIFdlIGFscmVh ZHkgaGF2ZSB3YXlzIG9mIAorICAgICAgICByZXRhaW5pbmcgZm9jdXMgd2hlbiB3ZSBsb3NlIGZp cnN0IHJlc3BvbmRlLCBzbyBleHRlbmQgdGhhdAorICAgICAgICBjb2RlIHRvIGNvdmVyIHRoZSBj YXNlIHdoZXJlIGEga2V5Ym9hcmQgY29tZXMgdXAgaW4gYSBwb3BvdmVyLgorCisgICAgICAgIFdl IGFyZSBhbHNvIGNhbGxsaW5nIGNvbnRyb2xCZWdpbkVkaXRpbmcgdHdpY2Ugb24gcmVmb2N1c2lu ZyBhCisgICAgICAgIHBvcG92ZXIgZHVlIHRvIGJlaGF2aW91ciB3aXRoIHRvdWNoIGFuZCBzeW50 aGV0aWNDbGljaywgc28gCisgICAgICAgIGtlZXAgdXAgZnJvbSBwcmVzZW50aW5nIHRoZSBwb3Bv dmVyIHR3aWNlLCBhbmQgYWxsb3cgZm9yIHRoZSBmb2N1cworICAgICAgICBjb3VudCB0byBiZSBj b3JyZWNsdHkgaW5jcmVtZW50ZWQgYW5kIGRlY3JlbWVudGVkLgorCisgICAgICAgICogVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBwcmVzZXJ2ZUZvY3VzXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgcmVsZWFzZUZvY3Vz XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1JbnB1dENvbnRyb2wubW06 CisgICAgICAgICgtW1dLRGF0ZVRpbWVQb3BvdmVyIHBvcG92ZXJXYXNEaXNtaXNzZWQ6XSk6Cisg ICAgICAgICgtW1dLRGF0ZVRpbWVQb3BvdmVyIGNvbnRyb2xCZWdpbkVkaXRpbmddKToKKyAgICAg ICAgKC1bV0tEYXRlVGltZVBvcG92ZXIgY29udHJvbEVuZEVkaXRpbmddKToKKwogMjAyMC0wNC0w OCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXR1cm4gYXBwLWJvdW5kIHNlc3Npb25zIGZvciBpbnN0YW5jZXMgd2hlcmUgV0tBcHBCb3VuZERv bWFpbnMgaXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCAwNzBmOTllYjE3YmNhMWNlOGIzMjhkNjNjNzY5ZmU0 ZjM1N2QyMzJjLi4zZTg0YThhMWI1ZGExZjU5MTFlYzJjY2UzNWI3NzVlNGEyOGRiMGE1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5oCkBAIC01MzAsNiArNTMwLDkgQEAgRk9SX0VBQ0hfUFJJVkFURV9XS0NPTlRFTlRW SUVXX0FDVElPTihERUNMQVJFX1dLQ09OVEVOVFZJRVdfQUNUSU9OX0ZPUl9XRUJfVklFVykKIC0g KEJPT0wpaGFzSGlkZGVuQ29udGVudEVkaXRhYmxlOwogLSAodm9pZClnZW5lcmF0ZVN5bnRoZXRp Y0VkaXRpbmdDb21tYW5kOihXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZSljb21t YW5kOwogCistICh2b2lkKXByZXNlcnZlRm9jdXM7CistICh2b2lkKXJlbGVhc2VGb2N1czsKKwog Ly8gVUlXZWJGb3JtQWNjZXNzb3J5RGVsZWdhdGUgcHJvdG9jb2wKIC0gKHZvaWQpYWNjZXNzb3J5 RG9uZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggNTI5YWM0MzQ2N2IxYjZlOGNmZmIxMTRlYzFhMDc4 ODUwMzcyNmFiMC4uYzdlZTM2OTE5NTZmMzAxNTc2NTBhZTk1NWM2ODRhZTBjNmE1MzRiNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tCkBAIC02NjU4LDYgKzY2NTgsMTYgQEAgLSAoQk9PTClfcmVzdG9yZUZvY3Vz V2l0aFRva2VuOihpZCA8TlNDb3B5aW5nLCBOU1NlY3VyZUNvZGluZz4pdG9rZW4KICAgICByZXR1 cm4gTk87CiB9CiAKKy0gKHZvaWQpcHJlc2VydmVGb2N1cworeworICAgIFtfd2ViVmlldyBfaW5j cmVtZW50Rm9jdXNQcmVzZXJ2YXRpb25Db3VudF07Cit9CisKKy0gKHZvaWQpcmVsZWFzZUZvY3Vz Cit7CisgICAgW193ZWJWaWV3IF9kZWNyZW1lbnRGb2N1c1ByZXNlcnZhdGlvbkNvdW50XTsKK30K KwogLSAodm9pZClfcHJlc2VydmVGb2N1c1dpdGhUb2tlbjooaWQgPE5TQ29weWluZywgTlNTZWN1 cmVDb2Rpbmc+KXRva2VuIGRlc3RydWN0aXZlbHk6KEJPT0wpZGVzdHJ1Y3RpdmVseQogewogICAg IGlmICghX2lucHV0UGVyaXBoZXJhbCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybUlucHV0Q29udHJvbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1JbnB1dENvbnRyb2wubW0KaW5kZXggN2Y0ZjkxMzY1MTc3 YmY0YTBjMzM2OWQ2OWMxMWVjNmEyZDY2OGNmOS4uYzNjOTJhOWUzNzZkYjIzMzExYjRiNDU0NGNj YmQxZTU0YzQ0YTZiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zv cm1zL1dLRm9ybUlucHV0Q29udHJvbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvZm9ybXMvV0tGb3JtSW5wdXRDb250cm9sLm1tCkBAIC01MCw2ICs1MCw3IEBAIEBlbmQKIEBp bnRlcmZhY2UgV0tEYXRlVGltZVBvcG92ZXIgOiBXS0Zvcm1Sb3RhdGluZ0FjY2Vzc29yeVBvcG92 ZXI8V0tGb3JtQ29udHJvbD4gewogICAgIFJldGFpblB0cjxXS0RhdGVUaW1lUG9wb3ZlclZpZXdD b250cm9sbGVyPiBfdmlld0NvbnRyb2xsZXI7CiAgICAgV0tDb250ZW50VmlldyAqX3ZpZXc7Cisg ICAgQk9PTCBfcHJlc2VudGluZzsKIH0KIC0gKGlkKWluaXRXaXRoVmlldzooV0tDb250ZW50Vmll dyAqKXZpZXcgZGF0ZVBpY2tlck1vZGU6KFVJRGF0ZVBpY2tlck1vZGUpbW9kZTsKIC0gKFdLRGF0 ZVRpbWVQb3BvdmVyVmlld0NvbnRyb2xsZXIgKil2aWV3Q29udHJvbGxlcjsKQEAgLTMzMSw2ICsz MzIsMTYgQEAgLSAodm9pZCljbGVhcjooaWQpc2VuZGVyCiAgICAgW192aWV3IHBhZ2VdLT5zZXRG b2N1c2VkRWxlbWVudFZhbHVlKFN0cmluZygpKTsKIH0KIAorLSAodm9pZClwb3BvdmVyV2FzRGlz bWlzc2VkOihXS1JvdGF0aW5nUG9wb3ZlciAqKXBvcG92ZXIKK3sKKyAgICBbc3VwZXIgcG9wb3Zl cldhc0Rpc21pc3NlZDpwb3BvdmVyXTsKKyAgICAKKyAgICBpZiAocG9wb3ZlciA9PSBzZWxmKSB7 CisgICAgICAgIGlmIChfdmlldy5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBl ID09IElucHV0VHlwZTo6VGltZSB8fCBfdmlldy5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVs ZW1lbnRUeXBlID09IElucHV0VHlwZTo6RGF0ZVRpbWVMb2NhbCkKKyAgICAgICAgICAgIFtfdmll dyByZWxlYXNlRm9jdXNdOworICAgIH0KK30KKwogLSAoaWQpaW5pdFdpdGhWaWV3OihXS0NvbnRl bnRWaWV3ICopdmlldyBkYXRlUGlja2VyTW9kZTooVUlEYXRlUGlja2VyTW9kZSltb2RlCiB7CiAg ICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0V2l0aFZpZXc6dmlld10pKQpAQCAtMzY5LDEyICsz ODAsMTkgQEAgLSAoV0tEYXRlVGltZVBvcG92ZXJWaWV3Q29udHJvbGxlciAqKXZpZXdDb250cm9s bGVyCiAKIC0gKHZvaWQpY29udHJvbEJlZ2luRWRpdGluZwogewotICAgIFtzZWxmIHByZXNlbnRQ b3BvdmVyQW5pbWF0ZWQ6Tk9dOwotICAgIFtfdmlld0NvbnRyb2xsZXIuZ2V0KCkuaW5uZXJDb250 cm9sIGNvbnRyb2xCZWdpbkVkaXRpbmddOworICAgIGlmICghX3ByZXNlbnRpbmcpIHsKKyAgICAg ICAgX3ByZXNlbnRpbmcgPSBZRVM7CisgICAgICAgIFtzZWxmIHByZXNlbnRQb3BvdmVyQW5pbWF0 ZWQ6Tk9dOworICAgICAgICBbX3ZpZXdDb250cm9sbGVyLmdldCgpLmlubmVyQ29udHJvbCBjb250 cm9sQmVnaW5FZGl0aW5nXTsKKyAgICAgICAgCisgICAgICAgIGlmIChfdmlldy5mb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBlID09IElucHV0VHlwZTo6VGltZSB8fCBfdmlldy5m b2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBlID09IElucHV0VHlwZTo6RGF0ZVRp bWVMb2NhbCkKKyAgICAgICAgICAgIFtfdmlldyBwcmVzZXJ2ZUZvY3VzXTsKKyAgICB9CiB9CiAK IC0gKHZvaWQpY29udHJvbEVuZEVkaXRpbmcKIHsKKyAgICBfcHJlc2VudGluZyA9IE5POwogICAg IFtzZWxmIGRpc21pc3NQb3BvdmVyQW5pbWF0ZWQ6Tk9dOwogICAgIFtfdmlld0NvbnRyb2xsZXIu Z2V0KCkuaW5uZXJDb250cm9sIGNvbnRyb2xFbmRFZGl0aW5nXTsKIH0K 396022 2020-04-09 16:17:45 -0700 2020-04-09 16:58:56 -0700 Patch for landing bug-210230-20200409161744.patch text/plain 5084 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ5ZjFhZWFiOWQxMTg3YmRk NGExOGVhNWU5OTgzMjEwMjRiN2FiNTcuLmQ5OTNlYzkyN2IyMTRlZjg2NGExODg2MGU4MjlmMjI5 NmRlNTZjOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMDQtMDggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBQb3BvdmVycyBhcmUg ZGlzbWlzc2VkIGltbWVkaWF0ZWx5IHdoZW4gdGhleSB0cnkgYW5kIGJyaW5nIHVwIHRoZSBrZXli b2FyZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MDIzMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAzODU1MDQ+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgV2hlbiBwb3BvdmVycyB1c2Uga2V5Ym9hcmRz IHdlIGRpc21pc3MgdGhlbSBiZWNhdXNlIHRoZQorICAgICAgICB3ZWIgdmlldyBsb3NlcyBmaXJz dFJlc3BvbmRlci4gV2UgYWxyZWFkeSBoYXZlIHdheXMgb2YgCisgICAgICAgIHJldGFpbmluZyBm b2N1cyB3aGVuIHdlIGxvc2UgZmlyc3QgcmVzcG9uZGUsIHNvIGV4dGVuZCB0aGF0CisgICAgICAg IGNvZGUgdG8gY292ZXIgdGhlIGNhc2Ugd2hlcmUgYSBrZXlib2FyZCBjb21lcyB1cCBpbiBhIHBv cG92ZXIuCisKKyAgICAgICAgV2UgYXJlIGFsc28gY2FsbGxpbmcgY29udHJvbEJlZ2luRWRpdGlu ZyB0d2ljZSBvbiByZWZvY3VzaW5nIGEKKyAgICAgICAgcG9wb3ZlciBkdWUgdG8gYmVoYXZpb3Vy IHdpdGggdG91Y2ggYW5kIHN5bnRoZXRpY0NsaWNrLCBzbyAKKyAgICAgICAga2VlcCB1cCBmcm9t IHByZXNlbnRpbmcgdGhlIHBvcG92ZXIgdHdpY2UsIGFuZCBhbGxvdyBmb3IgdGhlIGZvY3VzCisg ICAgICAgIGNvdW50IHRvIGJlIGNvcnJlY2x0eSBpbmNyZW1lbnRlZCBhbmQgZGVjcmVtZW50ZWQu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IHByZXNlcnZlRm9jdXNdKToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyByZWxlYXNlRm9jdXNdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dL Rm9ybUlucHV0Q29udHJvbC5tbToKKyAgICAgICAgKC1bV0tEYXRlVGltZVBvcG92ZXIgcG9wb3Zl cldhc0Rpc21pc3NlZDpdKToKKyAgICAgICAgKC1bV0tEYXRlVGltZVBvcG92ZXIgY29udHJvbEJl Z2luRWRpdGluZ10pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUG9wb3ZlciBjb250cm9sRW5kRWRp dGluZ10pOgorCiAyMDIwLTA0LTA4ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw bGUuY29tPgogCiAgICAgICAgIFJldHVybiBhcHAtYm91bmQgc2Vzc2lvbnMgZm9yIGluc3RhbmNl cyB3aGVyZSBXS0FwcEJvdW5kRG9tYWlucyBpcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4IDA3MGY5OWViMTdi Y2ExY2U4YjMyOGQ2M2M3NjlmZTRmMzU3ZDIzMmMuLjNlODRhOGExYjVkYTFmNTkxMWVjMmNjZTM1 Yjc3NWU0YTI4ZGIwYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTUzMCw2ICs1MzAsOSBAQCBGT1JfRUFD SF9QUklWQVRFX1dLQ09OVEVOVFZJRVdfQUNUSU9OKERFQ0xBUkVfV0tDT05URU5UVklFV19BQ1RJ T05fRk9SX1dFQl9WSUVXKQogLSAoQk9PTCloYXNIaWRkZW5Db250ZW50RWRpdGFibGU7CiAtICh2 b2lkKWdlbmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQ6KFdlYktpdDo6U3ludGhldGljRWRp dGluZ0NvbW1hbmRUeXBlKWNvbW1hbmQ7CiAKKy0gKHZvaWQpcHJlc2VydmVGb2N1czsKKy0gKHZv aWQpcmVsZWFzZUZvY3VzOworCiAvLyBVSVdlYkZvcm1BY2Nlc3NvcnlEZWxlZ2F0ZSBwcm90b2Nv bAogLSAodm9pZClhY2Nlc3NvcnlEb25lOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCA1MjlhYzQzNDY3 YjFiNmU4Y2ZmYjExNGVjMWEwNzg4NTAzNzI2YWIwLi5jN2VlMzY5MTk1NmYzMDE1NzY1MGFlOTU1 YzY4NGFlMGM2YTUzNGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTY2NTgsNiArNjY1OCwxNiBAQCAt IChCT09MKV9yZXN0b3JlRm9jdXNXaXRoVG9rZW46KGlkIDxOU0NvcHlpbmcsIE5TU2VjdXJlQ29k aW5nPil0b2tlbgogICAgIHJldHVybiBOTzsKIH0KIAorLSAodm9pZClwcmVzZXJ2ZUZvY3VzCit7 CisgICAgW193ZWJWaWV3IF9pbmNyZW1lbnRGb2N1c1ByZXNlcnZhdGlvbkNvdW50XTsKK30KKwor LSAodm9pZClyZWxlYXNlRm9jdXMKK3sKKyAgICBbX3dlYlZpZXcgX2RlY3JlbWVudEZvY3VzUHJl c2VydmF0aW9uQ291bnRdOworfQorCiAtICh2b2lkKV9wcmVzZXJ2ZUZvY3VzV2l0aFRva2VuOihp ZCA8TlNDb3B5aW5nLCBOU1NlY3VyZUNvZGluZz4pdG9rZW4gZGVzdHJ1Y3RpdmVseTooQk9PTClk ZXN0cnVjdGl2ZWx5CiB7CiAgICAgaWYgKCFfaW5wdXRQZXJpcGhlcmFsKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtSW5wdXRDb250cm9sLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybUlucHV0Q29udHJvbC5t bQppbmRleCA3ZjRmOTEzNjUxNzdiZjRhMGMzMzY5ZDY5YzExZWM2YTJkNjY4Y2Y5Li40YjdkYjhk MmQ2NGNkZDFjMmQxMDkyOTJhYTBiMGMxYTUxMzMzNTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtSW5wdXRDb250cm9sLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1JbnB1dENvbnRyb2wubW0KQEAgLTUw LDYgKzUwLDggQEAgQGVuZAogQGludGVyZmFjZSBXS0RhdGVUaW1lUG9wb3ZlciA6IFdLRm9ybVJv dGF0aW5nQWNjZXNzb3J5UG9wb3ZlcjxXS0Zvcm1Db250cm9sPiB7CiAgICAgUmV0YWluUHRyPFdL RGF0ZVRpbWVQb3BvdmVyVmlld0NvbnRyb2xsZXI+IF92aWV3Q29udHJvbGxlcjsKICAgICBXS0Nv bnRlbnRWaWV3ICpfdmlldzsKKyAgICBCT09MIF9wcmVzZW50aW5nOworICAgIEJPT0wgX3ByZXNl cnZpbmdGb2N1czsKIH0KIC0gKGlkKWluaXRXaXRoVmlldzooV0tDb250ZW50VmlldyAqKXZpZXcg ZGF0ZVBpY2tlck1vZGU6KFVJRGF0ZVBpY2tlck1vZGUpbW9kZTsKIC0gKFdLRGF0ZVRpbWVQb3Bv dmVyVmlld0NvbnRyb2xsZXIgKil2aWV3Q29udHJvbGxlcjsKQEAgLTMzMSw2ICszMzMsMTggQEAg LSAodm9pZCljbGVhcjooaWQpc2VuZGVyCiAgICAgW192aWV3IHBhZ2VdLT5zZXRGb2N1c2VkRWxl bWVudFZhbHVlKFN0cmluZygpKTsKIH0KIAorLSAodm9pZClwb3BvdmVyV2FzRGlzbWlzc2VkOihX S1JvdGF0aW5nUG9wb3ZlciAqKXBvcG92ZXIKK3sKKyAgICBbc3VwZXIgcG9wb3Zlcldhc0Rpc21p c3NlZDpwb3BvdmVyXTsKKyAgICAKKyAgICBpZiAocG9wb3ZlciA9PSBzZWxmKSB7CisgICAgICAg IGlmIChfcHJlc2VydmluZ0ZvY3VzKSB7CisgICAgICAgICAgICBbX3ZpZXcgcmVsZWFzZUZvY3Vz XTsKKyAgICAgICAgICAgIF9wcmVzZXJ2aW5nRm9jdXMgPSBOTzsKKyAgICAgICAgfQorICAgIH0K K30KKwogLSAoaWQpaW5pdFdpdGhWaWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBkYXRlUGlja2Vy TW9kZTooVUlEYXRlUGlja2VyTW9kZSltb2RlCiB7CiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBp bml0V2l0aFZpZXc6dmlld10pKQpAQCAtMzY5LDEyICszODMsMjEgQEAgLSAoV0tEYXRlVGltZVBv cG92ZXJWaWV3Q29udHJvbGxlciAqKXZpZXdDb250cm9sbGVyCiAKIC0gKHZvaWQpY29udHJvbEJl Z2luRWRpdGluZwogewotICAgIFtzZWxmIHByZXNlbnRQb3BvdmVyQW5pbWF0ZWQ6Tk9dOwotICAg IFtfdmlld0NvbnRyb2xsZXIuZ2V0KCkuaW5uZXJDb250cm9sIGNvbnRyb2xCZWdpbkVkaXRpbmdd OworICAgIGlmICghX3ByZXNlbnRpbmcpIHsKKyAgICAgICAgX3ByZXNlbnRpbmcgPSBZRVM7Cisg ICAgICAgIFtzZWxmIHByZXNlbnRQb3BvdmVyQW5pbWF0ZWQ6Tk9dOworICAgICAgICBbX3ZpZXdD b250cm9sbGVyLmdldCgpLmlubmVyQ29udHJvbCBjb250cm9sQmVnaW5FZGl0aW5nXTsKKyAgICAg ICAgCisgICAgICAgIGlmIChfdmlldy5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRU eXBlID09IElucHV0VHlwZTo6VGltZSB8fCBfdmlldy5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9u LmVsZW1lbnRUeXBlID09IElucHV0VHlwZTo6RGF0ZVRpbWVMb2NhbCkgeworICAgICAgICAgICAg X3ByZXNlcnZpbmdGb2N1cyA9IFlFUzsKKyAgICAgICAgICAgIFtfdmlldyBwcmVzZXJ2ZUZvY3Vz XTsKKyAgICAgICAgfQorICAgIH0KIH0KIAogLSAodm9pZCljb250cm9sRW5kRWRpdGluZwogewor ICAgIF9wcmVzZW50aW5nID0gTk87CiAgICAgW3NlbGYgZGlzbWlzc1BvcG92ZXJBbmltYXRlZDpO T107CiAgICAgW192aWV3Q29udHJvbGxlci5nZXQoKS5pbm5lckNvbnRyb2wgY29udHJvbEVuZEVk aXRpbmddOwogfQo=