237151 2022-02-24 12:18:56 -0800 [iOS] Add support for replacing WKFoundTextRanges 2022-02-24 17:44:16 -0800 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 akeerthi akeerthi hi katherine_cheney megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1845707 0 akeerthi 2022-02-24 12:18:56 -0800 ... 1845708 1 akeerthi 2022-02-24 12:19:13 -0800 rdar://89258687 1845710 2 453124 akeerthi 2022-02-24 12:26:14 -0800 Created attachment 453124 Patch 1845723 3 453124 wenson_hsieh 2022-02-24 13:01:53 -0800 Comment on attachment 453124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453124&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:10432 > + return self.webView._editable; It's a tiny bit surprising that this is only for Mail compose. I suppose that's because there's no per-text-range notion of editability baked into the API yet? 1845842 4 akeerthi 2022-02-24 16:57:36 -0800 (In reply to Wenson Hsieh from comment #3) > Comment on attachment 453124 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=453124&action=review > > > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:10432 > > + return self.webView._editable; > > It's a tiny bit surprising that this is only for Mail compose. I suppose > that's because there's no per-text-range notion of editability baked into > the API yet? Thanks for the review! Per-text-range editability is still under discussion (there is partial support). This patch addresses the simpler, higher value replacement scenario. 1845855 5 ews-feeder 2022-02-24 17:44:13 -0800 Committed r290481 (247777@main): <https://commits.webkit.org/247777@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453124. 453124 2022-02-24 12:26:14 -0800 2022-02-24 17:44:15 -0800 Patch bug-237151-20220224122612.patch text/plain 12803 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI1OTlmYWUxNTk5ZDhkZDAx NzhjMThhNzIwYzUxMmFkZTdkNTcxMjEuLjNlZWIxNTE4ZTIwMjVlOTFlZDAzN2ZmNDExMDZmYzU2 MzU4NmYwM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjItMDItMjQgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEFkZCBzdXBwb3J0 IGZvciByZXBsYWNpbmcgV0tGb3VuZFRleHRSYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzE1MQorICAgICAgICByZGFyOi8vODkyNTg2ODcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1l bnQgcHJvdG9jb2wgbWV0aG9kcyB0byBzdXBwb3J0IHJlcGxhY2VtZW50LgorCisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6cmVwbGFjZUZvdW5kVGV4dFJhbmdlV2l0aFN0cmluZyk6CisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHJlcGxhY2VGb3VuZFRleHRJ blJhbmdlOmluRG9jdW1lbnQ6d2l0aFRleHQ6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg c3VwcG9ydHNUZXh0UmVwbGFjZW1lbnRdKToKKworICAgICAgICBSZXN0cmljdCByZXBsYWNlbWVu dCB0byBlZGl0YWJsZSB3ZWIgdmlld3MuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViRm91bmRUZXh0UmFuZ2VDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRm91 bmRUZXh0UmFuZ2VDb250cm9sbGVyOjpyZXBsYWNlRm91bmRUZXh0UmFuZ2VXaXRoU3RyaW5nKToK KworICAgICAgICBVc2UgYSBgVGVtcG9yYXJ5U2VsZWN0aW9uQ2hhbmdlYCB0byBzZWxlY3QgYW5k IHJlcGxhY2UgdGhlIGRlc2lyZWQgcmFuZ2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvV2ViRm91bmRUZXh0UmFuZ2VDb250cm9sbGVyLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZXBsYWNlRm91 bmRUZXh0UmFuZ2VXaXRoU3RyaW5nKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmlu OgorCiAyMDIyLTAyLTIzICBKIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KIAogICAgICAg ICBbV2ViQXV0aG5dIHVzZXJIYW5kbGUgbm90IG1hcmtlZCBudWxsYWJsZSBpbiBfV0tXZWJBdXRo ZW50aWNhdGlvbkFzc2VydGlvblJlc3BvbnNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAppbmRleCBmZDExMTc1OTk0NzhjMWM5NmFlMGMxOGM5NGY0OWYxMTQ0OGQ2MzAw Li45MTkxMGE0ZTMwNjc0YzYxYzgzNmI1NjgyNGY2YTllNGRjMmNjMmYyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTQyOTYsNiArNDI5NiwxMSBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6ZmluZFRleHRSYW5nZXNGb3JTdHJpbmdNYXRjaGVzKGNvbnN0IFN0cmlu ZyYgc3RyaW5nLCBPcHRpb25TZQogICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2Vi UGFnZTo6RmluZFRleHRSYW5nZXNGb3JTdHJpbmdNYXRjaGVzKHN0cmluZywgb3B0aW9ucywgbWF4 TWF0Y2hDb3VudCksIFdURk1vdmUoY2FsbGJhY2tGdW5jdGlvbikpOwogfQogCit2b2lkIFdlYlBh Z2VQcm94eTo6cmVwbGFjZUZvdW5kVGV4dFJhbmdlV2l0aFN0cmluZyhjb25zdCBXZWJGb3VuZFRl eHRSYW5nZSYgcmFuZ2UsIGNvbnN0IFN0cmluZyYgc3RyaW5nKQoreworICAgIHNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OlJlcGxhY2VGb3VuZFRleHRSYW5nZVdpdGhTdHJpbmcocmFuZ2UsIHN0cmlu ZykpOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjb3JhdGVUZXh0UmFuZ2VXaXRoU3R5bGUo Y29uc3QgV2ViRm91bmRUZXh0UmFuZ2UmIHJhbmdlLCBGaW5kRGVjb3JhdGlvblN0eWxlIHN0eWxl KQogewogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRlY29yYXRlVGV4dFJhbmdlV2l0aFN0 eWxlKHJhbmdlLCBzdHlsZSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApp bmRleCA4NmRiNzgwNjFkNDI3YmIxNDJiZTkzMmEzOGViNDBlYWQzZmQ0N2U5Li5kMzA4NDJhMWJk ZjcyNDhjZmFmNTBjOTRjZDc1ODg3YzQ4Nzc3NjlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaApAQCAtMTIyMSw2ICsxMjIxLDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlk RmluZFN0cmluZ01hdGNoZXMoY29uc3QgU3RyaW5nJiwgY29uc3QgVmVjdG9yPFZlY3RvcjxXZWJD b3JlOjpJbnRSZWN0Pj4mIG1hdGNoUmVjdHMsIGludDMyX3QgZmlyc3RJbmRleEFmdGVyU2VsZWN0 aW9uKTsKIAogICAgIHZvaWQgZmluZFRleHRSYW5nZXNGb3JTdHJpbmdNYXRjaGVzKGNvbnN0IFN0 cmluZyYsIE9wdGlvblNldDxGaW5kT3B0aW9ucz4sIHVuc2lnbmVkIG1heE1hdGNoQ291bnQsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPFdlYkZvdW5kVGV4dFJhbmdlPiYmKT4mJik7Cisg ICAgdm9pZCByZXBsYWNlRm91bmRUZXh0UmFuZ2VXaXRoU3RyaW5nKGNvbnN0IFdlYkZvdW5kVGV4 dFJhbmdlJiwgY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBkZWNvcmF0ZVRleHRSYW5nZVdpdGhT dHlsZShjb25zdCBXZWJGb3VuZFRleHRSYW5nZSYsIEZpbmREZWNvcmF0aW9uU3R5bGUpOwogICAg IHZvaWQgc2Nyb2xsVGV4dFJhbmdlVG9WaXNpYmxlKGNvbnN0IFdlYkZvdW5kVGV4dFJhbmdlJik7 CiAgICAgdm9pZCBjbGVhckFsbERlY29yYXRlZEZvdW5kVGV4dCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5k ZXggMWQxZGZmZDEyMDkxYWFjN2NjODgwZTIxNDU0ODI3Yzc1ZTBhZGY2ZC4uZDk0MGU2NmM4MzRm MWE1OTQyNmI0ODZjMGI3ODlmOThiMjIzY2UyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0xMDM3OSw2 ICsxMDM3OSwxOCBAQCBzdGF0aWMgUmV0YWluUHRyPE5TSXRlbVByb3ZpZGVyPiBjcmVhdGVJdGVt UHJvdmlkZXIoY29uc3QgV2ViS2l0OjpXZWJQYWdlUHJveHkmCiAgICAgfSk7CiB9CiAKKy0gKHZv aWQpcmVwbGFjZUZvdW5kVGV4dEluUmFuZ2U6KFVJVGV4dFJhbmdlICopcmFuZ2UgaW5Eb2N1bWVu dDooX1VJVGV4dFNlYXJjaERvY3VtZW50SWRlbnRpZmllcilkb2N1bWVudCB3aXRoVGV4dDooTlNT dHJpbmcgKilyZXBsYWNlbWVudFRleHQKK3sKKyAgICBpZiAoIXNlbGYuc3VwcG9ydHNUZXh0UmVw bGFjZW1lbnQpCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8gZm91bmRUZXh0UmFuZ2UgPSBk eW5hbWljX29iamNfY2FzdDxXS0ZvdW5kVGV4dFJhbmdlPihyYW5nZSk7CisgICAgaWYgKCFmb3Vu ZFRleHRSYW5nZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgX3BhZ2UtPnJlcGxhY2VGb3VuZFRl eHRSYW5nZVdpdGhTdHJpbmcoW2ZvdW5kVGV4dFJhbmdlIHdlYkZvdW5kVGV4dFJhbmdlXSwgcmVw bGFjZW1lbnRUZXh0KTsKK30KKwogLSAodm9pZClkZWNvcmF0ZUZvdW5kVGV4dFJhbmdlOihVSVRl eHRSYW5nZSAqKXJhbmdlIGluRG9jdW1lbnQ6KF9VSVRleHRTZWFyY2hEb2N1bWVudElkZW50aWZp ZXIpZG9jdW1lbnQgdXNpbmdTdHlsZTooX1VJRm91bmRUZXh0U3R5bGUpc3R5bGUKIHsKICAgICBh dXRvIGZvdW5kVGV4dFJhbmdlID0gZHluYW1pY19vYmpjX2Nhc3Q8V0tGb3VuZFRleHRSYW5nZT4o cmFuZ2UpOwpAQCAtMTA0MTUsNiArMTA0MjcsMTEgQEAgc3RhdGljIFJldGFpblB0cjxOU0l0ZW1Q cm92aWRlcj4gY3JlYXRlSXRlbVByb3ZpZGVyKGNvbnN0IFdlYktpdDo6V2ViUGFnZVByb3h5Jgog ICAgIF9wYWdlLT5kaWRFbmRUZXh0U2VhcmNoT3BlcmF0aW9uKCk7CiB9CiAKKy0gKEJPT0wpc3Vw cG9ydHNUZXh0UmVwbGFjZW1lbnQKK3sKKyAgICByZXR1cm4gc2VsZi53ZWJWaWV3Ll9lZGl0YWJs ZTsKK30KKwogQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfQkVHSU4KIC0gKE5TSW50 ZWdlcilvZmZzZXRGcm9tUG9zaXRpb246KFVJVGV4dFBvc2l0aW9uICopZnJvbSB0b1Bvc2l0aW9u OihVSVRleHRQb3NpdGlvbiAqKXRvUG9zaXRpb24gaW5Eb2N1bWVudDooX1VJVGV4dFNlYXJjaERv Y3VtZW50SWRlbnRpZmllcilkb2N1bWVudAogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRm91bmRUZXh0UmFuZ2VDb250cm9sbGVyLmNwcCBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZvdW5kVGV4dFJhbmdlQ29udHJvbGxlci5j cHAKaW5kZXggMmM5YjQ1N2RiY2EwN2E2ZWIxMjY4OWE3OGYwZGQ1YjI5MTRhMjFjYy4uZjE2Zjc5 NmUwNDdlOTkxOTcyYzBlZDFmNGFlMTEzY2UxNjU2NWMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRm91bmRUZXh0UmFuZ2VDb250cm9sbGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGb3VuZFRleHRSYW5nZUNv bnRyb2xsZXIuY3BwCkBAIC04NSw2ICs4NSwyNyBAQCB2b2lkIFdlYkZvdW5kVGV4dFJhbmdlQ29u dHJvbGxlcjo6ZmluZFRleHRSYW5nZXNGb3JTdHJpbmdNYXRjaGVzKGNvbnN0IFN0cmluZyYgcwog ICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoZm91bmRUZXh0UmFuZ2VzKSk7CiB9CiAKK3Zv aWQgV2ViRm91bmRUZXh0UmFuZ2VDb250cm9sbGVyOjpyZXBsYWNlRm91bmRUZXh0UmFuZ2VXaXRo U3RyaW5nKGNvbnN0IFdlYkZvdW5kVGV4dFJhbmdlJiByYW5nZSwgY29uc3QgU3RyaW5nJiBzdHJp bmcpCit7CisgICAgYXV0byBzaW1wbGVSYW5nZSA9IHNpbXBsZVJhbmdlRnJvbUZvdW5kVGV4dFJh bmdlKHJhbmdlKTsKKyAgICBpZiAoIXNpbXBsZVJhbmdlKQorICAgICAgICByZXR1cm47CisKKyAg ICBSZWZQdHIgZG9jdW1lbnQgPSBkb2N1bWVudEZvckZvdW5kVGV4dFJhbmdlKHJhbmdlKTsKKyAg ICBpZiAoIWRvY3VtZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBSZWZQdHIgZnJhbWUgPSBk b2N1bWVudC0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAg ICBXZWJDb3JlOjpWaXNpYmxlU2VsZWN0aW9uIHZpc2libGVTZWxlY3Rpb24oKnNpbXBsZVJhbmdl KTsKKyAgICBPcHRpb25TZXQgdGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9ucyB7IFdlYkNvcmU6OlRl bXBvcmFyeVNlbGVjdGlvbk9wdGlvbjo6RG9Ob3RTZXRGb2N1cywgV2ViQ29yZTo6VGVtcG9yYXJ5 U2VsZWN0aW9uT3B0aW9uOjpJZ25vcmVTZWxlY3Rpb25DaGFuZ2VzIH07CisgICAgV2ViQ29yZTo6 VGVtcG9yYXJ5U2VsZWN0aW9uQ2hhbmdlIHNlbGVjdGlvbkNoYW5nZSgqZG9jdW1lbnQsIHZpc2li bGVTZWxlY3Rpb24sIHRlbXBvcmFyeVNlbGVjdGlvbk9wdGlvbnMpOworCisgICAgZnJhbWUtPmVk aXRvcigpLnJlcGxhY2VTZWxlY3Rpb25XaXRoVGV4dChzdHJpbmcsIFdlYkNvcmU6OkVkaXRvcjo6 U2VsZWN0UmVwbGFjZW1lbnQ6OlllcywgV2ViQ29yZTo6RWRpdG9yOjpTbWFydFJlcGxhY2U6Ok5v LCBXZWJDb3JlOjpFZGl0QWN0aW9uOjpJbnNlcnRSZXBsYWNlbWVudCk7Cit9CisKIHZvaWQgV2Vi Rm91bmRUZXh0UmFuZ2VDb250cm9sbGVyOjpkZWNvcmF0ZVRleHRSYW5nZVdpdGhTdHlsZShjb25z dCBXZWJGb3VuZFRleHRSYW5nZSYgcmFuZ2UsIEZpbmREZWNvcmF0aW9uU3R5bGUgc3R5bGUpCiB7 CiAgICAgYXV0byBzaW1wbGVSYW5nZSA9IHNpbXBsZVJhbmdlRnJvbUZvdW5kVGV4dFJhbmdlKHJh bmdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZv dW5kVGV4dFJhbmdlQ29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViRm91bmRUZXh0UmFuZ2VDb250cm9sbGVyLmgKaW5kZXggODlhOGZmZDVhNmM0MWM1N2Q0 MWZiMWM1MTEwYjA3YjRhZmFhYmFlNC4uMTNhMTRhM2I5YTZiYTY2YjJlMGU4MmE1ZDljMGMzYzE1 NjkzYzk1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi Rm91bmRUZXh0UmFuZ2VDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViRm91bmRUZXh0UmFuZ2VDb250cm9sbGVyLmgKQEAgLTU0LDYgKzU0LDggQEAg cHVibGljOgogCiAgICAgdm9pZCBmaW5kVGV4dFJhbmdlc0ZvclN0cmluZ01hdGNoZXMoY29uc3Qg U3RyaW5nJiwgT3B0aW9uU2V0PEZpbmRPcHRpb25zPiwgdWludDMyX3QgbWF4TWF0Y2hDb3VudCwg Q29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2ViS2l0OjpXZWJGb3VuZFRleHRSYW5nZT4m Jik+JiYpOwogCisgICAgdm9pZCByZXBsYWNlRm91bmRUZXh0UmFuZ2VXaXRoU3RyaW5nKGNvbnN0 IFdlYkZvdW5kVGV4dFJhbmdlJiwgY29uc3QgU3RyaW5nJik7CisKICAgICB2b2lkIGRlY29yYXRl VGV4dFJhbmdlV2l0aFN0eWxlKGNvbnN0IFdlYkZvdW5kVGV4dFJhbmdlJiwgRmluZERlY29yYXRp b25TdHlsZSk7CiAgICAgdm9pZCBzY3JvbGxUZXh0UmFuZ2VUb1Zpc2libGUoY29uc3QgV2ViRm91 bmRUZXh0UmFuZ2UmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCBlMjNhZGJhOTE4MTIzYTE5Y2U0ODdjMTBhNjVjZTZkZjRlMTU5NDJhLi41 MzMzNDhkM2RmY2VkYzUzNjlkMDNlNWY5MGQ3YzE0OTUwN2FkNTMwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDcyMSw2ICs0NzIxLDExIEBA IHZvaWQgV2ViUGFnZTo6ZmluZFRleHRSYW5nZXNGb3JTdHJpbmdNYXRjaGVzKGNvbnN0IFN0cmlu ZyYgc3RyaW5nLCBPcHRpb25TZXQ8RmluCiAgICAgZm91bmRUZXh0UmFuZ2VDb250cm9sbGVyKCku ZmluZFRleHRSYW5nZXNGb3JTdHJpbmdNYXRjaGVzKHN0cmluZywgb3B0aW9ucywgbWF4TWF0Y2hD b3VudCwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogCit2b2lkIFdlYlBhZ2U6OnJl cGxhY2VGb3VuZFRleHRSYW5nZVdpdGhTdHJpbmcoY29uc3QgV2ViRm91bmRUZXh0UmFuZ2UmIHJh bmdlLCBjb25zdCBTdHJpbmcmIHN0cmluZykKK3sKKyAgICBmb3VuZFRleHRSYW5nZUNvbnRyb2xs ZXIoKS5yZXBsYWNlRm91bmRUZXh0UmFuZ2VXaXRoU3RyaW5nKHJhbmdlLCBzdHJpbmcpOworfQor CiB2b2lkIFdlYlBhZ2U6OmRlY29yYXRlVGV4dFJhbmdlV2l0aFN0eWxlKGNvbnN0IFdlYkZvdW5k VGV4dFJhbmdlJiByYW5nZSwgV2ViS2l0OjpGaW5kRGVjb3JhdGlvblN0eWxlIHN0eWxlKQogewog ICAgIGZvdW5kVGV4dFJhbmdlQ29udHJvbGxlcigpLmRlY29yYXRlVGV4dFJhbmdlV2l0aFN0eWxl KHJhbmdlLCBzdHlsZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKaW5kZXggNjU0YjhjOWM2MDAyZDBlZDliMmM2MmNlMGMzMWVhOWJmZGIwYmVmNi4uNTExN2Fj NzhhYTBlZDdjM2ViMjcxNzNkMWNmYTE5OWQ4YzFiNTIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTc4OSw2ICsxNzg5LDcgQEAgcHJpdmF0ZToK ICAgICB2b2lkIGhpZGVGaW5kSW5kaWNhdG9yKCk7CiAKICAgICB2b2lkIGZpbmRUZXh0UmFuZ2Vz Rm9yU3RyaW5nTWF0Y2hlcyhjb25zdCBTdHJpbmcmLCBPcHRpb25TZXQ8RmluZE9wdGlvbnM+LCB1 aW50MzJfdCBtYXhNYXRjaENvdW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJG b3VuZFRleHRSYW5nZT4mJik+JiYpOworICAgIHZvaWQgcmVwbGFjZUZvdW5kVGV4dFJhbmdlV2l0 aFN0cmluZyhjb25zdCBXZWJGb3VuZFRleHRSYW5nZSYsIGNvbnN0IFN0cmluZyYpOwogICAgIHZv aWQgZGVjb3JhdGVUZXh0UmFuZ2VXaXRoU3R5bGUoY29uc3QgV2ViRm91bmRUZXh0UmFuZ2UmLCBX ZWJLaXQ6OkZpbmREZWNvcmF0aW9uU3R5bGUpOwogICAgIHZvaWQgc2Nyb2xsVGV4dFJhbmdlVG9W aXNpYmxlKGNvbnN0IFdlYkZvdW5kVGV4dFJhbmdlJik7CiAgICAgdm9pZCBjbGVhckFsbERlY29y YXRlZEZvdW5kVGV4dCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggYTJmOWJkZGUzNzQwMWU4OGRmNWU0ZTQ0NzU3 ODRjMTE1NjM1MGZkMS4uZGU5ZTY5ZjM0MTAwODIyNjNkZGYwNzQzYzIwODBmNDIwOTkwYTZiOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNz YWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l c3NhZ2VzLmluCkBAIC0zMjQsNiArMzI0LDcgQEAgR2VuZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29t bWFuZChlbnVtOnVpbnQ4X3QgV2ViS2l0OjpTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGUKICAg ICBIaWRlRmluZEluZGljYXRvcigpCiAKICAgICBGaW5kVGV4dFJhbmdlc0ZvclN0cmluZ01hdGNo ZXMoU3RyaW5nIHN0cmluZywgT3B0aW9uU2V0PFdlYktpdDo6RmluZE9wdGlvbnM+IGZpbmRPcHRp b25zLCB1bnNpZ25lZCBtYXhNYXRjaENvdW50KSAtPiAoVmVjdG9yPFdlYktpdDo6V2ViRm91bmRU ZXh0UmFuZ2U+IHJhbmdlcykgQXN5bmMKKyAgICBSZXBsYWNlRm91bmRUZXh0UmFuZ2VXaXRoU3Ry aW5nKHN0cnVjdCBXZWJLaXQ6OldlYkZvdW5kVGV4dFJhbmdlIHJhbmdlLCBTdHJpbmcgc3RyaW5n KQogICAgIERlY29yYXRlVGV4dFJhbmdlV2l0aFN0eWxlKHN0cnVjdCBXZWJLaXQ6OldlYkZvdW5k VGV4dFJhbmdlIHJhbmdlLCBlbnVtOnVpbnQ4X3QgV2ViS2l0OjpGaW5kRGVjb3JhdGlvblN0eWxl IHN0eWxlKQogICAgIFNjcm9sbFRleHRSYW5nZVRvVmlzaWJsZShzdHJ1Y3QgV2ViS2l0OjpXZWJG b3VuZFRleHRSYW5nZSByYW5nZSkKICAgICBDbGVhckFsbERlY29yYXRlZEZvdW5kVGV4dCgpOwpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDY4ZGE0 MDFjODM0MzM4YTA5ZTgxN2Y0ZDAxYWZkNmI4M2E3ZTgyNmEuLmE1ZThiMjJkOTE0ZmI3N2YzNDhk MTUzNWRlNTZhMjNmMTMwYzFkNTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMi0wMi0yNCAgQWRpdHlhIEtlZXJ0 aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQWRkIHN1cHBvcnQgZm9y IHJlcGxhY2luZyBXS0ZvdW5kVGV4dFJhbmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3MTUxCisgICAgICAgIHJkYXI6Ly84OTI1ODY4NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHRlc3Qg dGhhdCByZXBsYWNlcyBmb3VuZCByYW5nZXMuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0ZpbmRJblBhZ2UubW06CisgICAgICAgIChURVNUKToKKwogMjAyMi0w Mi0yMyAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW3J1 bi13ZWJraXQtdGVzdHNdIENhdGNoIE9TRXJyb3Igd2hlbiBzYW1wbGluZwpkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9GaW5kSW5QYWdlLm1tIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9GaW5kSW5QYWdlLm1tCmluZGV4IDBi NTZiMjFjOTU1MGNhMjNmNDMyODgyOWZlOGJmNTQ2YjdjN2ExODcuLmM1MTljOWVmYWFjZGVhMjgz NjUxMmM3NjgzMmY3MDc3NDU1MjNjN2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvRmluZEluUGFnZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL0ZpbmRJblBhZ2UubW0KQEAgLTQ5MCw2ICs0OTAsMzIgQEAgVEVT VChXZWJLaXQsIEZpbmRJblBhZ2VGdWxsV29yZCkKICAgICB0ZXN0UGVyZm9ybVRleHRTZWFyY2hX aXRoUXVlcnlTdHJpbmdJbldlYlZpZXcod2ViVmlldy5nZXQoKSwgQCJCaXJ0aCIsIHNlYXJjaE9w dGlvbnMuZ2V0KCksIDBVTCk7CiB9CiAKK1RFU1QoV2ViS2l0LCBGaW5kQW5kUmVwbGFjZSkKK3sK KyAgICBOU1N0cmluZyAqb3JpZ2luYWxDb250ZW50ID0gQCJMb3JlbSBpcHN1bSBkb2xvciBzaXQg YW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzY2luZyBlbGl0LCBzZWQgZG8gZWl1c21vZCB0ZW1wb3Ig aW5jaWRpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4gTG9yZW0gaXBzdW0g ZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdCwgc2VkIGRvIGVpdXNt b2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIjsK KyAgICBOU1N0cmluZyAqc2VhcmNoU3RyaW5nID0gQCJkb2xvciI7CisgICAgTlNTdHJpbmcgKnJl cGxhY2VtZW50U3RyaW5nID0gQCJjb2xvdXIiOworICAgIE5TU3RyaW5nICpyZXBsYWNlZENvbnRl bnQgPSBbb3JpZ2luYWxDb250ZW50IHN0cmluZ0J5UmVwbGFjaW5nT2NjdXJyZW5jZXNPZlN0cmlu ZzpzZWFyY2hTdHJpbmcgd2l0aFN0cmluZzpyZXBsYWNlbWVudFN0cmluZ107CisKKyAgICBhdXRv IHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpO U01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV0pOworICAgIFt3ZWJWaWV3IF9zZXRGaW5kSW50ZXJh Y3Rpb25FbmFibGVkOllFU107CisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3Ry aW5nOltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiPHA+JUA8L3A+Iiwgb3JpZ2luYWxDb250 ZW50XV07CisKKyAgICBhdXRvIHJhbmdlcyA9IHRleHRSYW5nZXNGb3JRdWVyeVN0cmluZyh3ZWJW aWV3LmdldCgpLCBzZWFyY2hTdHJpbmcpOworCisgICAgW3dlYlZpZXcgX3NldEVkaXRhYmxlOk5P XTsKKyAgICBmb3IgKFVJVGV4dFJhbmdlICpyYW5nZSBpbiBbcmFuZ2VzIHJldmVyc2VPYmplY3RF bnVtZXJhdG9yXSkKKyAgICAgICAgW1tbd2ViVmlldyBfZmluZEludGVyYWN0aW9uXSBzZWFyY2hh YmxlT2JqZWN0XSByZXBsYWNlRm91bmRUZXh0SW5SYW5nZTpyYW5nZSBpbkRvY3VtZW50Om5pbCB3 aXRoVGV4dDpyZXBsYWNlbWVudFN0cmluZ107CisKKyAgICBFWFBFQ1RfV0tfU1RSRVEob3JpZ2lu YWxDb250ZW50LCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1l bnQuYm9keS5pbm5lclRleHQiXSk7CisKKyAgICBbd2ViVmlldyBfc2V0RWRpdGFibGU6WUVTXTsK KyAgICBmb3IgKFVJVGV4dFJhbmdlICpyYW5nZSBpbiBbcmFuZ2VzIHJldmVyc2VPYmplY3RFbnVt ZXJhdG9yXSkKKyAgICAgICAgW1tbd2ViVmlldyBfZmluZEludGVyYWN0aW9uXSBzZWFyY2hhYmxl T2JqZWN0XSByZXBsYWNlRm91bmRUZXh0SW5SYW5nZTpyYW5nZSBpbkRvY3VtZW50Om5pbCB3aXRo VGV4dDpyZXBsYWNlbWVudFN0cmluZ107CisKKyAgICBFWFBFQ1RfV0tfU1RSRVEocmVwbGFjZWRD b250ZW50LCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQu Ym9keS5pbm5lclRleHQiXSk7Cit9CisKIFRFU1QoV2ViS2l0LCBGaW5kSW50ZXJhY3Rpb24pCiB7 CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpDR1JlY3RNYWtlKDAsIDAsIDIwMCwgMjAwKV0pOwo=