212495 2020-05-28 15:12:19 -0700 watchOS: Upstream WKTextInputListViewController 2020-05-28 16:06:54 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard webkit-bug-importer wenson_hsieh oldest_to_newest 1657041 0 jbedard 2020-05-28 15:12:19 -0700 WKTextInputListViewController should be upstreamed from WebKitAdditions. 1657043 1 jbedard 2020-05-28 15:13:07 -0700 <rdar://problem/63733949> 1657046 2 400514 jbedard 2020-05-28 15:22:53 -0700 Created attachment 400514 Patch 1657074 3 ews-feeder 2020-05-28 16:06:54 -0700 Committed r262271: <https://trac.webkit.org/changeset/262271> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400514. 400514 2020-05-28 15:22:53 -0700 2020-05-28 16:06:54 -0700 Patch bug-212495-20200528152252.patch text/plain 11286 jbedard SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjIyNjEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA1LTI4ICBKb25hdGhhbiBC ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICB3YXRjaE9TOiBVcHN0cmVhbSBX S1RleHRJbnB1dExpc3RWaWV3Q29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyNDk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82Mzcz Mzk0OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tUZXh0SW5wdXRMaXN0Vmlld0NvbnRyb2xsZXIuaDogTW92 ZWQgZnJvbSBXZWJLaXRBZGRpdGlvbnMuCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S1RleHRJbnB1dExpc3RWaWV3Q29udHJvbGxlci5tbTogRGl0dG8uCisKIDIwMjAtMDUtMjggIE1l Z2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBEbyBub3Qg c2VuZCBhIHNlY29uZCBzeW5jIHJlcXVlc3QgZm9yIHBvc2l0aXRpb24gaW5mb3JtYXRpb24gdG8g dGhlIHdlYiBwcm9jZXNzIGlmIHdlIGhhdmUgbm90IHJlY2lldmVkIGluZm9ybWF0aW9uIHNpbmNl IHRoZSBwcmV2aW91cyBzeW5jIHJlcXVlc3QuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvZm9ybXMvV0tUZXh0SW5wdXRMaXN0Vmlld0NvbnRyb2xsZXIuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tUZXh0SW5wdXRMaXN0Vmlld0Nv bnRyb2xsZXIuaAkocmV2aXNpb24gMjYyMjUyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL2Zvcm1zL1dLVGV4dElucHV0TGlzdFZpZXdDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAyMCBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI1LDYg KzI1LDQyIEBACiAKICNwcmFnbWEgb25jZQogCi0jaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykK LSNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9XS1RleHRJbnB1dExpc3RWaWV3Q29udHJvbGxlckFk ZGl0aW9ucy5oPgotI2VuZGlmCisjaWYgUExBVEZPUk0oV0FUQ0hPUykKKworI2ltcG9ydCAiV0tR dWlja2JvYXJkTGlzdFZpZXdDb250cm9sbGVyLmgiCisKK3R5cGVkZWYgTlNfRU5VTShOU0ludGVn ZXIsIFdLTnVtYmVyUGFkSW5wdXRNb2RlKSB7CisgICAgV0tOdW1iZXJQYWRJbnB1dE1vZGVOb25l LAorICAgIFdLTnVtYmVyUGFkSW5wdXRNb2RlTnVtYmVyc0FuZFN5bWJvbHMsCisgICAgV0tOdW1i ZXJQYWRJbnB1dE1vZGVUZWxlcGhvbmUsCisgICAgV0tOdW1iZXJQYWRJbnB1dE1vZGVOdW1iZXJz T25seQorfTsKKworQGNsYXNzIFdLVGV4dElucHV0TGlzdFZpZXdDb250cm9sbGVyOworCitAcHJv dG9jb2wgV0tUZXh0SW5wdXRMaXN0Vmlld0NvbnRyb2xsZXJEZWxlZ2F0ZSA8V0tRdWlja2JvYXJk Vmlld0NvbnRyb2xsZXJEZWxlZ2F0ZT4KKworLSAoV0tOdW1iZXJQYWRJbnB1dE1vZGUpbnVtZXJp Y0lucHV0TW9kZUZvckxpc3RWaWV3Q29udHJvbGxlcjooV0tUZXh0SW5wdXRMaXN0Vmlld0NvbnRy b2xsZXIgKiljb250cm9sbGVyOworLSAoTlNTdHJpbmcgKil0ZXh0Q29udGVudFR5cGVGb3JMaXN0 Vmlld0NvbnRyb2xsZXI6KFdLVGV4dElucHV0TGlzdFZpZXdDb250cm9sbGVyICopY29udHJvbGxl cjsKKy0gKE5TQXJyYXk8VUlUZXh0U3VnZ2VzdGlvbiAqPiAqKXRleHRTdWdnZXN0aW9uc0Zvckxp c3RWaWV3Q29udHJvbGxlcjooV0tUZXh0SW5wdXRMaXN0Vmlld0NvbnRyb2xsZXIgKiljb250cm9s bGVyOworLSAodm9pZClsaXN0Vmlld0NvbnRyb2xsZXI6KFdLVGV4dElucHV0TGlzdFZpZXdDb250 cm9sbGVyICopY29udHJvbGxlciBkaWRTZWxlY3RUZXh0U3VnZ2VzdGlvbjooVUlUZXh0U3VnZ2Vz dGlvbiAqKXN1Z2dlc3Rpb247CistIChCT09MKWFsbG93c0RpY3RhdGlvbklucHV0Rm9yTGlzdFZp ZXdDb250cm9sbGVyOihQVUlDUXVpY2tib2FyZFZpZXdDb250cm9sbGVyICopY29udHJvbGxlcjsK KworQGVuZAorCitAaW50ZXJmYWNlIFdLVGV4dElucHV0TGlzdFZpZXdDb250cm9sbGVyIDogV0tR dWlja2JvYXJkTGlzdFZpZXdDb250cm9sbGVyCisKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aERl bGVnYXRlOihpZCA8V0tUZXh0SW5wdXRMaXN0Vmlld0NvbnRyb2xsZXJEZWxlZ2F0ZT4pZGVsZWdh dGUgTlNfREVTSUdOQVRFRF9JTklUSUFMSVpFUjsKKy0gKHZvaWQpcmVsb2FkVGV4dFN1Z2dlc3Rp b25zOworCitAcHJvcGVydHkgKG5vbmF0b21pYywgd2VhaykgaWQgPFdLVGV4dElucHV0TGlzdFZp ZXdDb250cm9sbGVyRGVsZWdhdGU+IGRlbGVnYXRlOworCitAZW5kCisKK0BpbnRlcmZhY2UgV0tU ZXh0SW5wdXRMaXN0Vmlld0NvbnRyb2xsZXIgKFRlc3RpbmcpCisKKy0gKHZvaWQpZW50ZXJUZXh0 OihOU1N0cmluZyAqKXRleHQ7CisKK0BlbmQKKworI2VuZGlmIC8vIFBMQVRGT1JNKFdBVENIT1Mp CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tUZXh0SW5wdXRMaXN0 Vmlld0NvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL2Zvcm1zL1dLVGV4dElucHV0TGlzdFZpZXdDb250cm9sbGVyLm1tCShyZXZpc2lvbiAyNjIy NTIpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tUZXh0SW5wdXRMaXN0 Vmlld0NvbnRyb2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICog Q29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENv cHlyaWdodCAoQykgMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDYgKzI2LDE5NSBAQAogI2ltcG9ydCAiY29u ZmlnLmgiCiAjaW1wb3J0ICJXS1RleHRJbnB1dExpc3RWaWV3Q29udHJvbGxlci5oIgogCi0jaWYg VVNFKEFQUExFX0lOVEVSTkFMX1NESykKLSNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9XS1RleHRJ bnB1dExpc3RWaWV3Q29udHJvbGxlckFkZGl0aW9ucy5tbT4KKyNpZiBQTEFURk9STShXQVRDSE9T KQorCisjaW1wb3J0ICJXS051bWJlclBhZFZpZXdDb250cm9sbGVyLmgiCisjaW1wb3J0IDxQZXBw ZXJVSUNvcmUvUFVJQ1F1aWNrYm9hcmRBcm91ZXRWaWV3Q29udHJvbGxlci5oPgorI2ltcG9ydCA8 UGVwcGVyVUlDb3JlL1BVSUNRdWlja2JvYXJkTGlzdFZpZXdDb250cm9sbGVyU3ViY2xhc3MuaD4K KyNpbXBvcnQgPFBlcHBlclVJQ29yZS9QVUlDUXVpY2tib2FyZExpc3RWaWV3U3BlY3MuaD4KKyNp bXBvcnQgPFBlcHBlclVJQ29yZS9QVUlDUmVzb3VyY2VzLmg+CisjaW1wb3J0IDxQZXBwZXJVSUNv cmUvUFVJQ1RhYmxlVmlldy5oPgorI2ltcG9ydCA8UGVwcGVyVUlDb3JlL1BVSUNUYWJsZVZpZXdD ZWxsLmg+CisjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CisKKyNpZiBIQVZFKFFVSUNLQk9BUkRf Q09MTEVDVElPTl9WSUVXUykKKyNpbXBvcnQgPFBlcHBlclVJQ29yZS9QVUlDUXVpY2tib2FyZExp c3RDb2xsZWN0aW9uVmlld0l0ZW1DZWxsLmg+CiAjZW5kaWYKKworc3RhdGljIGNvbnN0IENHRmxv YXQgdGV4dFN1Z2dlc3Rpb25CdXR0b25IZWlnaHQgPSA0NDsKK3N0YXRpYyBjb25zdCBDR0Zsb2F0 IHRleHRTdWdnZXN0aW9uTGFiZWxIb3Jpem9udGFsTWFyZ2luID0gOTsKK3N0YXRpYyBOU1N0cmlu ZyAqdGV4dFN1Z2dlc3Rpb25DZWxsUmV1c2VJZGVudGlmaWVyID0gQCJXZWJLaXRRdWlja2JvYXJk VGV4dFN1Z2dlc3Rpb25DZWxsIjsKKworQGltcGxlbWVudGF0aW9uIFdLVGV4dElucHV0TGlzdFZp ZXdDb250cm9sbGVyIHsKKyAgICBSZXRhaW5QdHI8V0tOdW1iZXJQYWRWaWV3Q29udHJvbGxlcj4g X251bWJlclBhZFZpZXdDb250cm9sbGVyOworfQorCitAZHluYW1pYyBkZWxlZ2F0ZTsKKworLSAo aW5zdGFuY2V0eXBlKWluaXRXaXRoRGVsZWdhdGU6KGlkIDxXS1RleHRJbnB1dExpc3RWaWV3Q29u dHJvbGxlckRlbGVnYXRlPilkZWxlZ2F0ZQoreworICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5p dFdpdGhEZWxlZ2F0ZTpkZWxlZ2F0ZV0pKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgc2Vs Zi50ZXh0Q29udGVudFR5cGUgPSBbc2VsZi5kZWxlZ2F0ZSB0ZXh0Q29udGVudFR5cGVGb3JMaXN0 Vmlld0NvbnRyb2xsZXI6c2VsZl07CisgICAgcmV0dXJuIHNlbGY7Cit9CisKKy0gKHZvaWQpd2ls bFByZXNlbnRBcm91ZXRWaWV3Q29udHJvbGxlcjooUFVJQ1F1aWNrYm9hcmRBcm91ZXRWaWV3Q29u dHJvbGxlciAqKXF1aWNrYm9hcmQKK3sKKyAgICBOU1N0cmluZyAqaW5pdGlhbFRleHQgPSBbc2Vs Zi5kZWxlZ2F0ZSBpbml0aWFsVmFsdWVGb3JWaWV3Q29udHJvbGxlcjpzZWxmXTsKKyAgICBpZiAo aW5pdGlhbFRleHQubGVuZ3RoKQorICAgICAgICBbcXVpY2tib2FyZCBzZXRJbnB1dFRleHQ6aW5p dGlhbFRleHQgc2VsZWN0aW9uUmFuZ2U6TlNNYWtlUmFuZ2UoaW5pdGlhbFRleHQubGVuZ3RoLCAw KV07CisKKyAgICBxdWlja2JvYXJkLm1pblRleHRMZW5ndGhGb3JFbmFibGluZ0FjY2VwdCA9IDA7 Cit9CisKKy0gKE5TQXJyYXkgKilhZGRpdGlvbmFsVHJheUJ1dHRvbnMKK3sKKyAgICBpZiAoW3Nl bGYuZGVsZWdhdGUgbnVtZXJpY0lucHV0TW9kZUZvckxpc3RWaWV3Q29udHJvbGxlcjpzZWxmXSA9 PSBXS051bWJlclBhZElucHV0TW9kZU5vbmUpCisgICAgICAgIHJldHVybiBAWyBdOworCisgICAg VUlJbWFnZSAqbnVtYmVyUGFkQnV0dG9uSWNvbiA9IFtQVUlDUmVzb3VyY2VzIGltYWdlTmFtZWQ6 QCJRdWlja2JvYXJkQWRkUGhvbmVOdW1iZXIiIGluQnVuZGxlOltOU0J1bmRsZSBidW5kbGVXaXRo SWRlbnRpZmllcjpAImNvbS5hcHBsZS5QZXBwZXJVSUNvcmUiXSBzaG91bGRDYWNoZTpZRVNdOwor CisgICAgYXV0byBudW1iZXJQYWRCdXR0b24gPSBhZG9wdE5TKFtbUFVJQ1F1aWNrYm9hcmRMaXN0 VHJheUJ1dHRvbiBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvIHRpbnRDb2xvcjpuaWwg ZGVmYXVsdEhlaWdodDpzZWxmLnNwZWNzLmRlZmF1bHRCdXR0b25IZWlnaHRdKTsKKyAgICBbbnVt YmVyUGFkQnV0dG9uIHNldEltYWdlOm51bWJlclBhZEJ1dHRvbkljb24gZm9yU3RhdGU6VUlDb250 cm9sU3RhdGVOb3JtYWxdOworICAgIFtudW1iZXJQYWRCdXR0b24gYWRkVGFyZ2V0OnNlbGYgYWN0 aW9uOkBzZWxlY3RvcihwcmVzZW50TnVtYmVyUGFkVmlld0NvbnRyb2xsZXIpIGZvckNvbnRyb2xF dmVudHM6VUlDb250cm9sRXZlbnRUb3VjaFVwSW5zaWRlXTsKKyAgICByZXR1cm4gQFsgbnVtYmVy UGFkQnV0dG9uLmdldCgpIF07Cit9CisKKy0gKHZvaWQpcHJlc2VudE51bWJlclBhZFZpZXdDb250 cm9sbGVyCit7CisgICAgaWYgKF9udW1iZXJQYWRWaWV3Q29udHJvbGxlcikKKyAgICAgICAgcmV0 dXJuOworCisgICAgV0tOdW1iZXJQYWRJbnB1dE1vZGUgbW9kZSA9IFtzZWxmLmRlbGVnYXRlIG51 bWVyaWNJbnB1dE1vZGVGb3JMaXN0Vmlld0NvbnRyb2xsZXI6c2VsZl07CisgICAgaWYgKG1vZGUg PT0gV0tOdW1iZXJQYWRJbnB1dE1vZGVOb25lKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgTlNTdHJpbmcgKmluaXRpYWxUZXh0 ID0gW3NlbGYuZGVsZWdhdGUgaW5pdGlhbFZhbHVlRm9yVmlld0NvbnRyb2xsZXI6c2VsZl07Cisg ICAgX251bWJlclBhZFZpZXdDb250cm9sbGVyID0gYWRvcHROUyhbW1dLTnVtYmVyUGFkVmlld0Nv bnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoRGVsZWdhdGU6c2VsZi5kZWxlZ2F0ZSBpbml0aWFsVGV4 dDppbml0aWFsVGV4dCBpbnB1dE1vZGU6bW9kZV0pOworICAgIFtzZWxmIHByZXNlbnRWaWV3Q29u dHJvbGxlcjpfbnVtYmVyUGFkVmlld0NvbnRyb2xsZXIuZ2V0KCkgYW5pbWF0ZWQ6WUVTIGNvbXBs ZXRpb246bmlsXTsKK30KKworLSAodm9pZClyZWxvYWRUZXh0U3VnZ2VzdGlvbnMKK3sKKyAgICBb c2VsZiByZWxvYWRMaXN0SXRlbXNdOworfQorCistICh2b2lkKWVudGVyVGV4dDooTlNTdHJpbmcg Kil0ZXh0Cit7CisgICAgW3NlbGYuZGVsZWdhdGUgcXVpY2tib2FyZDpzZWxmIHRleHRFbnRlcmVk OltbW05TQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdFdpdGhTdHJpbmc6dGV4dF0gYXV0b3Jl bGVhc2VdXTsKK30KKworI3ByYWdtYSBtYXJrIC0gUXVpY2tib2FyZCBzdWJjbGFzc2luZworCist IChCT09MKXN1cHBvcnRzRGljdGF0aW9uSW5wdXQKK3sKKyAgICByZXR1cm4gW3NlbGYuZGVsZWdh dGUgYWxsb3dzRGljdGF0aW9uSW5wdXRGb3JMaXN0Vmlld0NvbnRyb2xsZXI6c2VsZl07Cit9CisK Ky0gKHZvaWQpZGlkU2VsZWN0TGlzdEl0ZW1BdEluZGV4UGF0aDooTlNJbmRleFBhdGggKilpbmRl eFBhdGgKK3sKKyAgICBbc2VsZiBfZGlkU2VsZWN0TGlzdEl0ZW06aW5kZXhQYXRoLnJvd107Cit9 CisKKy8vIEZJWE1FOiBUaGlzIG1ldGhvZCBjYW4gYmUgcmVtb3ZlZCB3aGVuIDxyZGFyOi8vcHJv YmxlbS81NzgwNzQ0NT4gbGFuZHMgaW4gYSBidWlsZC4KKy0gKHZvaWQpZGlkU2VsZWN0TGlzdEl0 ZW06KE5TSW50ZWdlcilpdGVtTnVtYmVyCit7CisgICAgW3NlbGYgX2RpZFNlbGVjdExpc3RJdGVt Oml0ZW1OdW1iZXJdOworfQorCistICh2b2lkKV9kaWRTZWxlY3RMaXN0SXRlbTooTlNJbnRlZ2Vy KWl0ZW1OdW1iZXIKK3sKKyAgICBOU0FycmF5PFVJVGV4dFN1Z2dlc3Rpb24gKj4gKnRleHRTdWdn ZXN0aW9ucyA9IFtzZWxmLmRlbGVnYXRlIHRleHRTdWdnZXN0aW9uc0Zvckxpc3RWaWV3Q29udHJv bGxlcjpzZWxmXTsKKyAgICBpZiAodGV4dFN1Z2dlc3Rpb25zLmNvdW50IDw9IHN0YXRpY19jYXN0 PE5TVUludGVnZXI+KGl0ZW1OdW1iZXIpKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgW3NlbGYuZGVsZWdhdGUgbGlzdFZpZXdD b250cm9sbGVyOnNlbGYgZGlkU2VsZWN0VGV4dFN1Z2dlc3Rpb246W3RleHRTdWdnZXN0aW9ucyBv YmplY3RBdEluZGV4Oml0ZW1OdW1iZXJdXTsKK30KKworLSAoTlNJbnRlZ2VyKW51bWJlck9mTGlz dEl0ZW1zCit7CisgICAgcmV0dXJuIFtzZWxmLmRlbGVnYXRlIHRleHRTdWdnZXN0aW9uc0Zvckxp c3RWaWV3Q29udHJvbGxlcjpzZWxmXS5jb3VudDsKK30KKworLSAoQ0dGbG9hdCloZWlnaHRGb3JM aXN0SXRlbTooTlNJbnRlZ2VyKWl0ZW1OdW1iZXIgd2lkdGg6KENHRmxvYXQpd2lkdGgKK3sKKyAg ICByZXR1cm4gdGV4dFN1Z2dlc3Rpb25CdXR0b25IZWlnaHQ7Cit9CisKKy8vIEZJWE1FOiBUaGlz IG1ldGhvZCBjYW4gYmUgcmVtb3ZlZCB3aGVuIDxyZGFyOi8vcHJvYmxlbS81NzgwNzQ0NT4gbGFu ZHMgaW4gYSBidWlsZC4KKy0gKFBVSUNRdWlja2JvYXJkTGlzdEl0ZW1DZWxsICopY2VsbEZvckxp c3RJdGVtOihOU0ludGVnZXIpaXRlbU51bWJlcgoreworICAgIE5TQXJyYXk8VUlUZXh0U3VnZ2Vz dGlvbiAqPiAqdGV4dFN1Z2dlc3Rpb25zID0gW3NlbGYuZGVsZWdhdGUgdGV4dFN1Z2dlc3Rpb25z Rm9yTGlzdFZpZXdDb250cm9sbGVyOnNlbGZdOworICAgIGlmICh0ZXh0U3VnZ2VzdGlvbnMuY291 bnQgPD0gc3RhdGljX2Nhc3Q8TlNVSW50ZWdlcj4oaXRlbU51bWJlcikpIHsKKyAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBuaWw7CisgICAgfQorCisgICAgVUlU ZXh0U3VnZ2VzdGlvbiAqdGV4dFN1Z2dlc3Rpb24gPSBbdGV4dFN1Z2dlc3Rpb25zIG9iamVjdEF0 SW5kZXg6aXRlbU51bWJlcl07CisgICAgYXV0byByZXVzYWJsZUNlbGwgPSByZXRhaW5QdHIoW3Nl bGYubGlzdFZpZXcgZGVxdWV1ZVJldXNhYmxlQ2VsbFdpdGhJZGVudGlmaWVyOnRleHRTdWdnZXN0 aW9uQ2VsbFJldXNlSWRlbnRpZmllcl0pOworICAgIGlmICghcmV1c2FibGVDZWxsKSB7CisgICAg ICAgIHJldXNhYmxlQ2VsbCA9IGFkb3B0TlMoW1tXS1F1aWNrYm9hcmRMaXN0SXRlbUNlbGwgYWxs b2NdIGluaXRXaXRoU3R5bGU6VUlUYWJsZVZpZXdDZWxsU3R5bGVEZWZhdWx0IHJldXNlSWRlbnRp Zmllcjp0ZXh0U3VnZ2VzdGlvbkNlbGxSZXVzZUlkZW50aWZpZXJdKTsKKyAgICAgICAgW3JldXNh YmxlQ2VsbCBpdGVtTGFiZWxdLm51bWJlck9mTGluZXMgPSAxOworICAgICAgICBbcmV1c2FibGVD ZWxsIGl0ZW1MYWJlbF0ubGluZUJyZWFrTW9kZSA9IE5TTGluZUJyZWFrQnlUcnVuY2F0aW5nVGFp bDsKKyAgICAgICAgW3JldXNhYmxlQ2VsbCBpdGVtTGFiZWxdLmFsbG93c0RlZmF1bHRUaWdodGVu aW5nRm9yVHJ1bmNhdGlvbiA9IFlFUzsKKyAgICB9CisKKyAgICBDR0Zsb2F0IHZpZXdXaWR0aCA9 IENHUmVjdEdldFdpZHRoKHNlbGYubGlzdFZpZXcuYm91bmRzKTsKKyAgICBbcmV1c2FibGVDZWxs IGNvbmZpZ3VyZUZvclRleHQ6dGV4dFN1Z2dlc3Rpb24uZGlzcGxheVRleHQgd2lkdGg6dmlld1dp ZHRoXTsKKworICAgIC8vIFRoZSBkZWZhdWx0IGJlaGF2aW9yIG9mIC1jb25maWd1cmVGb3JUZXh0 OndpZHRoOiBjYXVzZXMgdGhlIHRleHQgbGFiZWwgdG8gcnVuIG9mZiB0aGUgZW5kIG9mIHRoZSBj ZWxsLgorICAgIC8vIEFkanVzdCBmb3IgdGhpcyBieSBzaHJpbmtpbmcgdGhlIGxhYmVsIHdpZHRo IHRvIGFjdHVhbGx5IGZpdCB0aGUgYm91bmRzIG9mIHRoZSBjZWxsLgorICAgIFtyZXVzYWJsZUNl bGwgaXRlbUxhYmVsXS5mcmFtZSA9IFVJUmVjdEluc2V0KFtyZXVzYWJsZUNlbGwgY29udGVudFZp ZXddLmJvdW5kcywgMCwgdGV4dFN1Z2dlc3Rpb25MYWJlbEhvcml6b250YWxNYXJnaW4sIDAsIHRl eHRTdWdnZXN0aW9uTGFiZWxIb3Jpem9udGFsTWFyZ2luKTsKKyAgICByZXR1cm4gcmV1c2FibGVD ZWxsLmF1dG9yZWxlYXNlKCk7Cit9CisKKy0gKE5TU3RyaW5nICopbGlzdEl0ZW1DZWxsUmV1c2VJ ZGVudGlmaWVyCit7CisgICAgcmV0dXJuIHRleHRTdWdnZXN0aW9uQ2VsbFJldXNlSWRlbnRpZmll cjsKK30KKworI2lmIEhBVkUoUVVJQ0tCT0FSRF9DT0xMRUNUSU9OX1ZJRVdTKQorCistIChDbGFz cylsaXN0SXRlbUNlbGxDbGFzcworeworICAgIHJldHVybiBbV0tRdWlja2JvYXJkTGlzdENvbGxl Y3Rpb25WaWV3SXRlbUNlbGwgY2xhc3NdOworfQorCistIChQVUlDUXVpY2tib2FyZExpc3RDb2xs ZWN0aW9uVmlld0l0ZW1DZWxsICopaXRlbUNlbGxGb3JMaXN0SXRlbTooTlNJbnRlZ2VyKWl0ZW1O dW1iZXIgZm9ySW5kZXhQYXRoOihOU0luZGV4UGF0aCAqKWluZGV4UGF0aAoreworICAgIE5TQXJy YXk8VUlUZXh0U3VnZ2VzdGlvbiAqPiAqdGV4dFN1Z2dlc3Rpb25zID0gW3NlbGYuZGVsZWdhdGUg dGV4dFN1Z2dlc3Rpb25zRm9yTGlzdFZpZXdDb250cm9sbGVyOnNlbGZdOworICAgIGlmICh0ZXh0 U3VnZ2VzdGlvbnMuY291bnQgPD0gc3RhdGljX2Nhc3Q8TlNVSW50ZWdlcj4oaXRlbU51bWJlcikp IHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBuaWw7Cisg ICAgfQorCisgICAgVUlUZXh0U3VnZ2VzdGlvbiAqdGV4dFN1Z2dlc3Rpb24gPSBbdGV4dFN1Z2dl c3Rpb25zIG9iamVjdEF0SW5kZXg6aXRlbU51bWJlcl07CisgICAgYXV0byByZXVzYWJsZUNlbGwg PSByZXRhaW5QdHIoW3NlbGYuY29sbGVjdGlvblZpZXcgZGVxdWV1ZVJldXNhYmxlQ2VsbFdpdGhS ZXVzZUlkZW50aWZpZXI6dGV4dFN1Z2dlc3Rpb25DZWxsUmV1c2VJZGVudGlmaWVyIGZvckluZGV4 UGF0aDppbmRleFBhdGhdKTsKKworICAgIFtyZXVzYWJsZUNlbGwgYm9keUxhYmVsXS5udW1iZXJP ZkxpbmVzID0gMTsKKyAgICBbcmV1c2FibGVDZWxsIGJvZHlMYWJlbF0ubGluZUJyZWFrTW9kZSA9 IE5TTGluZUJyZWFrQnlUcnVuY2F0aW5nVGFpbDsKKyAgICBbcmV1c2FibGVDZWxsIGJvZHlMYWJl bF0uYWxsb3dzRGVmYXVsdFRpZ2h0ZW5pbmdGb3JUcnVuY2F0aW9uID0gWUVTOworICAgIFtyZXVz YWJsZUNlbGwgc2V0VGV4dDp0ZXh0U3VnZ2VzdGlvbi5kaXNwbGF5VGV4dF07CisKKyAgICAvLyBU aGUgZGVmYXVsdCBiZWhhdmlvciBvZiAtY29uZmlndXJlRm9yVGV4dDp3aWR0aDogY2F1c2VzIHRo ZSB0ZXh0IGxhYmVsIHRvIHJ1biBvZmYgdGhlIGVuZCBvZiB0aGUgY2VsbC4KKyAgICAvLyBBZGp1 c3QgZm9yIHRoaXMgYnkgc2hyaW5raW5nIHRoZSBsYWJlbCB3aWR0aCB0byBhY3R1YWxseSBmaXQg dGhlIGJvdW5kcyBvZiB0aGUgY2VsbC4KKyAgICBbcmV1c2FibGVDZWxsIGJvZHlMYWJlbF0uZnJh bWUgPSBVSVJlY3RJbnNldChbcmV1c2FibGVDZWxsIGNvbnRlbnRWaWV3XS5ib3VuZHMsIDAsIHRl eHRTdWdnZXN0aW9uTGFiZWxIb3Jpem9udGFsTWFyZ2luLCAwLCB0ZXh0U3VnZ2VzdGlvbkxhYmVs SG9yaXpvbnRhbE1hcmdpbik7CisgICAgcmV0dXJuIHJldXNhYmxlQ2VsbC5hdXRvcmVsZWFzZSgp OworfQorCisjZW5kaWYgLy8gSEFWRShRVUlDS0JPQVJEX0NPTExFQ1RJT05fVklFV1MpCisKKy0g KEJPT0wpc3VwcG9ydHNBcm91ZXRJbnB1dAoreworICAgIHJldHVybiBbc2VsZi5kZWxlZ2F0ZSBu dW1lcmljSW5wdXRNb2RlRm9yTGlzdFZpZXdDb250cm9sbGVyOnNlbGZdID09IFdLTnVtYmVyUGFk SW5wdXRNb2RlTm9uZTsKK30KKworQGVuZAorCisjZW5kaWYgLy8gUExBVEZPUk0oV0FUQ0hPUykK