210194 2020-04-08 09:59:07 -0700 [iOS] Date and time form controls are presented at the wrong size in some modes 2020-04-09 10:55:00 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner thorton wenson_hsieh oldest_to_newest 1639107 0 megan_gardner 2020-04-08 09:59:07 -0700 Update Sizes calculations for Date/Time form controls 1639115 1 395825 megan_gardner 2020-04-08 10:04:03 -0700 Created attachment 395825 Patch 1639131 2 395830 megan_gardner 2020-04-08 10:26:23 -0700 Created attachment 395830 Patch 1639132 3 megan_gardner 2020-04-08 10:27:22 -0700 <rdar://problem/60385475> 1639133 4 395831 megan_gardner 2020-04-08 10:27:54 -0700 Created attachment 395831 Patch 1639135 5 395831 wenson_hsieh 2020-04-08 10:32:30 -0700 Comment on attachment 395831 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395831&action=review > Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm:120 > + _datePicker = adoptNS([[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, 0, 0)]); Nit - this can just be adoptNS([[UIDatePicker alloc] init]); 1639136 6 395831 thorton 2020-04-08 10:35:10 -0700 Comment on attachment 395831 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395831&action=review > Source/WebKit/ChangeLog:3 > + Update Sizes calculations for Date/Time form controls This is not a great title because it doesn't describe the problem. The radar title is ... better, but not great. Something more descriptive of the problem (like "[iOS] Date and time form controls are presented at the wrong size in some modes") would be A++. > Source/WebKit/ChangeLog:10 > + Better calculations for sizes happen when we set the mode before calling > + sizeToFit. This is not a great description. I think the key is "defaultSizeForInterfaceOrientation is insufficient, we should let the UIDatePicker determine its own size given the configuration we're going to use" (but in different words) > Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm:120 > + _datePicker = adoptNS([[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, 0, 0)]); CGRectZero is fine > Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm:130 > + [_datePicker setFrame:CGRectMake(0, 0, size.width, size.height)]; isn't setFrameSize a thing? Or is that only on NSView? > Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm:346 > + [_viewController setPreferredContentSize:datePicker.frame.size]; Is this OK for all modes? 1639137 7 thorton 2020-04-08 10:35:36 -0700 (In reply to Tim Horton from comment #6) > Comment on attachment 395831 [details] > Patch > > > Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm:120 > > + _datePicker = adoptNS([[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, 0, 0)]); > > CGRectZero is fine Though wenson is also right. 1639146 8 395831 wenson_hsieh 2020-04-08 10:46:44 -0700 Comment on attachment 395831 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395831&action=review >> Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm:130 >> + [_datePicker setFrame:CGRectMake(0, 0, size.width, size.height)]; > > isn't setFrameSize a thing? Or is that only on NSView? AFAIK, this only exists as deprecated SPI on UIView (-setSize:). 1639196 9 395849 megan_gardner 2020-04-08 11:55:06 -0700 Created attachment 395849 Patch 1639719 10 ews-feeder 2020-04-09 10:54:59 -0700 Committed r259806: <https://trac.webkit.org/changeset/259806> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395849. 395825 2020-04-08 10:04:03 -0700 2020-04-08 10:26:22 -0700 Patch bug-210194-20200408100402.patch text/plain 4398 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZjZDQ0YzkyYjAzNzdkZGE5 MDhjMGE3MmMwOGNkNTc2MDgzYTJlNGUuLjVlMjAzYjJiMDdmMjBhZjdkZWE0NGVhOWY0ZGFlYWI5 NGJlMmRkOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDQtMDggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgU2l6ZXMg Y2FsY3VsYXRpb25zIGZvciBEYXRlL1RpbWUgZm9ybSBjb250cm9scworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMTk0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybUlucHV0Q29udHJvbC5tbToKKyAg ICAgICAgKC1bV0tEYXRlVGltZVBpY2tlciBpbml0V2l0aFZpZXc6ZGF0ZVBpY2tlck1vZGU6XSk6 CisgICAgICAgICgtW1dLRGF0ZVRpbWVQb3BvdmVyIGluaXRXaXRoVmlldzpkYXRlUGlja2VyTW9k ZTpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBvcG92ZXIu bW06CisgICAgICAgICgtW1dLU2VsZWN0UG9wb3ZlciBpbml0V2l0aFZpZXc6aGFzR3JvdXBzOl0p OgorCiAyMDIwLTA0LTA3ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbaU9TXSBBZGQgbWVzc2FnZSB0byBtZXNzYWdlIGZpbHRlciBpbiB0aGUgV2ViQ29u dGVudCBzYW5kYm94CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9y bXMvV0tGb3JtSW5wdXRDb250cm9sLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zv cm1zL1dLRm9ybUlucHV0Q29udHJvbC5tbQppbmRleCA3ZjRmOTEzNjUxNzdiZjRhMGMzMzY5ZDY5 YzExZWM2YTJkNjY4Y2Y5Li44ZGNhMzA1MmZjZTJjODYzZjRjZWY5YjM4NzQ3MDhjODhmNmU2YmNi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtSW5w dXRDb250cm9sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zv cm1JbnB1dENvbnRyb2wubW0KQEAgLTk5LDYgKzk5LDcgQEAgLSAoaWQpaW5pdFdpdGhWaWV3OihX S0NvbnRlbnRWaWV3ICopdmlldyBkYXRlUGlja2VyTW9kZTooVUlEYXRlUGlja2VyTW9kZSltb2Rl CiAgICAgX3ZpZXcgPSB2aWV3OwogICAgIF9zaG91bGRSZW1vdmVUaW1lWm9uZUluZm9ybWF0aW9u ID0gTk87CiAgICAgX2lzVGltZUlucHV0ID0gTk87CisgICAgCiAgICAgc3dpdGNoICh2aWV3LmZv Y3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGUpIHsKICAgICBjYXNlIElucHV0VHlw ZTo6RGF0ZToKICAgICAgICAgX2Zvcm1hdFN0cmluZyA9IGtEYXRlRm9ybWF0U3RyaW5nOwpAQCAt MTE1LDE2ICsxMTYsMTkgQEAgLSAoaWQpaW5pdFdpdGhWaWV3OihXS0NvbnRlbnRWaWV3ICopdmll dyBkYXRlUGlja2VyTW9kZTooVUlEYXRlUGlja2VyTW9kZSltb2RlCiAgICAgICAgIGJyZWFrOwog ICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwotICAgfQotCi0gICAgYXV0byBzaXplID0gY3Vy cmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkgPyBbVUlQaWNrZXJWaWV3IGRlZmF1bHRTaXpl Rm9yQ3VycmVudE9yaWVudGF0aW9uXSA6IFtVSUtleWJvYXJkIGRlZmF1bHRTaXplRm9ySW50ZXJm YWNlT3JpZW50YXRpb246dmlldy5pbnRlcmZhY2VPcmllbnRhdGlvbl07CisgICAgfQorICAgIAor ICAgIF9kYXRlUGlja2VyID0gYWRvcHROUyhbW1VJRGF0ZVBpY2tlciBhbGxvY10gaW5pdFdpdGhG cmFtZTpDR1JlY3RNYWtlKDAsIDAsIDAsIDApXSk7CiAKLSAgICBfZGF0ZVBpY2tlciA9IGFkb3B0 TlMoW1tVSURhdGVQaWNrZXIgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCBz aXplLndpZHRoLCBzaXplLmhlaWdodCldKTsKKyAgICBbX2RhdGVQaWNrZXIgc2V0RGF0ZVBpY2tl ck1vZGU6bW9kZV07CisgICAgW19kYXRlUGlja2VyIHNldEhpZGRlbjpOT107CisgICAgCiAjaWYg SEFWRShVSURBVEVQSUNLRVJfU1RZTEUpCiAgICAgW19kYXRlUGlja2VyIHNldFByZWZlcnJlZERh dGVQaWNrZXJTdHlsZTpbc2VsZiBkYXRlUGlja2VyU3R5bGVdXTsKICNlbmRpZgotICAgIF9kYXRl UGlja2VyLmdldCgpLmRhdGVQaWNrZXJNb2RlID0gbW9kZTsKLSAgICBfZGF0ZVBpY2tlci5nZXQo KS5oaWRkZW4gPSBOTzsKKyAgICAKKyAgICBhdXRvIHNpemUgPSBbX2RhdGVQaWNrZXIgc2l6ZVRo YXRGaXRzOkNHU2l6ZU1ha2Uodmlldy5mcmFtZS5zaXplLndpZHRoLCAwKV07CisgICAgW19kYXRl UGlja2VyIHNldEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgc2l6ZS53aWR0aCwgc2l6ZS5oZWlnaHQp XTsKICAgICAKICAgICBpZiAoW3NlbGYgc2hvdWxkUHJlc2VudEdyZWdvcmlhbkNhbGVuZGFyOnZp ZXcuZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbl0pCiAgICAgICAgIF9kYXRlUGlja2VyLmdldCgp LmNhbGVuZGFyID0gW05TQ2FsZW5kYXIgY2FsZW5kYXJXaXRoSWRlbnRpZmllcjpOU0NhbGVuZGFy SWRlbnRpZmllckdyZWdvcmlhbl07CkBAIC0zMzksOCArMzQzLDkgQEAgLSAoaWQpaW5pdFdpdGhW aWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBkYXRlUGlja2VyTW9kZTooVUlEYXRlUGlja2VyTW9k ZSltb2RlCiAgICAgX3ZpZXcgPSB2aWV3OwogICAgIF92aWV3Q29udHJvbGxlciA9IGFkb3B0TlMo W1tXS0RhdGVUaW1lUG9wb3ZlclZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFZpZXc6dmll dyBkYXRlUGlja2VyTW9kZTptb2RlXSk7CiAgICAgVUlEYXRlUGlja2VyICpkYXRlUGlja2VyID0g WyhXS0RhdGVUaW1lUGlja2VyICopX3ZpZXdDb250cm9sbGVyLmdldCgpLmlubmVyQ29udHJvbCBk YXRlUGlja2VyXTsKLSAgICBDR0Zsb2F0IHBvcG92ZXJXaWR0aCA9IFtkYXRlUGlja2VyIF9jb250 ZW50V2lkdGhdOwotICAgIENHRmxvYXQgcG9wb3ZlckhlaWdodCA9IF92aWV3Q29udHJvbGxlci5n ZXQoKS52aWV3LmZyYW1lLnNpemUuaGVpZ2h0OworICAgIENHRmxvYXQgcG9wb3ZlcldpZHRoID0g ZGF0ZVBpY2tlci5mcmFtZS5zaXplLndpZHRoOworICAgIENHRmxvYXQgcG9wb3ZlckhlaWdodCA9 IGRhdGVQaWNrZXIuZnJhbWUuc2l6ZS5oZWlnaHQ7CisgICAgCiAgICAgW192aWV3Q29udHJvbGxl ciBzZXRQcmVmZXJyZWRDb250ZW50U2l6ZTpDR1NpemVNYWtlKHBvcG92ZXJXaWR0aCwgcG9wb3Zl ckhlaWdodCldOwogICAgIFtfdmlld0NvbnRyb2xsZXIgc2V0RWRnZXNGb3JFeHRlbmRlZExheW91 dDpVSVJlY3RFZGdlTm9uZV07CiAgICAgW192aWV3Q29udHJvbGxlciBzZXRUaXRsZTpfdmlldy5m b2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnRpdGxlXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQb3BvdmVyLm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBvcG92ZXIubW0KaW5kZXggMDZj ZTgyNGRiN2ZjOTUzZjdhNDNkMTZmOTcxMDM0MDNlZjU1NzRjZi4uNTc3MTRiODM1NWVkZDQ3MTJl NmUyODJmYTg3ZWZlMmVmNGM4OWE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBvcG92ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBvcG92ZXIubW0KQEAgLTM5OCwxMCArMzk4 LDYgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoVmlldzooV0tDb250ZW50VmlldyAqKXZpZXcg aGFzR3JvdXBzOihCT09MKWhhc0dyb3VwcwogewogICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5p dFdpdGhWaWV3OnZpZXddKSkKICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICAKLSAgICBDR1JlY3Qg ZnJhbWU7Ci0gICAgZnJhbWUub3JpZ2luID0gQ0dQb2ludFplcm87Ci0gICAgZnJhbWUuc2l6ZSA9 IFtVSUtleWJvYXJkIGRlZmF1bHRTaXplRm9ySW50ZXJmYWNlT3JpZW50YXRpb246dmlldy5pbnRl cmZhY2VPcmllbnRhdGlvbl07CiAKICAgICBfdGFibGVWaWV3Q29udHJvbGxlciA9IGFkb3B0TlMo W1tXS1NlbGVjdFRhYmxlVmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoVmlldzp2aWV3IGhh c0dyb3VwczpoYXNHcm91cHNdKTsKICAgICBbX3RhYmxlVmlld0NvbnRyb2xsZXIgc2V0UG9wb3Zl cjpzZWxmXTsK 395830 2020-04-08 10:26:23 -0700 2020-04-08 10:27:52 -0700 Patch bug-210194-20200408102622.patch text/plain 4105 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZjZDQ0YzkyYjAzNzdkZGE5 MDhjMGE3MmMwOGNkNTc2MDgzYTJlNGUuLjg1OWZhYTU5NmY5NDEzYjAyOWVhZWJkZTAwMjdlZGZj YzEwZjU5ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDQtMDggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgU2l6ZXMg Y2FsY3VsYXRpb25zIGZvciBEYXRlL1RpbWUgZm9ybSBjb250cm9scworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMTk0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmV0dGVyIGNhbGN1bGF0aW9ucyBmb3Ig c2l6ZXMgaGFwcGVuIHdoZW4gd2Ugc2V0IHRoZSBtb2RlIGJlZm9yZSBjYWxsaW5nCisgICAgICAg IHNpemVUb0ZpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtSW5wdXRD b250cm9sLm1tOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGluaXRXaXRoVmlldzpkYXRl UGlja2VyTW9kZTpdKToKKyAgICAgICAgKC1bV0tEYXRlVGltZVBvcG92ZXIgaW5pdFdpdGhWaWV3 OmRhdGVQaWNrZXJNb2RlOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3Jt U2VsZWN0UG9wb3Zlci5tbToKKyAgICAgICAgKC1bV0tTZWxlY3RQb3BvdmVyIGluaXRXaXRoVmll dzpoYXNHcm91cHM6XSk6CisKIDIwMjAtMDQtMDcgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEFkZCBtZXNzYWdlIHRvIG1lc3NhZ2UgZmlsdGVy IGluIHRoZSBXZWJDb250ZW50IHNhbmRib3gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1JbnB1dENvbnRyb2wubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtSW5wdXRDb250cm9sLm1tCmluZGV4IDdmNGY5MTM2NTE3 N2JmNGEwYzMzNjlkNjljMTFlYzZhMmQ2NjhjZjkuLjZkZTc3NjhmZmUxMmZmYmUyNjk1YmRhMzE0 MjU0MTI1YWQ3Y2JhYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0Zvcm1JbnB1dENvbnRyb2wubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL2Zvcm1zL1dLRm9ybUlucHV0Q29udHJvbC5tbQpAQCAtMTE1LDE2ICsxMTUsMTkgQEAgLSAo aWQpaW5pdFdpdGhWaWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBkYXRlUGlja2VyTW9kZTooVUlE YXRlUGlja2VyTW9kZSltb2RlCiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAg IGJyZWFrOwotICAgfQotCi0gICAgYXV0byBzaXplID0gY3VycmVudFVzZXJJbnRlcmZhY2VJZGlv bUlzUGFkKCkgPyBbVUlQaWNrZXJWaWV3IGRlZmF1bHRTaXplRm9yQ3VycmVudE9yaWVudGF0aW9u XSA6IFtVSUtleWJvYXJkIGRlZmF1bHRTaXplRm9ySW50ZXJmYWNlT3JpZW50YXRpb246dmlldy5p bnRlcmZhY2VPcmllbnRhdGlvbl07CisgICAgfQorICAgIAorICAgIF9kYXRlUGlja2VyID0gYWRv cHROUyhbW1VJRGF0ZVBpY2tlciBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAs IDAsIDApXSk7CiAKLSAgICBfZGF0ZVBpY2tlciA9IGFkb3B0TlMoW1tVSURhdGVQaWNrZXIgYWxs b2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCBzaXplLndpZHRoLCBzaXplLmhlaWdo dCldKTsKKyAgICBbX2RhdGVQaWNrZXIgc2V0RGF0ZVBpY2tlck1vZGU6bW9kZV07CisgICAgW19k YXRlUGlja2VyIHNldEhpZGRlbjpOT107CisgICAgCiAjaWYgSEFWRShVSURBVEVQSUNLRVJfU1RZ TEUpCiAgICAgW19kYXRlUGlja2VyIHNldFByZWZlcnJlZERhdGVQaWNrZXJTdHlsZTpbc2VsZiBk YXRlUGlja2VyU3R5bGVdXTsKICNlbmRpZgotICAgIF9kYXRlUGlja2VyLmdldCgpLmRhdGVQaWNr ZXJNb2RlID0gbW9kZTsKLSAgICBfZGF0ZVBpY2tlci5nZXQoKS5oaWRkZW4gPSBOTzsKKyAgICAK KyAgICBhdXRvIHNpemUgPSBbX2RhdGVQaWNrZXIgc2l6ZVRoYXRGaXRzOkNHU2l6ZU1ha2Uodmll dy5mcmFtZS5zaXplLndpZHRoLCAwKV07CisgICAgW19kYXRlUGlja2VyIHNldEZyYW1lOkNHUmVj dE1ha2UoMCwgMCwgc2l6ZS53aWR0aCwgc2l6ZS5oZWlnaHQpXTsKICAgICAKICAgICBpZiAoW3Nl bGYgc2hvdWxkUHJlc2VudEdyZWdvcmlhbkNhbGVuZGFyOnZpZXcuZm9jdXNlZEVsZW1lbnRJbmZv cm1hdGlvbl0pCiAgICAgICAgIF9kYXRlUGlja2VyLmdldCgpLmNhbGVuZGFyID0gW05TQ2FsZW5k YXIgY2FsZW5kYXJXaXRoSWRlbnRpZmllcjpOU0NhbGVuZGFySWRlbnRpZmllckdyZWdvcmlhbl07 CkBAIC0zMzksOSArMzQyLDggQEAgLSAoaWQpaW5pdFdpdGhWaWV3OihXS0NvbnRlbnRWaWV3ICop dmlldyBkYXRlUGlja2VyTW9kZTooVUlEYXRlUGlja2VyTW9kZSltb2RlCiAgICAgX3ZpZXcgPSB2 aWV3OwogICAgIF92aWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tXS0RhdGVUaW1lUG9wb3ZlclZp ZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFZpZXc6dmlldyBkYXRlUGlja2VyTW9kZTptb2Rl XSk7CiAgICAgVUlEYXRlUGlja2VyICpkYXRlUGlja2VyID0gWyhXS0RhdGVUaW1lUGlja2VyICop X3ZpZXdDb250cm9sbGVyLmdldCgpLmlubmVyQ29udHJvbCBkYXRlUGlja2VyXTsKLSAgICBDR0Zs b2F0IHBvcG92ZXJXaWR0aCA9IFtkYXRlUGlja2VyIF9jb250ZW50V2lkdGhdOwotICAgIENHRmxv YXQgcG9wb3ZlckhlaWdodCA9IF92aWV3Q29udHJvbGxlci5nZXQoKS52aWV3LmZyYW1lLnNpemUu aGVpZ2h0OwotICAgIFtfdmlld0NvbnRyb2xsZXIgc2V0UHJlZmVycmVkQ29udGVudFNpemU6Q0dT aXplTWFrZShwb3BvdmVyV2lkdGgsIHBvcG92ZXJIZWlnaHQpXTsKKyAgICAKKyAgICBbX3ZpZXdD b250cm9sbGVyIHNldFByZWZlcnJlZENvbnRlbnRTaXplOmRhdGVQaWNrZXIuZnJhbWUuc2l6ZV07 CiAgICAgW192aWV3Q29udHJvbGxlciBzZXRFZGdlc0ZvckV4dGVuZGVkTGF5b3V0OlVJUmVjdEVk Z2VOb25lXTsKICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFRpdGxlOl92aWV3LmZvY3VzZWRFbGVt ZW50SW5mb3JtYXRpb24udGl0bGVdOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0UG9wb3Zlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQb3BvdmVyLm1tCmluZGV4IDA2Y2U4MjRkYjdm Yzk1M2Y3YTQzZDE2Zjk3MTAzNDAzZWY1NTc0Y2YuLjU3NzE0YjgzNTVlZGQ0NzEyZTZlMjgyZmE4 N2VmZTJlZjRjODlhNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0Zvcm1TZWxlY3RQb3BvdmVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQb3BvdmVyLm1tCkBAIC0zOTgsMTAgKzM5OCw2IEBAIC0g KGluc3RhbmNldHlwZSlpbml0V2l0aFZpZXc6KFdLQ29udGVudFZpZXcgKil2aWV3IGhhc0dyb3Vw czooQk9PTCloYXNHcm91cHMKIHsKICAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRXaXRoVmll dzp2aWV3XSkpCiAgICAgICAgIHJldHVybiBuaWw7Ci0gICAgCi0gICAgQ0dSZWN0IGZyYW1lOwot ICAgIGZyYW1lLm9yaWdpbiA9IENHUG9pbnRaZXJvOwotICAgIGZyYW1lLnNpemUgPSBbVUlLZXli b2FyZCBkZWZhdWx0U2l6ZUZvckludGVyZmFjZU9yaWVudGF0aW9uOnZpZXcuaW50ZXJmYWNlT3Jp ZW50YXRpb25dOwogCiAgICAgX3RhYmxlVmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tTZWxl Y3RUYWJsZVZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFZpZXc6dmlldyBoYXNHcm91cHM6 aGFzR3JvdXBzXSk7CiAgICAgW190YWJsZVZpZXdDb250cm9sbGVyIHNldFBvcG92ZXI6c2VsZl07 Cg== 395831 2020-04-08 10:27:54 -0700 2020-04-08 11:55:04 -0700 Patch bug-210194-20200408102753.patch text/plain 4140 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZjZDQ0YzkyYjAzNzdkZGE5 MDhjMGE3MmMwOGNkNTc2MDgzYTJlNGUuLmIxYjE5ZDcyMzJmOGIwYjM1NWI0NjIzMTcxZTkzZDIw YjI0ZmIwOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDQtMDggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgU2l6ZXMg Y2FsY3VsYXRpb25zIGZvciBEYXRlL1RpbWUgZm9ybSBjb250cm9scworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMTk0CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS82MDM4NTQ3NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBCZXR0ZXIgY2FsY3VsYXRpb25zIGZvciBzaXplcyBoYXBwZW4gd2hlbiB3ZSBz ZXQgdGhlIG1vZGUgYmVmb3JlIGNhbGxpbmcKKyAgICAgICAgc2l6ZVRvRml0LgorCisgICAgICAg ICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1JbnB1dENvbnRyb2wubW06CisgICAgICAgICgt W1dLRGF0ZVRpbWVQaWNrZXIgaW5pdFdpdGhWaWV3OmRhdGVQaWNrZXJNb2RlOl0pOgorICAgICAg ICAoLVtXS0RhdGVUaW1lUG9wb3ZlciBpbml0V2l0aFZpZXc6ZGF0ZVBpY2tlck1vZGU6XSk6Cisg ICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQb3BvdmVyLm1tOgorICAg ICAgICAoLVtXS1NlbGVjdFBvcG92ZXIgaW5pdFdpdGhWaWV3Omhhc0dyb3VwczpdKToKKwogMjAy MC0wNC0wNyAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU10gQWRkIG1lc3NhZ2UgdG8gbWVzc2FnZSBmaWx0ZXIgaW4gdGhlIFdlYkNvbnRlbnQgc2Fu ZGJveApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9y bUlucHV0Q29udHJvbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zv cm1JbnB1dENvbnRyb2wubW0KaW5kZXggN2Y0ZjkxMzY1MTc3YmY0YTBjMzM2OWQ2OWMxMWVjNmEy ZDY2OGNmOS4uNmRlNzc2OGZmZTEyZmZiZTI2OTViZGEzMTQyNTQxMjVhZDdjYmFjNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybUlucHV0Q29udHJv bC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtSW5wdXRD b250cm9sLm1tCkBAIC0xMTUsMTYgKzExNSwxOSBAQCAtIChpZClpbml0V2l0aFZpZXc6KFdLQ29u dGVudFZpZXcgKil2aWV3IGRhdGVQaWNrZXJNb2RlOihVSURhdGVQaWNrZXJNb2RlKW1vZGUKICAg ICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgYnJlYWs7Ci0gICB9Ci0KLSAgICBh dXRvIHNpemUgPSBjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSA/IFtVSVBpY2tlclZp ZXcgZGVmYXVsdFNpemVGb3JDdXJyZW50T3JpZW50YXRpb25dIDogW1VJS2V5Ym9hcmQgZGVmYXVs dFNpemVGb3JJbnRlcmZhY2VPcmllbnRhdGlvbjp2aWV3LmludGVyZmFjZU9yaWVudGF0aW9uXTsK KyAgICB9CisgICAgCisgICAgX2RhdGVQaWNrZXIgPSBhZG9wdE5TKFtbVUlEYXRlUGlja2VyIGFs bG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgMCwgMCldKTsKIAotICAgIF9kYXRl UGlja2VyID0gYWRvcHROUyhbW1VJRGF0ZVBpY2tlciBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1Jl Y3RNYWtlKDAsIDAsIHNpemUud2lkdGgsIHNpemUuaGVpZ2h0KV0pOworICAgIFtfZGF0ZVBpY2tl ciBzZXREYXRlUGlja2VyTW9kZTptb2RlXTsKKyAgICBbX2RhdGVQaWNrZXIgc2V0SGlkZGVuOk5P XTsKKyAgICAKICNpZiBIQVZFKFVJREFURVBJQ0tFUl9TVFlMRSkKICAgICBbX2RhdGVQaWNrZXIg c2V0UHJlZmVycmVkRGF0ZVBpY2tlclN0eWxlOltzZWxmIGRhdGVQaWNrZXJTdHlsZV1dOwogI2Vu ZGlmCi0gICAgX2RhdGVQaWNrZXIuZ2V0KCkuZGF0ZVBpY2tlck1vZGUgPSBtb2RlOwotICAgIF9k YXRlUGlja2VyLmdldCgpLmhpZGRlbiA9IE5POworICAgIAorICAgIGF1dG8gc2l6ZSA9IFtfZGF0 ZVBpY2tlciBzaXplVGhhdEZpdHM6Q0dTaXplTWFrZSh2aWV3LmZyYW1lLnNpemUud2lkdGgsIDAp XTsKKyAgICBbX2RhdGVQaWNrZXIgc2V0RnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCBzaXplLndpZHRo LCBzaXplLmhlaWdodCldOwogICAgIAogICAgIGlmIChbc2VsZiBzaG91bGRQcmVzZW50R3JlZ29y aWFuQ2FsZW5kYXI6dmlldy5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uXSkKICAgICAgICAgX2Rh dGVQaWNrZXIuZ2V0KCkuY2FsZW5kYXIgPSBbTlNDYWxlbmRhciBjYWxlbmRhcldpdGhJZGVudGlm aWVyOk5TQ2FsZW5kYXJJZGVudGlmaWVyR3JlZ29yaWFuXTsKQEAgLTMzOSw5ICszNDIsOCBAQCAt IChpZClpbml0V2l0aFZpZXc6KFdLQ29udGVudFZpZXcgKil2aWV3IGRhdGVQaWNrZXJNb2RlOihV SURhdGVQaWNrZXJNb2RlKW1vZGUKICAgICBfdmlldyA9IHZpZXc7CiAgICAgX3ZpZXdDb250cm9s bGVyID0gYWRvcHROUyhbW1dLRGF0ZVRpbWVQb3BvdmVyVmlld0NvbnRyb2xsZXIgYWxsb2NdIGlu aXRXaXRoVmlldzp2aWV3IGRhdGVQaWNrZXJNb2RlOm1vZGVdKTsKICAgICBVSURhdGVQaWNrZXIg KmRhdGVQaWNrZXIgPSBbKFdLRGF0ZVRpbWVQaWNrZXIgKilfdmlld0NvbnRyb2xsZXIuZ2V0KCku aW5uZXJDb250cm9sIGRhdGVQaWNrZXJdOwotICAgIENHRmxvYXQgcG9wb3ZlcldpZHRoID0gW2Rh dGVQaWNrZXIgX2NvbnRlbnRXaWR0aF07Ci0gICAgQ0dGbG9hdCBwb3BvdmVySGVpZ2h0ID0gX3Zp ZXdDb250cm9sbGVyLmdldCgpLnZpZXcuZnJhbWUuc2l6ZS5oZWlnaHQ7Ci0gICAgW192aWV3Q29u dHJvbGxlciBzZXRQcmVmZXJyZWRDb250ZW50U2l6ZTpDR1NpemVNYWtlKHBvcG92ZXJXaWR0aCwg cG9wb3ZlckhlaWdodCldOworICAgIAorICAgIFtfdmlld0NvbnRyb2xsZXIgc2V0UHJlZmVycmVk Q29udGVudFNpemU6ZGF0ZVBpY2tlci5mcmFtZS5zaXplXTsKICAgICBbX3ZpZXdDb250cm9sbGVy IHNldEVkZ2VzRm9yRXh0ZW5kZWRMYXlvdXQ6VUlSZWN0RWRnZU5vbmVdOwogICAgIFtfdmlld0Nv bnRyb2xsZXIgc2V0VGl0bGU6X3ZpZXcuZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi50aXRsZV07 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1T ZWxlY3RQb3BvdmVyLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9y bVNlbGVjdFBvcG92ZXIubW0KaW5kZXggMDZjZTgyNGRiN2ZjOTUzZjdhNDNkMTZmOTcxMDM0MDNl ZjU1NzRjZi4uNTc3MTRiODM1NWVkZDQ3MTJlNmUyODJmYTg3ZWZlMmVmNGM4OWE0MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBvcG92 ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVj dFBvcG92ZXIubW0KQEAgLTM5OCwxMCArMzk4LDYgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRo VmlldzooV0tDb250ZW50VmlldyAqKXZpZXcgaGFzR3JvdXBzOihCT09MKWhhc0dyb3Vwcwogewog ICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdFdpdGhWaWV3OnZpZXddKSkKICAgICAgICAgcmV0 dXJuIG5pbDsKLSAgICAKLSAgICBDR1JlY3QgZnJhbWU7Ci0gICAgZnJhbWUub3JpZ2luID0gQ0dQ b2ludFplcm87Ci0gICAgZnJhbWUuc2l6ZSA9IFtVSUtleWJvYXJkIGRlZmF1bHRTaXplRm9ySW50 ZXJmYWNlT3JpZW50YXRpb246dmlldy5pbnRlcmZhY2VPcmllbnRhdGlvbl07CiAKICAgICBfdGFi bGVWaWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tXS1NlbGVjdFRhYmxlVmlld0NvbnRyb2xsZXIg YWxsb2NdIGluaXRXaXRoVmlldzp2aWV3IGhhc0dyb3VwczpoYXNHcm91cHNdKTsKICAgICBbX3Rh YmxlVmlld0NvbnRyb2xsZXIgc2V0UG9wb3ZlcjpzZWxmXTsK 395849 2020-04-08 11:55:06 -0700 2020-04-09 10:55:00 -0700 Patch bug-210194-20200408115505.patch text/plain 4536 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZjZDQ0YzkyYjAzNzdkZGE5 MDhjMGE3MmMwOGNkNTc2MDgzYTJlNGUuLjQ4ZThlZWY1NDFkOWM3NjBmNmNhNzVjYjAyMjI1ZTk4 M2MyY2MwNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDQtMDggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBEYXRlIGFu ZCB0aW1lIGZvcm0gY29udHJvbHMgYXJlIHByZXNlbnRlZCBhdCB0aGUgd3Jvbmcgc2l6ZSBpbiBz b21lIG1vZGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTAxOTQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYwMzg1NDc1PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgcmVseWluZyBv biB0aGUgZGVmYXVsdCBzaXplIGZvciBkYXRlL3RpbWUgY29udHJvbHMsIHdlIHNob3VsZCBsZXQg dGhlCisgICAgICAgIFVJRGF0ZVBpY2tlciBkZXRlcm1pbmUgaXRzIG93biBzaXplIGdpdmVuIHRo ZSBjb25maWd1cmF0aW9uIHdlJ3JlIGdvaW5nIHRvIHVzZS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvZm9ybXMvV0tGb3JtSW5wdXRDb250cm9sLm1tOgorICAgICAgICAoLVtXS0RhdGVUaW1l UGlja2VyIGluaXRXaXRoVmlldzpkYXRlUGlja2VyTW9kZTpdKToKKyAgICAgICAgKC1bV0tEYXRl VGltZVBvcG92ZXIgaW5pdFdpdGhWaWV3OmRhdGVQaWNrZXJNb2RlOl0pOgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0UG9wb3Zlci5tbToKKyAgICAgICAgKC1bV0tT ZWxlY3RQb3BvdmVyIGluaXRXaXRoVmlldzpoYXNHcm91cHM6XSk6CisKIDIwMjAtMDQtMDcgIFBl ciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEFkZCBt ZXNzYWdlIHRvIG1lc3NhZ2UgZmlsdGVyIGluIHRoZSBXZWJDb250ZW50IHNhbmRib3gKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1JbnB1dENvbnRy b2wubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtSW5wdXRDb250 cm9sLm1tCmluZGV4IDdmNGY5MTM2NTE3N2JmNGEwYzMzNjlkNjljMTFlYzZhMmQ2NjhjZjkuLmE4 MzUyNDNiNGU5YmExZTQ2ZjM1OTY4OTQ3YmY2NzhhMzgzZDNhOWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1JbnB1dENvbnRyb2wubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybUlucHV0Q29udHJvbC5tbQpA QCAtMTE1LDE2ICsxMTUsMTkgQEAgLSAoaWQpaW5pdFdpdGhWaWV3OihXS0NvbnRlbnRWaWV3ICop dmlldyBkYXRlUGlja2VyTW9kZTooVUlEYXRlUGlja2VyTW9kZSltb2RlCiAgICAgICAgIGJyZWFr OwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwotICAgfQotCi0gICAgYXV0byBzaXplID0g Y3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkgPyBbVUlQaWNrZXJWaWV3IGRlZmF1bHRT aXplRm9yQ3VycmVudE9yaWVudGF0aW9uXSA6IFtVSUtleWJvYXJkIGRlZmF1bHRTaXplRm9ySW50 ZXJmYWNlT3JpZW50YXRpb246dmlldy5pbnRlcmZhY2VPcmllbnRhdGlvbl07CisgICAgfQorICAg IAorICAgIF9kYXRlUGlja2VyID0gYWRvcHROUyhbW1VJRGF0ZVBpY2tlciBhbGxvY10gaW5pdF0p OwogCi0gICAgX2RhdGVQaWNrZXIgPSBhZG9wdE5TKFtbVUlEYXRlUGlja2VyIGFsbG9jXSBpbml0 V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgc2l6ZS53aWR0aCwgc2l6ZS5oZWlnaHQpXSk7Cisg ICAgW19kYXRlUGlja2VyIHNldERhdGVQaWNrZXJNb2RlOm1vZGVdOworICAgIFtfZGF0ZVBpY2tl ciBzZXRIaWRkZW46Tk9dOworICAgIAogI2lmIEhBVkUoVUlEQVRFUElDS0VSX1NUWUxFKQogICAg IFtfZGF0ZVBpY2tlciBzZXRQcmVmZXJyZWREYXRlUGlja2VyU3R5bGU6W3NlbGYgZGF0ZVBpY2tl clN0eWxlXV07CiAjZW5kaWYKLSAgICBfZGF0ZVBpY2tlci5nZXQoKS5kYXRlUGlja2VyTW9kZSA9 IG1vZGU7Ci0gICAgX2RhdGVQaWNrZXIuZ2V0KCkuaGlkZGVuID0gTk87CisgICAgCisgICAgYXV0 byBzaXplID0gW19kYXRlUGlja2VyIHNpemVUaGF0Rml0czpDR1NpemVNYWtlKHZpZXcuZnJhbWUu c2l6ZS53aWR0aCwgMCldOworICAgIFtfZGF0ZVBpY2tlciBzZXRGcmFtZTpDR1JlY3RNYWtlKDAs IDAsIHNpemUud2lkdGgsIHNpemUuaGVpZ2h0KV07CiAgICAgCiAgICAgaWYgKFtzZWxmIHNob3Vs ZFByZXNlbnRHcmVnb3JpYW5DYWxlbmRhcjp2aWV3LmZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb25d KQogICAgICAgICBfZGF0ZVBpY2tlci5nZXQoKS5jYWxlbmRhciA9IFtOU0NhbGVuZGFyIGNhbGVu ZGFyV2l0aElkZW50aWZpZXI6TlNDYWxlbmRhcklkZW50aWZpZXJHcmVnb3JpYW5dOwpAQCAtMzM5 LDkgKzM0MiwxNCBAQCAtIChpZClpbml0V2l0aFZpZXc6KFdLQ29udGVudFZpZXcgKil2aWV3IGRh dGVQaWNrZXJNb2RlOihVSURhdGVQaWNrZXJNb2RlKW1vZGUKICAgICBfdmlldyA9IHZpZXc7CiAg ICAgX3ZpZXdDb250cm9sbGVyID0gYWRvcHROUyhbW1dLRGF0ZVRpbWVQb3BvdmVyVmlld0NvbnRy b2xsZXIgYWxsb2NdIGluaXRXaXRoVmlldzp2aWV3IGRhdGVQaWNrZXJNb2RlOm1vZGVdKTsKICAg ICBVSURhdGVQaWNrZXIgKmRhdGVQaWNrZXIgPSBbKFdLRGF0ZVRpbWVQaWNrZXIgKilfdmlld0Nv bnRyb2xsZXIuZ2V0KCkuaW5uZXJDb250cm9sIGRhdGVQaWNrZXJdOwotICAgIENHRmxvYXQgcG9w b3ZlcldpZHRoID0gW2RhdGVQaWNrZXIgX2NvbnRlbnRXaWR0aF07Ci0gICAgQ0dGbG9hdCBwb3Bv dmVySGVpZ2h0ID0gX3ZpZXdDb250cm9sbGVyLmdldCgpLnZpZXcuZnJhbWUuc2l6ZS5oZWlnaHQ7 Ci0gICAgW192aWV3Q29udHJvbGxlciBzZXRQcmVmZXJyZWRDb250ZW50U2l6ZTpDR1NpemVNYWtl KHBvcG92ZXJXaWR0aCwgcG9wb3ZlckhlaWdodCldOworCisgICAgaWYgKHZpZXcuZm9jdXNlZEVs ZW1lbnRJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSA9PSBJbnB1dFR5cGU6Ok1vbnRoKSB7CisgICAg ICAgIENHRmxvYXQgcG9wb3ZlcldpZHRoID0gW2RhdGVQaWNrZXIgX2NvbnRlbnRXaWR0aF07Cisg ICAgICAgIENHRmxvYXQgcG9wb3ZlckhlaWdodCA9IF92aWV3Q29udHJvbGxlci5nZXQoKS52aWV3 LmZyYW1lLnNpemUuaGVpZ2h0OworICAgICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFByZWZlcnJl ZENvbnRlbnRTaXplOkNHU2l6ZU1ha2UocG9wb3ZlcldpZHRoLCBwb3BvdmVySGVpZ2h0KV07Cisg ICAgfSBlbHNlCisgICAgICAgIFtfdmlld0NvbnRyb2xsZXIgc2V0UHJlZmVycmVkQ29udGVudFNp emU6ZGF0ZVBpY2tlci5mcmFtZS5zaXplXTsKKyAgICAKICAgICBbX3ZpZXdDb250cm9sbGVyIHNl dEVkZ2VzRm9yRXh0ZW5kZWRMYXlvdXQ6VUlSZWN0RWRnZU5vbmVdOwogICAgIFtfdmlld0NvbnRy b2xsZXIgc2V0VGl0bGU6X3ZpZXcuZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi50aXRsZV07CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxl Y3RQb3BvdmVyLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNl bGVjdFBvcG92ZXIubW0KaW5kZXggMDZjZTgyNGRiN2ZjOTUzZjdhNDNkMTZmOTcxMDM0MDNlZjU1 NzRjZi4uNTc3MTRiODM1NWVkZDQ3MTJlNmUyODJmYTg3ZWZlMmVmNGM4OWE0MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBvcG92ZXIu bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBv cG92ZXIubW0KQEAgLTM5OCwxMCArMzk4LDYgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoVmll dzooV0tDb250ZW50VmlldyAqKXZpZXcgaGFzR3JvdXBzOihCT09MKWhhc0dyb3VwcwogewogICAg IGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdFdpdGhWaWV3OnZpZXddKSkKICAgICAgICAgcmV0dXJu IG5pbDsKLSAgICAKLSAgICBDR1JlY3QgZnJhbWU7Ci0gICAgZnJhbWUub3JpZ2luID0gQ0dQb2lu dFplcm87Ci0gICAgZnJhbWUuc2l6ZSA9IFtVSUtleWJvYXJkIGRlZmF1bHRTaXplRm9ySW50ZXJm YWNlT3JpZW50YXRpb246dmlldy5pbnRlcmZhY2VPcmllbnRhdGlvbl07CiAKICAgICBfdGFibGVW aWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tXS1NlbGVjdFRhYmxlVmlld0NvbnRyb2xsZXIgYWxs b2NdIGluaXRXaXRoVmlldzp2aWV3IGhhc0dyb3VwczpoYXNHcm91cHNdKTsKICAgICBbX3RhYmxl Vmlld0NvbnRyb2xsZXIgc2V0UG9wb3ZlcjpzZWxmXTsK