214122 2020-07-08 21:58:18 -0700 REGRESSION (r259840): Pressing Esc or ⌘+"." does not dismiss time picker on iOS 2020-07-09 12:46:15 -0700 1 1 1 Unclassified WebKit Forms WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin cdumez hi megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1670013 0 wenson_hsieh 2020-07-08 21:58:18 -0700 <rdar://problem/64940487> 1670206 1 403898 wenson_hsieh 2020-07-09 11:59:39 -0700 Created attachment 403898 Patch 1670213 2 403898 thorton 2020-07-09 12:16:53 -0700 Comment on attachment 403898 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403898&action=review > Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm:379 > + if (elementType == InputType::Time || elementType == InputType::DateTimeLocal) I know this was already here... but is there a better way to know or infer the right set of types, instead of keeping a list here? 1670223 3 403898 wenson_hsieh 2020-07-09 12:33:01 -0700 Comment on attachment 403898 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403898&action=review Thanks for the review! >> Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm:379 >> + if (elementType == InputType::Time || elementType == InputType::DateTimeLocal) > > I know this was already here... but is there a better way to know or infer the right set of types, instead of keeping a list here? That’s a good question. I don’t think there’s a way to know without poking around in UIKit internals, because the thing that actually steals FR in these controls is _UIDatePickerCalendarTimeLabel (an internal class). I think we could maybe make this consult -[UIDatePicker datePickerMode] and -[UIDatePicker datePickerStyle] instead, but the logic would look pretty similar to what we have already. 1670227 4 thorton 2020-07-09 12:39:59 -0700 Maybe in the distant future we could ask UIKit to vend an explicit bit for this. 1670230 5 403898 wenson_hsieh 2020-07-09 12:43:43 -0700 Comment on attachment 403898 Patch (In reply to Tim Horton from comment #4) > Maybe in the distant future we could ask UIKit to vend an explicit bit for > this. 👍🏻 1670233 6 ews-feeder 2020-07-09 12:46:14 -0700 Committed r264187: <https://trac.webkit.org/changeset/264187> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403898. 403898 2020-07-09 11:59:39 -0700 2020-07-09 12:46:15 -0700 Patch bug-214122-20200709115938.patch text/plain 15351 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNmM2NlNWM5OWExYWNiNWVh N2NjNzM3OTIyNmRjZGRjNDRiNjUyYjYuLjNjYTUxY2Q5YzMyNTVjYjdhNjM4YjExMjUzYTMxNzNl MDEzYTY5MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTYgQEAKKzIwMjAtMDctMDkgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI1 OTg0MCk6IFByZXNzaW5nIEVzYyBvciDijJgrIi4iIGRvZXMgbm90IGRpc21pc3MgdGltZSBwaWNr ZXIgb24gaU9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTQxMjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0OTQwNDg3PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByaW9yIHRvIHIyNTk4NDAsIHdo ZW4gcHJlc2VudGluZyBjb250ZXh0IG1lbnVzIGZvciBjZXJ0YWluIGlucHV0IHR5cGVzIChpLmUu ICJ0aW1lIiBhbmQgImRhdGV0aW1lLWxvY2FsIikgb24KKyAgICAgICAgaU9TLCBVSUtpdCB3b3Vs ZCB0ZWxsIHRoZSBwcmVzZW50ZWQgdmlldyBjb250cm9sbGVyJ3MgdmlldyAoYSBgVUlEYXRlUGlj a2VyYCBpbiB0aGlzIGNhc2UpIHRvIGJlY29tZSBmaXJzdAorICAgICAgICByZXNwb25kZXIuIEFz IGEgcmVzdWx0LCBgV0tDb250ZW50Vmlld2Agd291bGQgcmVzaWduIGZpcnN0IHJlc3BvbmRlciwg d2hpY2ggKGJ5IGRlZmF1bHQpIGJsdXJzIHRoZSBmb2N1c2VkCisgICAgICAgIGVsZW1lbnQgYW5k IGRpc21pc3NlcyB0aGUgY29udGV4dCBtZW51LiBUaGUgcmVzdWx0IGlzIHRoYXRzIHRpbWUgcGlj a2VycyB3b3VsZCBpbW1lZGlhdGVseSBkaXNtaXNzIHVwb24KKyAgICAgICAgcHJlc2VudGF0aW9u LgorCisgICAgICAgIFRvIG1pdGlnYXRlIHRoaXMsIHIyNTk4NDAgYWRvcHRlZCB0aGUgZXhpc3Rp bmcgYWN0aXZlIGZvY3VzIHJldGFpbmluZyBtZWNoYW5pc20gdG8gdGVtcG9yYXJpbHkgZGVjb3Vw bGUKKyAgICAgICAgV0tDb250ZW50VmlldydzIGZpcnN0IHJlc3BvbmRlciBzdGF0dXMgZnJvbSB0 aGUgY3VycmVudGx5IGZvY3VzZWQgZm9ybSBlbGVtZW50LiBIb3dldmVyLCB0aGlzIGFsc28gY2F1 c2VzCisgICAgICAgIGAtZW5kRWRpdGluZ0FuZFVwZGF0ZUZvY3VzQXBwZWFyYW5jZVdpdGhSZWFz b246YCB0byBiYWlsLCBkdWUgdG8gYHNlbGYud2ViVmlldy5fcmV0YWluaW5nQWN0aXZlRm9jdXNl ZFN0YXRlYAorICAgICAgICByZXR1cm5pbmcgYFlFU2AuIFRoaXMgbWVhbnMgdGhhdCBjb2RlcGF0 aHMgbWVhbnQgdG8gaW1tZWRpYXRlbHkgZGlzbWlzcyBVSSBmb3IgdGhlIGZvY3VzZWQgZWxlbWVu dCAoZm9yIGV4YW1wbGUsCisgICAgICAgIHdoZW4gcHJlc3NpbmcgRXNjYXBlIG9uIGEgaGFyZHdh cmUga2V5Ym9hcmQgb24gaU9TKSB3aWxsIG5vdCBiZSBhYmxlIHRvIGRpc21pc3MgVUkuCisKKyAg ICAgICAgVG8gZml4IHRoaXMsIHB1c2ggdGhlIGZsYWcgdGhhdCBrZWVwcyB0cmFjayBvZiB3aGV0 aGVyIHdlJ3JlIHJlbGlucXVpc2hpbmcgZmlyc3QgcmVzcG9uZGVyIHRvIHRoZSBmb2N1c2VkCisg ICAgICAgIGVsZW1lbnQgZG93biBpbnRvIGBXS0NvbnRlbnRWaWV3YCwgYW5kIGhhdmUgYFdLQ29u dGVudFZpZXdgIGF1dG9tYXRpY2FsbHkgc3RvcCByZWxpbnF1aXNoaW5nIGZpcnN0IHJlc3BvbmRl ciB0bworICAgICAgICB0aGUgZm9jdXNlZCBlbGVtZW50IGluIGAtW1dLQ29udGVudFZpZXcgYWNj ZXNzb3J5RG9uZV1gLgorCisgICAgICAgIEZpeGVzIGFuIGV4aXN0aW5nIHRlc3Q6IGZhc3QvZm9y bXMvaW9zL2Rpc21pc3MtcGlja2VyLXVzaW5nLWtleWJvYXJkLmh0bWwKKworICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAgICAgICogVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgYWNjZXNzb3J5RG9uZV0pOgorCisgICAgICAgIFN0b3AgcmVsaW5xdWlzaGluZyBmb2N1 cyB0byB0aGUgZm9jdXNlZCBlbGVtZW50LCBzbyB0aGF0IGZvcm0gZWxlbWVudHMgdGhhdCByZXF1 aXJlIGZpcnN0IHJlc3BvbmRlciBjYW4gYmUKKyAgICAgICAgZGlzbWlzc2VkIHdoZW4gdHJpZ2dl cmluZyBgLWFjY2Vzc29yeURvbmVgIChlLmcuIHdoZW4gcHJlc3NpbmcgdGhlIEVzYyBrZXkgb24g YSBoYXJkd2FyZSBrZXlib2FyZCkuCisKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBzdGFydFJl bGlucXVpc2hpbmdGaXJzdFJlc3BvbmRlclRvRm9jdXNlZEVsZW1lbnRdKToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyBzdG9wUmVsaW5xdWlzaGluZ0ZpcnN0UmVzcG9uZGVyVG9Gb2N1c2VkRWxl bWVudF0pOgorCisgICAgICAgIFJlbmFtZWQgZnJvbSBgLXByZXNlcnZlRm9jdXNgIGFuZCBgLXJl bGVhc2VGb2N1c2AsIHJlc3BlY3RpdmVseS4gQWxzbywgbWFkZSB0aGVzZSBtZXRob2RzIGlkZW1w b3RlbnQgdXNpbmcgYSBuZXcKKyAgICAgICAgYEJPT0xgIGZsYWcsIGBfaXNSZWxpbnF1aXNoaW5n Rmlyc3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVtZW50YC4KKworICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IHByZXNlcnZlRm9jdXNdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBy ZWxlYXNlRm9jdXNdKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dL RGF0ZVRpbWVJbnB1dENvbnRyb2wubW06CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIgY29u dHJvbEJlZ2luRWRpdGluZ10pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRyb2xF bmRFZGl0aW5nXSk6CisKKyAgICAgICAgVXNlIHRoZSByZW5hbWVkIFdLQ29udGVudFZpZXcgbWV0 aG9kcywgYW5kIGFsc28gcmVtb3ZlIHRoZSBgX3ByZXNlcnZpbmdGb2N1c2AgZmxhZy4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtUG9wb3Zlci5tbToKKyAgICAgICAgKC1b V0tSb3RhdGluZ1BvcG92ZXIgcHJlc2VudFBvcG92ZXJBbmltYXRlZDpdKToKKyAgICAgICAgKC1b V0tSb3RhdGluZ1BvcG92ZXIgZGlzbWlzc1BvcG92ZXJBbmltYXRlZDpdKToKKworICAgICAgICBV c2UgdGhlIHJlbmFtZWQgV0tDb250ZW50VmlldyBtZXRob2RzLgorCiAyMDIwLTA3LTA5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIE9jY2Fz aW9uYWwgY3Jhc2ggdW5kZXIgLVtVSVZpZXcgX3NldFZpZXdEZWxlZ2F0ZTpdIHdoZW4gcHJlc2Vu dGluZyBkYXRlIGFuZCB0aW1lIHBpY2tlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCAwMmUxYjhjNDM3OGQ0 NjMxYjRiNDk3ODA2ZjdjNzBjY2U1NDk2ZWFiLi42MWNmNmZjYTQxZDE0OWFlYmJmNjAyMjUxYmM2 ZjM2ZWMyYjgyMjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCkBAIC0zNzcsNiArMzc3LDcgQEAgc3RydWN0IFdL QXV0b0NvcnJlY3Rpb25EYXRhIHsKICAgICBCT09MIF9pc0NoYW5naW5nRm9jdXM7CiAgICAgQk9P TCBfaXNGb2N1c2luZ0VsZW1lbnRXaXRoS2V5Ym9hcmQ7CiAgICAgQk9PTCBfaXNCbHVycmluZ0Zv Y3VzZWRFbGVtZW50OworICAgIEJPT0wgX2lzUmVsaW5xdWlzaGluZ0ZpcnN0UmVzcG9uZGVyVG9G b2N1c2VkRWxlbWVudDsKIAogICAgIEJPT0wgX2ZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFz c2lzdGFuY2U7CiAgICAgQk9PTCBfd2FpdGluZ0ZvckVkaXREcmFnU25hcHNob3Q7CkBAIC01NDgs OCArNTQ5LDggQEAgRk9SX0VBQ0hfUFJJVkFURV9XS0NPTlRFTlRWSUVXX0FDVElPTihERUNMQVJF X1dLQ09OVEVOVFZJRVdfQUNUSU9OX0ZPUl9XRUJfVklFVykKIAogLSAoTlNTdHJpbmcgKilpbnB1 dExhYmVsVGV4dDsKIAotLSAodm9pZClwcmVzZXJ2ZUZvY3VzOwotLSAodm9pZClyZWxlYXNlRm9j dXM7CistICh2b2lkKXN0YXJ0UmVsaW5xdWlzaGluZ0ZpcnN0UmVzcG9uZGVyVG9Gb2N1c2VkRWxl bWVudDsKKy0gKHZvaWQpc3RvcFJlbGlucXVpc2hpbmdGaXJzdFJlc3BvbmRlclRvRm9jdXNlZEVs ZW1lbnQ7CiAKIC8vIFVJV2ViRm9ybUFjY2Vzc29yeURlbGVnYXRlIHByb3RvY29sCiAtICh2b2lk KWFjY2Vzc29yeURvbmU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBhZTIyYjBlOGI0OWQ2MjU0NzQ2Yjcy NDk4MzQ2NDgxZmQ4YTMyZGM2Li41MjVmZmM5YzMwN2MwYzRmZTg0OTQ2NGQxZTYzNzU1MTdjNDZh ZDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTQzNjgsNiArNDM2OCw3IEBAIC0gKHZvaWQpYWNjZXNz b3J5Q2xlYXIKIAogLSAodm9pZClhY2Nlc3NvcnlEb25lCiB7CisgICAgW3NlbGYgc3RvcFJlbGlu cXVpc2hpbmdGaXJzdFJlc3BvbmRlclRvRm9jdXNlZEVsZW1lbnRdOwogICAgIFtzZWxmIGVuZEVk aXRpbmdBbmRVcGRhdGVGb2N1c0FwcGVhcmFuY2VXaXRoUmVhc29uOkVuZEVkaXRpbmdSZWFzb25B Y2Nlc3NvcnlEb25lXTsKICAgICBfcGFnZS0+c2V0SXNTaG93aW5nSW5wdXRWaWV3Rm9yRm9jdXNl ZEVsZW1lbnQoZmFsc2UpOwogfQpAQCAtNjg1MSwxMyArNjg1MiwyMSBAQCAtIChCT09MKV9yZXN0 b3JlRm9jdXNXaXRoVG9rZW46KGlkIDxOU0NvcHlpbmcsIE5TU2VjdXJlQ29kaW5nPil0b2tlbgog ICAgIHJldHVybiBOTzsKIH0KIAotLSAodm9pZClwcmVzZXJ2ZUZvY3VzCistICh2b2lkKXN0YXJ0 UmVsaW5xdWlzaGluZ0ZpcnN0UmVzcG9uZGVyVG9Gb2N1c2VkRWxlbWVudAogeworICAgIGlmIChf aXNSZWxpbnF1aXNoaW5nRmlyc3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVtZW50KQorICAgICAgICBy ZXR1cm47CisKKyAgICBfaXNSZWxpbnF1aXNoaW5nRmlyc3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVt ZW50ID0gWUVTOwogICAgIFtfd2ViVmlldyBfaW5jcmVtZW50Rm9jdXNQcmVzZXJ2YXRpb25Db3Vu dF07CiB9CiAKLS0gKHZvaWQpcmVsZWFzZUZvY3VzCistICh2b2lkKXN0b3BSZWxpbnF1aXNoaW5n Rmlyc3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVtZW50CiB7CisgICAgaWYgKCFfaXNSZWxpbnF1aXNo aW5nRmlyc3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVtZW50KQorICAgICAgICByZXR1cm47CisKKyAg ICBfaXNSZWxpbnF1aXNoaW5nRmlyc3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVtZW50ID0gTk87CiAg ICAgW193ZWJWaWV3IF9kZWNyZW1lbnRGb2N1c1ByZXNlcnZhdGlvbkNvdW50XTsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1 dENvbnRyb2wubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGlt ZUlucHV0Q29udHJvbC5tbQppbmRleCA2Y2JjOWZiMGRiZDMwMWU1MTFiNjM2ZTNhYzU0MWZiZGNk ODAyNzAxLi4yYzNjZTc3YTk1MWNjYWRjMmEzY2VkYWU3NWVkMWJiZWNjMjRlNTg2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29u dHJvbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGlt ZUlucHV0Q29udHJvbC5tbQpAQCAtMzcwLDE2ICszNzAsMTUgQEAgLSAodm9pZClzZXREYXRlVGlt ZVBpY2tlclRvSW5pdGlhbFZhbHVlCiAKIC0gKHZvaWQpY29udHJvbEJlZ2luRWRpdGluZwogewot ICAgIAogICAgIGlmIChfcHJlc2VudGluZykKICAgICAgICAgcmV0dXJuOworCiAgICAgX3ByZXNl bnRpbmcgPSBZRVM7CiAKLSAgICBpZiAoIV9wcmVzZXJ2aW5nRm9jdXMgJiYgKF92aWV3LmZvY3Vz ZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGUgPT0gSW5wdXRUeXBlOjpUaW1lIHx8IF92 aWV3LmZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGUgPT0gSW5wdXRUeXBlOjpE YXRlVGltZUxvY2FsKSkgewotICAgICAgICBbX3ZpZXcgcHJlc2VydmVGb2N1c107Ci0gICAgICAg IF9wcmVzZXJ2aW5nRm9jdXMgPSBZRVM7Ci0gICAgfQotICAgIAorICAgIGF1dG8gZWxlbWVudFR5 cGUgPSBfdmlldy5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBlOworICAgIGlm IChlbGVtZW50VHlwZSA9PSBJbnB1dFR5cGU6OlRpbWUgfHwgZWxlbWVudFR5cGUgPT0gSW5wdXRU eXBlOjpEYXRlVGltZUxvY2FsKQorICAgICAgICBbX3ZpZXcgc3RhcnRSZWxpbnF1aXNoaW5nRmly c3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVtZW50XTsKKwogICAgIC8vIFNldCB0aGUgdGltZSB6b25l IGluIGNhc2UgaXQgY2hhbmdlZC4KICAgICBfZGF0ZVBpY2tlci5nZXQoKS50aW1lWm9uZSA9IFtO U1RpbWVab25lIGxvY2FsVGltZVpvbmVdOwogCkBAIC00MTMsMTAgKzQxMiw5IEBAIC0gKFdLRGF0 ZVRpbWVDb250ZXh0TWVudVZpZXdDb250cm9sbGVyICopdmlld0NvbnRyb2xsZXIKIC0gKHZvaWQp Y29udHJvbEVuZEVkaXRpbmcKIHsKICAgICBfcHJlc2VudGluZyA9IE5POwotICAgIGlmIChfcHJl c2VydmluZ0ZvY3VzKSB7Ci0gICAgICAgIFtfdmlldyByZWxlYXNlRm9jdXNdOwotICAgICAgICBf cHJlc2VydmluZ0ZvY3VzID0gTk87Ci0gICAgfQorCisgICAgW192aWV3IHN0b3BSZWxpbnF1aXNo aW5nRmlyc3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVtZW50XTsKKwogI2lmIFVTRShVSUNPTlRFWFRN RU5VKQogICAgIFtzZWxmIHJlbW92ZUNvbnRleHRNZW51SW50ZXJhY3Rpb25dOwogI2VuZGlmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtUG9wb3Zl ci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1Qb3BvdmVyLm1t CmluZGV4IDYzMTljOTUxOGQ4MzA5MGQ4YjYwYjg3ZDY1ZWRlNzM1YzE4YjgyNGIuLjQ0MmU3NzFj ODAwOTY2YmE5ZWNmNDNlYTc0ZmExZmE1MTZlMzMzZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1Qb3BvdmVyLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1Qb3BvdmVyLm1tCkBAIC0xMzQsMTAgKzEzNCw3 IEBAIC0gKFVJUG9wb3ZlckFycm93RGlyZWN0aW9uKXBvcG92ZXJBcnJvd0RpcmVjdGlvbnMKIC0g KHZvaWQpcHJlc2VudFBvcG92ZXJBbmltYXRlZDooQk9PTClhbmltYXRlZAogewogI2lmIFBMQVRG T1JNKE1BQ0NBVEFMWVNUKQotICAgIGlmICghX2lzUHJlc2VydmluZ0ZvY3VzKSB7Ci0gICAgICAg IF9pc1ByZXNlcnZpbmdGb2N1cyA9IFlFUzsKLSAgICAgICAgW192aWV3IHByZXNlcnZlRm9jdXNd OwotICAgIH0KKyAgICBbX3ZpZXcgc3RhcnRSZWxpbnF1aXNoaW5nRmlyc3RSZXNwb25kZXJUb0Zv Y3VzZWRFbGVtZW50XTsKICNlbmRpZgogCiAgICAgVUlQb3BvdmVyQXJyb3dEaXJlY3Rpb24gZGly ZWN0aW9ucyA9IFtzZWxmIHBvcG92ZXJBcnJvd0RpcmVjdGlvbnNdOwpAQCAtMTYxLDEwICsxNTgs NyBAQCAtICh2b2lkKXByZXNlbnRQb3BvdmVyQW5pbWF0ZWQ6KEJPT0wpYW5pbWF0ZWQKIC0gKHZv aWQpZGlzbWlzc1BvcG92ZXJBbmltYXRlZDooQk9PTClhbmltYXRlZAogewogI2lmIFBMQVRGT1JN KE1BQ0NBVEFMWVNUKQotICAgIGlmIChfaXNQcmVzZXJ2aW5nRm9jdXMpIHsKLSAgICAgICAgX2lz UHJlc2VydmluZ0ZvY3VzID0gTk87Ci0gICAgICAgIFtfdmlldyByZWxlYXNlRm9jdXNdOwotICAg IH0KKyAgICBbX3ZpZXcgc3RvcFJlbGlucXVpc2hpbmdGaXJzdFJlc3BvbmRlclRvRm9jdXNlZEVs ZW1lbnRdOwogI2VuZGlmCiAKICAgICBbX3BvcG92ZXJDb250cm9sbGVyIGRpc21pc3NQb3BvdmVy QW5pbWF0ZWQ6YW5pbWF0ZWRdOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJjMGMzYjQzYWZkNzUyMGEyM2EzMzlmMjAyNjg0 NDM2M2NjYzc0M2QuLmYwMTIwMGZkNjUxNWFjMGNjZTE5ZWEzMzE5YWQ4MzNiNTdhZTNkOGQgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyMiBAQAorMjAyMC0wNy0wOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjU5ODQwKTogUHJlc3Npbmcg RXNjIG9yIOKMmCsiLiIgZG9lcyBub3QgZGlzbWlzcyB0aW1lIHBpY2tlciBvbiBpT1MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDEyMgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNjQ5NDA0ODc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2Zvcm1zL2lvcy9kaXNtaXNzLXBpY2tlci11c2lu Zy1rZXlib2FyZC5odG1sOgorICAgICAgICAqIGZhc3QvZm9ybXMvaW9zL2ZvcmNlLWdyZWdvcmlh bi1jYWxlbmRhci1mb3ItY3JlZGl0LWNhcmQtZXhwaXJ5Lmh0bWw6CisgICAgICAgICogZmFzdC9m b3Jtcy9pb3MvdGltZS1waWNrZXItdmFsdWUtY2hhbmdlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiBmYXN0L2Zvcm1zL2lvcy90aW1lLXBpY2tlci12YWx1ZS1jaGFuZ2UuaHRtbDoKKworICAgICAg ICBBZGp1c3QgYSBmZXcgbGF5b3V0IHRlc3RzIHRvIGJlIGNvbXBhdGlibGUgd2l0aCBkYXRlIGFu ZCB0aW1lIGlucHV0cy4KKworICAgICAgICAqIHJlc291cmNlcy91aS1oZWxwZXIuanM6CisgICAg ICAgICh3aW5kb3cuVUlIZWxwZXIud2FpdEZvcklucHV0U2Vzc2lvblRvRGlzbWlzcy5yZXR1cm4u bmV3LlByb21pc2UpOgorICAgICAgICAod2luZG93LlVJSGVscGVyLndhaXRGb3JJbnB1dFNlc3Np b25Ub0Rpc21pc3MpOgorCiAyMDIwLTA3LTA5ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhA YXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIE9jY2FzaW9uYWwgY3Jhc2ggdW5kZXIgLVtVSVZp ZXcgX3NldFZpZXdEZWxlZ2F0ZTpdIHdoZW4gcHJlc2VudGluZyBkYXRlIGFuZCB0aW1lIHBpY2tl cnMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW9zL2Rpc21pc3MtcGlja2Vy LXVzaW5nLWtleWJvYXJkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2lvcy9kaXNtaXNz LXBpY2tlci11c2luZy1rZXlib2FyZC5odG1sCmluZGV4IGE1MmZkODFjYzM3ZmE4ZDBiNzU0OTIx YmI0ODRmYzEwZjMyYTkzN2MuLjFiMWJlNjA4MzBiZmUwYThkODM3ZGUxMjAwNDViNGE0YmJmN2Y0 ZjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW9zL2Rpc21pc3MtcGlja2Vy LXVzaW5nLWtleWJvYXJkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pb3MvZGlz bWlzcy1waWNrZXItdXNpbmcta2V5Ym9hcmQuaHRtbApAQCAtMSw1ICsxLDYgQEAKLTwhRE9DVFlQ RSBodG1sPgorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgdXNlRmxl eGlibGVWaWV3cG9ydD10cnVlIF0gLS0+CiA8aHRtbD4KKzxtZXRhIG5hbWU9InZpZXdwb3J0IiBj b250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MSwgdXNlci1zY2FsYWJs ZT1ubyI+CiA8aGVhZD4KIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC5q cyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5q cyI+PC9zY3JpcHQ+CkBAIC02OSw3ICs3MCw3IEBAIGFzeW5jIGZ1bmN0aW9uIHJ1blRlc3QoKQog ICAgICAgICAgICAgZGVidWcoYDxicj5Gb3IgJHtlbGVtZW50VG9UZXN0LmRhdGFzZXQudGVzdE5h bWV9OmApOwogICAgICAgICAgICAgbGV0IGV4cGVjdGVkVmFsdWUgPSBlbGVtZW50VG9UZXN0LnZh bHVlOwogICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuYWN0aXZhdGVFbGVtZW50QW5kV2FpdEZv cklucHV0U2Vzc2lvbihlbGVtZW50VG9UZXN0KTsKLSAgICAgICAgICAgIFVJSGVscGVyLmtleURv d24oa2V5Q29tbWFuZC5rZXksIGtleUNvbW1hbmQubW9kaWZpZXJzKTsKKyAgICAgICAgICAgIGF3 YWl0IFVJSGVscGVyLmtleURvd24oa2V5Q29tbWFuZC5rZXksIGtleUNvbW1hbmQubW9kaWZpZXJz KTsKICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JJbnB1dFNlc3Npb25Ub0Rpc21p c3MoKTsKICAgICAgICAgICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygiZWxlbWVudFRvVGVzdC52 YWx1ZSIsIGV4cGVjdGVkVmFsdWUpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2Zvcm1zL2lvcy9mb3JjZS1ncmVnb3JpYW4tY2FsZW5kYXItZm9yLWNyZWRpdC1jYXJk LWV4cGlyeS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pb3MvZm9yY2UtZ3JlZ29yaWFu LWNhbGVuZGFyLWZvci1jcmVkaXQtY2FyZC1leHBpcnkuaHRtbAppbmRleCBlYjk3MWNjYjY2ZWM1 ZGMwMmY5MTBlODE3YzcwMWIzN2UwZTQxNDZmLi5jYzg0MjNmMDE1NmI2MmExMGViZjZhZjEwYWY0 ZDNhOGM5OTZmMWQ4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2lvcy9mb3Jj ZS1ncmVnb3JpYW4tY2FsZW5kYXItZm9yLWNyZWRpdC1jYXJkLWV4cGlyeS5odG1sCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvZm9ybXMvaW9zL2ZvcmNlLWdyZWdvcmlhbi1jYWxlbmRhci1mb3ItY3Jl ZGl0LWNhcmQtZXhwaXJ5Lmh0bWwKQEAgLTEsNSArMSw2IEBACi08IURPQ1RZUEUgaHRtbD4KKzwh RE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3Bv cnQ9dHJ1ZSBdIC0tPgogPGh0bWw+Cis8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lk dGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEsIHVzZXItc2NhbGFibGU9bm8iPgogPGhl YWQ+CiAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwv c2NyaXB0PgogICAgIDxtZXRhIG5hbWU9dmlld3BvcnQgY29udGVudD0id2lkdGg9ZGV2aWNlLXdp ZHRoIj4KQEAgLTQ2LDExICs0NywxMiBAQAogICAgICAgICAgICAgICAgIGNvbnN0IFtjYWxlbmRh ciwgbG9jYWxlXSA9IGNhbGVuZGFyQW5kTG9jYWxlOwogICAgICAgICAgICAgICAgIGF3YWl0IFVJ SGVscGVyLnNldERlZmF1bHRDYWxlbmRhclR5cGUoY2FsZW5kYXIsIGxvY2FsZSk7CiAgICAgICAg ICAgICAgICAgZm9yIChjb25zdCBlbGVtZW50IG9mIFt0YXJnZXQwLCB0YXJnZXQxXSkgewotICAg ICAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5hY3RpdmF0ZUZvcm1Db250cm9sKGVsZW1l bnQpOworICAgICAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5hY3RpdmF0ZUVsZW1lbnRB bmRXYWl0Rm9ySW5wdXRTZXNzaW9uKGVsZW1lbnQpOwogICAgICAgICAgICAgICAgICAgICBjb25z dCBpc0NyZWRpdENhcmRGaWVsZCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKCJhdXRvY29tcGxldGUi KSA9PT0gImNjLWV4cCI7CiAgICAgICAgICAgICAgICAgICAgIGFwcGVuZE91dHB1dChgRGF0ZSBp bnB1dCBjb250cm9sJHtpc0NyZWRpdENhcmRGaWVsZCA/ICIiIDogIiBub3QifSBtYXJrZWQgYXMg J2NjLWV4cCcgKGRlZmF1bHQgY2FsZW5kYXIgc2V0IHRvICR7Y2FsZW5kYXJ9KTpgKTsKICAgICAg ICAgICAgICAgICAgICAgYXBwZW5kT3V0cHV0KGB7IGNhbGVuZGFyVHlwZSA9ICR7YXdhaXQgVUlI ZWxwZXIuY2FsZW5kYXJUeXBlKCl9IH1gKTsKLSAgICAgICAgICAgICAgICAgICAgYXdhaXQgVUlI ZWxwZXIuZGVhY3RpdmF0ZUZvcm1Db250cm9sKGVsZW1lbnQpOworICAgICAgICAgICAgICAgICAg ICBlbGVtZW50LmJsdXIoKTsKKyAgICAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIud2Fp dEZvcklucHV0U2Vzc2lvblRvRGlzbWlzcyhlbGVtZW50KTsKICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW9zL3Rp bWUtcGlja2VyLXZhbHVlLWNoYW5nZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL2lvcy90aW1lLXBpY2tlci12YWx1ZS1jaGFuZ2UtZXhwZWN0ZWQudHh0CmluZGV4IGE0Mzg5 YzU4Zjc3ZGQ5YjMxOGE3ZTdkZTMyNGUwMjliNjI4M2Q3OTIuLmUxMGIzNWIzZWUzZDA1MDRmOTNm YWE3ZGI1YWEyMWJmNDM4M2FkZjggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMv aW9zL3RpbWUtcGlja2VyLXZhbHVlLWNoYW5nZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy9pb3MvdGltZS1waWNrZXItdmFsdWUtY2hhbmdlLWV4cGVjdGVkLnR4dApA QCAtNyw2ICs3LDcgQEAgUEFTUyBIYW5kbGVkIGNoYW5nZSBldmVudAogUEFTUyBIYW5kbGVkIGJs dXIgZXZlbnQKIFBBU1MgcGlja2VyVmFsdWVzLmhvdXIgaXMgOQogUEFTUyBwaWNrZXJWYWx1ZXMu bWludXRlIGlzIDQxCitQQVNTIEhhbmRsZWQgYmx1ciBldmVudAogUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQogCiBURVNUIENPTVBMRVRFCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2Zvcm1zL2lvcy90aW1lLXBpY2tlci12YWx1ZS1jaGFuZ2UuaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvZm9ybXMvaW9zL3RpbWUtcGlja2VyLXZhbHVlLWNoYW5nZS5odG1sCmluZGV4IGVkNGIy ODJhOGM4YjQ0Mzc1ZjJmM2YxOTQyMWE1NzYxYmQwODA5MzkuLjk4ZmEyNDU2MzllNjA4MGJkZWNh ZWQ0MjY0YjVmYTBhOTI5MWJlM2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMv aW9zL3RpbWUtcGlja2VyLXZhbHVlLWNoYW5nZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv Zm9ybXMvaW9zL3RpbWUtcGlja2VyLXZhbHVlLWNoYW5nZS5odG1sCkBAIC0yMCwxMiArMjAsMTQg QEAgYXN5bmMgZnVuY3Rpb24gcnVuVGVzdCgpIHsKICAgICBhd2FpdCBVSUhlbHBlci5hY3RpdmF0 ZUVsZW1lbnRBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uKHRpbWUpOwogICAgIGF3YWl0IFVJSGVscGVy LnNldFRpbWVQaWNrZXJWYWx1ZSg5LCA0MSk7CiAgICAgYXdhaXQgVUlIZWxwZXIuZGlzbWlzc0Zv cm1BY2Nlc3NvcnlWaWV3KCk7Ci0gICAgYXdhaXQgVUlIZWxwZXIud2FpdEZvcktleWJvYXJkVG9I aWRlKCk7CisgICAgYXdhaXQgVUlIZWxwZXIud2FpdEZvcklucHV0U2Vzc2lvblRvRGlzbWlzcygp OwogICAgIGF3YWl0IFVJSGVscGVyLmFjdGl2YXRlRWxlbWVudEFuZFdhaXRGb3JJbnB1dFNlc3Np b24odGltZSk7CiAgICAgcGlja2VyVmFsdWVzID0gYXdhaXQgVUlIZWxwZXIudGltZXJQaWNrZXJW YWx1ZXMoKTsKIAogICAgIHNob3VsZEJlKCJwaWNrZXJWYWx1ZXMuaG91ciIsICI5Iik7CiAgICAg c2hvdWxkQmUoInBpY2tlclZhbHVlcy5taW51dGUiLCAiNDEiKTsKKyAgICBhd2FpdCBVSUhlbHBl ci5kaXNtaXNzRm9ybUFjY2Vzc29yeVZpZXcoKTsKKyAgICBhd2FpdCBVSUhlbHBlci53YWl0Rm9y SW5wdXRTZXNzaW9uVG9EaXNtaXNzKCk7CiAgICAgZmluaXNoSlNUZXN0KCk7CiB9CiA8L3Njcmlw dD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMgYi9MYXlv dXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCmluZGV4IDFmNWVmYWJkYzM2MWI2ZWY5ODQ1 OGNhNmM4ZTdhNTc5ZjYyNzRkODMuLjdlNTNlZmY3ZDNmMTlhMDAzNTQyZmQwMzk4MjY4MDBmYzNi YmQyNGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMKKysr IGIvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcwpAQCAtNDY2LDEyICs0NjYsMTgg QEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogICAgICAgICByZXR1cm4gbmV3 IFByb21pc2UocmVzb2x2ZSA9PiB7CiAgICAgICAgICAgICB0ZXN0UnVubmVyLnJ1blVJU2NyaXB0 KGAKICAgICAgICAgICAgICAgICAoZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgIGlm ICghdWlDb250cm9sbGVyLmlzU2hvd2luZ0tleWJvYXJkICYmICF1aUNvbnRyb2xsZXIuaXNTaG93 aW5nQ29udGV4dE1lbnUgJiYgIXVpQ29udHJvbGxlci5pc1Nob3dpbmdQb3BvdmVyKSB7CisgICAg ICAgICAgICAgICAgICAgICAgICB1aUNvbnRyb2xsZXIudWlTY3JpcHRDb21wbGV0ZSgpOworICAg ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgICAgICB9CisKICAg ICAgICAgICAgICAgICAgICAgZnVuY3Rpb24gY2xlYXJDYWxsYmFja3NBbmRTY3JpcHRDb21wbGV0 ZSgpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci5kaWRIaWRlS2V5Ym9h cmRDYWxsYmFjayA9IG51bGw7CiAgICAgICAgICAgICAgICAgICAgICAgICB1aUNvbnRyb2xsZXIu ZGlkRGlzbWlzc1BvcG92ZXJDYWxsYmFjayA9IG51bGw7CiAgICAgICAgICAgICAgICAgICAgICAg ICB1aUNvbnRyb2xsZXIuZGlkSGlkZUNvbnRleHRNZW51Q2FsbGJhY2sgPSBudWxsOwogICAgICAg ICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLnVpU2NyaXB0Q29tcGxldGUoKTsKICAgICAg ICAgICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci5kaWRI aWRlS2V5Ym9hcmRDYWxsYmFjayA9IGNsZWFyQ2FsbGJhY2tzQW5kU2NyaXB0Q29tcGxldGU7CiAg ICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci5kaWREaXNtaXNzUG9wb3ZlckNhbGxiYWNr ID0gY2xlYXJDYWxsYmFja3NBbmRTY3JpcHRDb21wbGV0ZTsKICAgICAgICAgICAgICAgICAgICAg dWlDb250cm9sbGVyLmRpZEhpZGVDb250ZXh0TWVudUNhbGxiYWNrID0gY2xlYXJDYWxsYmFja3NB bmRTY3JpcHRDb21wbGV0ZTsK