202294 2019-09-26 15:24:44 -0700 [iOS]: When inserting a photo and then inserting auto-corrected text, the photo is removed 2019-09-27 10:33:33 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sabouhallawa sabouhallawa commit-queue megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1574660 0 sabouhallawa 2019-09-26 15:24:44 -0700 This bug can be seen in Notes or Mail Apps on iOS 13. 1. Create a new Mail or new Note 2. Make sure the cursor is at the beginning of the document. 3. Touch beside the cursor and select "Insert Photo or Video" 4. Pick any photo 5. Touch after or below the photo 6. Make sure the cursor is blinking at the right of the photo 7. Select one of the suggested words above the iOS keyboard Result: The suggested word replaces the photo. Expected: The suggested word is inserted after the photo. 1574662 1 379690 sabouhallawa 2019-09-26 15:37:40 -0700 Created attachment 379690 Patch 1574663 2 sabouhallawa 2019-09-26 15:38:37 -0700 <rdar://problem/47977768> 1574669 3 wenson_hsieh 2019-09-26 16:00:46 -0700 We should be able to write a test for this (see fast/events/ios/autocorrect-with-apostrophe.html for an example). 1574820 4 379727 sabouhallawa 2019-09-27 08:39:30 -0700 Created attachment 379727 Patch 1574872 5 379727 commit-queue 2019-09-27 10:33:32 -0700 Comment on attachment 379727 Patch Clearing flags on attachment: 379727 Committed r250432: <https://trac.webkit.org/changeset/250432> 1574873 6 commit-queue 2019-09-27 10:33:33 -0700 All reviewed patches have been landed. Closing bug. 379690 2019-09-26 15:37:40 -0700 2019-09-27 10:10:13 -0700 Patch bug-202294-20190926153739.patch text/plain 4163 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAyYjQyZGZkMzM4MDRiYTk0 ODc2MjM4MGY1MTc3MWRlNWQ3M2NlNTQuLjRmMzlhYzViMzMyZDQ0MDc3MjZhYTViYzg4NzhlYzFi ZDUxZWFkNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDktMjYgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXTogV2hl biBpbnNlcnRpbmcgYSBwaG90byBhbmQgdGhlbiBpbnNlcnRpbmcgYXV0by1jb3JyZWN0ZWQgdGV4 dCwgdGhlIHBob3RvIGlzIHJlbW92ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMjI5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdlYlBhZ2U6OmFwcGx5QXV0b2NvcnJlY3Rpb25JbnRlcm5hbCgpIGNh bGxzIHdvcmRSYW5nZUZyb21Qb3NpdGlvbigpIHRvCisgICAgICAgIGNhbGN1bGF0ZSB0aGUgcmFu Z2Ugb2YgdGhlIHdvcmQgdG8gYmUgcmVwbGFjZWQgd2l0aCB0aGUgYXV0by1jb3JyZWN0ZWQKKyAg ICAgICAgd29yZC4gQnV0IGlmIHRoZSB0ZXh0IG9mIHRoZSByYW5nZSBkb2VzIG5vdCBtYXRjaCBv cmlnaW5hbCB0ZXh0LCBpdCB0cmllcworICAgICAgICB0byBjb3JyZWN0IHRoZSByYW5nZSBieSBt b3ZpbmcgaXQgZm9yd2FyZCBzdWNoIHRoYXQgdGhlIGxlbmd0aCBvZiB0aGUKKyAgICAgICAgdGV4 dCByYW5nZSBtYXRjaGVzIHRoZSBsZW5ndGggb2YgdGhlIG9yaWdpbmFsIHRleHQuCisKKyAgICAg ICAgT25lIGNhc2Ugc2hvdWxkIGNvcnJlY3QgcmFuZ2UgYWxzbyB3aGljaCBpczogdGhlIHJhbmdl IGRvZXMgbm90IGhhdmUgYSAKKyAgICAgICAgdGV4dCBidXQgaXQgaXMgbm90IGNvbGxhcHNlZC4g SW4gdGhpcyBjYXNlLCB3ZSBzaG91bGQgc2V0IHRoZSByYW5nZSBiYWNrCisgICAgICAgIHRvIHRo ZSBzZWxlY3Rpb24gcmFuZ2Ugc28gd2UgYXZvaWQgZGVsZXRpbmcgbm9uIHRleHQgbm9kZXMuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6OmFwcGx5QXV0b2NvcnJlY3Rpb25JbnRlcm5hbCk6CisKIDIwMTkt MDktMjMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSRUdSRVNTSU9OKDI1MDE0MykgRGlzayBjYWNoZSBzaG91bGQgYmUgZW5hYmxlZCBmb3Ig U2FmYXJpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQ YWdlSU9TLm1tCmluZGV4IDM4ZTFiOTU1NzU3M2Q2MWY3ZjNjMWIyZGFlMDAwNTYwNjg4MDA5NGEu Ljk5ZGVkMmY1Y2IyYWQ5MGIzZmM3ODA5Nzk5NzE4YmI1MDU5NTkxYTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0yMzM0 LDYgKzIzMzQsOSBAQCBib29sIFdlYlBhZ2U6OmFwcGx5QXV0b2NvcnJlY3Rpb25JbnRlcm5hbChj b25zdCBTdHJpbmcmIGNvcnJlY3Rpb24sIGNvbnN0IFN0cmluZwogICAgICAgICBWaXNpYmxlUG9z aXRpb24gcG9zaXRpb24gPSBmcmFtZS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5zdGFydCgpOwog ICAgICAgICByYW5nZSA9IHdvcmRSYW5nZUZyb21Qb3NpdGlvbihwb3NpdGlvbik7CiAgICAgICAg IHRleHRGb3JSYW5nZSA9IHBsYWluVGV4dFJlcGxhY2luZ05vQnJlYWtTcGFjZShyYW5nZS5nZXQo KSk7CisgICAgICAgIAorICAgICAgICAvLyBJZiAnb3JpZ2luYWxUZXh0JyBpcyBub3QgdGhlIHNh bWUgYXMgJ3RleHRGb3JSYW5nZScgd2UgbmVlZCB0byBtb3ZlICdyYW5nZScKKyAgICAgICAgLy8g Zm9yd2FyZCBzdWNoIHRoYXQgaXQgbWF0Y2hlcyB0aGUgb3JpZ2luYWwgc2VsZWN0aW9uIGFzIG11 Y2ggYXMgcG9zc2libGUuCiAgICAgICAgIGlmIChmb2xkUXVvdGVNYXJrcyh0ZXh0Rm9yUmFuZ2Up ICE9IG9yaWdpbmFsVGV4dFdpdGhGb2xkZWRRdW90ZU1hcmtzKSB7CiAgICAgICAgICAgICAvLyBT ZWFyY2ggZm9yIHRoZSBvcmlnaW5hbCB0ZXh0IGJlZm9yZSB0aGUgc2VsZWN0aW9uIGNhcmV0Lgog ICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBvcmlnaW5hbFRleHQubGVuZ3RoKCk7 ICsraSkKQEAgLTIzNDEsOCArMjM0NCw3IEBAIGJvb2wgV2ViUGFnZTo6YXBwbHlBdXRvY29ycmVj dGlvbkludGVybmFsKGNvbnN0IFN0cmluZyYgY29ycmVjdGlvbiwgY29uc3QgU3RyaW5nCiAgICAg ICAgICAgICBpZiAocG9zaXRpb24uaXNOdWxsKCkpCiAgICAgICAgICAgICAgICAgcG9zaXRpb24g PSBzdGFydE9mRG9jdW1lbnQoc3RhdGljX2Nhc3Q8Tm9kZSo+KGZyYW1lLmRvY3VtZW50KCktPmRv Y3VtZW50RWxlbWVudCgpKSk7CiAgICAgICAgICAgICByYW5nZSA9IFJhbmdlOjpjcmVhdGUoKmZy YW1lLmRvY3VtZW50KCksIHBvc2l0aW9uLCBmcmFtZS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5z dGFydCgpKTsKLSAgICAgICAgICAgIGlmIChyYW5nZSkKLSAgICAgICAgICAgICAgICB0ZXh0Rm9y UmFuZ2UgPSAocmFuZ2UpID8gcGxhaW5UZXh0UmVwbGFjaW5nTm9CcmVha1NwYWNlKHJhbmdlLmdl dCgpKSA6IGVtcHR5U3RyaW5nKCk7CisgICAgICAgICAgICB0ZXh0Rm9yUmFuZ2UgPSBwbGFpblRl eHRSZXBsYWNpbmdOb0JyZWFrU3BhY2UocmFuZ2UuZ2V0KCkpOwogICAgICAgICAgICAgdW5zaWdu ZWQgbG9vcENvdW50ID0gMDsKICAgICAgICAgICAgIGNvbnN0IHVuc2lnbmVkIG1heFBvc2l0aW9u c0F0dGVtcHRzID0gMTA7CiAgICAgICAgICAgICB3aGlsZSAodGV4dEZvclJhbmdlLmxlbmd0aCgp ICYmIHRleHRGb3JSYW5nZS5sZW5ndGgoKSA+IG9yaWdpbmFsVGV4dC5sZW5ndGgoKSAmJiBsb29w Q291bnQgPCBtYXhQb3NpdGlvbnNBdHRlbXB0cykgewpAQCAtMjM1MSw5ICsyMzUzLDE2IEBAIGJv b2wgV2ViUGFnZTo6YXBwbHlBdXRvY29ycmVjdGlvbkludGVybmFsKGNvbnN0IFN0cmluZyYgY29y cmVjdGlvbiwgY29uc3QgU3RyaW5nCiAgICAgICAgICAgICAgICAgICAgIHJhbmdlID0gbnVsbHB0 cjsKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIHJhbmdlID0gUmFu Z2U6OmNyZWF0ZSgqZnJhbWUuZG9jdW1lbnQoKSwgcG9zaXRpb24sIGZyYW1lLnNlbGVjdGlvbigp LnNlbGVjdGlvbigpLnN0YXJ0KCkpOwotICAgICAgICAgICAgICAgIHRleHRGb3JSYW5nZSA9IChy YW5nZSkgPyBwbGFpblRleHRSZXBsYWNpbmdOb0JyZWFrU3BhY2UocmFuZ2UuZ2V0KCkpIDogZW1w dHlTdHJpbmcoKTsKKyAgICAgICAgICAgICAgICB0ZXh0Rm9yUmFuZ2UgPSBwbGFpblRleHRSZXBs YWNpbmdOb0JyZWFrU3BhY2UocmFuZ2UuZ2V0KCkpOwogICAgICAgICAgICAgICAgIGxvb3BDb3Vu dCsrOwogICAgICAgICAgICAgfQorICAgICAgICB9IGVsc2UgaWYgKHRleHRGb3JSYW5nZS5pc0Vt cHR5KCkgJiYgcmFuZ2UgJiYgIXJhbmdlLT5jb2xsYXBzZWQoKSkgeworICAgICAgICAgICAgLy8g SWYgJ3JhbmdlJyBkb2VzIG5vdCBpbmNsdWRlIGFueSB0ZXh0IGJ1dCBpdCBpcyBub3QgY29sbGFw c2VkLCB3ZSBuZWVkIHRvIG1vdmUKKyAgICAgICAgICAgIC8vICdyYW5nZScgZm9yd2FyZCB0byBt YXRjaCB0aGUgb3JpZ2luYWwgc2VsZWN0aW9uLgorICAgICAgICAgICAgcmFuZ2UgPSBSYW5nZTo6 Y3JlYXRlKCpmcmFtZS5kb2N1bWVudCgpLCBwb3NpdGlvbiwgcG9zaXRpb24pOworICAgICAgICAg ICAgaWYgKCFyYW5nZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAg ICB0ZXh0Rm9yUmFuZ2UgPSBwbGFpblRleHRSZXBsYWNpbmdOb0JyZWFrU3BhY2UocmFuZ2UuZ2V0 KCkpOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gUmFuZ2Ugc2VsZWN0aW9u Lgo= 379727 2019-09-27 08:39:30 -0700 2019-09-27 10:33:32 -0700 Patch bug-202294-20190927083929.patch text/plain 7558 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAyYjQyZGZkMzM4MDRiYTk0 ODc2MjM4MGY1MTc3MWRlNWQ3M2NlNTQuLjFkNWNhYTg5ZGZmMjE5MGFhYTJiY2U0YzIxOTA4Njc0 NGFhODI4MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDktMjcgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXTogV2hl biBpbnNlcnRpbmcgYSBwaG90byBhbmQgdGhlbiBpbnNlcnRpbmcgYXV0by1jb3JyZWN0ZWQgdGV4 dCwgdGhlIHBob3RvIGlzIHJlbW92ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMjI5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdlYlBhZ2U6OmFwcGx5QXV0b2NvcnJlY3Rpb25JbnRlcm5hbCgpIGNh bGxzIHdvcmRSYW5nZUZyb21Qb3NpdGlvbigpIHRvCisgICAgICAgIGNhbGN1bGF0ZSB0aGUgcmFu Z2Ugb2YgdGhlIHdvcmQgdG8gYmUgcmVwbGFjZWQgd2l0aCB0aGUgYXV0by1jb3JyZWN0ZWQKKyAg ICAgICAgd29yZC4gQnV0IGlmIHRoZSB0ZXh0IG9mIHRoZSByYW5nZSBkb2VzIG5vdCBtYXRjaCB0 aGUgb3JpZ2luYWwgdGV4dCwKKyAgICAgICAgYXBwbHlBdXRvY29ycmVjdGlvbkludGVybmFsKCkg dHJpZXMgdG8gY29ycmVjdCB0aGUgcmFuZ2UgYnkgbW92aW5nIGl0CisgICAgICAgIGZvcndhcmQg c3VjaCB0aGF0IHRoZSBsZW5ndGggb2YgdGhlIHRleHQgcmFuZ2UgbWF0Y2hlcyB0aGUgbGVuZ3Ro IG9mIHRoZQorICAgICAgICBvcmlnaW5hbCB0ZXh0LgorCisgICAgICAgIEFub3RoZXIgY2FzZSwg d2hpY2ggc2hvdWxkIGNvcnJlY3QgdGhlIHJhbmdlIGFsc28sIGlzOiB0aGUgcmFuZ2UgZG9lcyBu b3QKKyAgICAgICAgaGF2ZSBhIHRleHQgYnV0IGl0IGlzIG5vdCBjb2xsYXBzZWQuIEluIHRoaXMg Y2FzZSwgd2Ugc2hvdWxkIHNldCB0aGUgcmFuZ2UKKyAgICAgICAgYmFjayB0byB0aGUgc2VsZWN0 aW9uIHJhbmdlIHNvIG5vbi10ZXh0IG5vZGVzIGlzIHJlbW92ZWQuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OmFwcGx5QXV0b2NvcnJlY3Rpb25JbnRlcm5hbCk6CisKIDIwMTktMDktMjMgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9O KDI1MDE0MykgRGlzayBjYWNoZSBzaG91bGQgYmUgZW5hYmxlZCBmb3IgU2FmYXJpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4 IDM4ZTFiOTU1NzU3M2Q2MWY3ZjNjMWIyZGFlMDAwNTYwNjg4MDA5NGEuLmUzYzNiYjZmZjAwOWI4 NDFlYTdlZDZkOWNmMjcxODY3NWQxMTZlYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0yMzM0LDYgKzIzMzQsOSBAQCBi b29sIFdlYlBhZ2U6OmFwcGx5QXV0b2NvcnJlY3Rpb25JbnRlcm5hbChjb25zdCBTdHJpbmcmIGNv cnJlY3Rpb24sIGNvbnN0IFN0cmluZwogICAgICAgICBWaXNpYmxlUG9zaXRpb24gcG9zaXRpb24g PSBmcmFtZS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5zdGFydCgpOwogICAgICAgICByYW5nZSA9 IHdvcmRSYW5nZUZyb21Qb3NpdGlvbihwb3NpdGlvbik7CiAgICAgICAgIHRleHRGb3JSYW5nZSA9 IHBsYWluVGV4dFJlcGxhY2luZ05vQnJlYWtTcGFjZShyYW5nZS5nZXQoKSk7CisgICAgICAgIAor ICAgICAgICAvLyBJZiAnb3JpZ2luYWxUZXh0JyBpcyBub3QgdGhlIHNhbWUgYXMgJ3RleHRGb3JS YW5nZScgd2UgbmVlZCB0byBtb3ZlICdyYW5nZScKKyAgICAgICAgLy8gZm9yd2FyZCBzdWNoIHRo YXQgaXQgbWF0Y2hlcyB0aGUgb3JpZ2luYWwgc2VsZWN0aW9uIGFzIG11Y2ggYXMgcG9zc2libGUu CiAgICAgICAgIGlmIChmb2xkUXVvdGVNYXJrcyh0ZXh0Rm9yUmFuZ2UpICE9IG9yaWdpbmFsVGV4 dFdpdGhGb2xkZWRRdW90ZU1hcmtzKSB7CiAgICAgICAgICAgICAvLyBTZWFyY2ggZm9yIHRoZSBv cmlnaW5hbCB0ZXh0IGJlZm9yZSB0aGUgc2VsZWN0aW9uIGNhcmV0LgogICAgICAgICAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBvcmlnaW5hbFRleHQubGVuZ3RoKCk7ICsraSkKQEAgLTIzNDEs OCArMjM0NCw3IEBAIGJvb2wgV2ViUGFnZTo6YXBwbHlBdXRvY29ycmVjdGlvbkludGVybmFsKGNv bnN0IFN0cmluZyYgY29ycmVjdGlvbiwgY29uc3QgU3RyaW5nCiAgICAgICAgICAgICBpZiAocG9z aXRpb24uaXNOdWxsKCkpCiAgICAgICAgICAgICAgICAgcG9zaXRpb24gPSBzdGFydE9mRG9jdW1l bnQoc3RhdGljX2Nhc3Q8Tm9kZSo+KGZyYW1lLmRvY3VtZW50KCktPmRvY3VtZW50RWxlbWVudCgp KSk7CiAgICAgICAgICAgICByYW5nZSA9IFJhbmdlOjpjcmVhdGUoKmZyYW1lLmRvY3VtZW50KCks IHBvc2l0aW9uLCBmcmFtZS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5zdGFydCgpKTsKLSAgICAg ICAgICAgIGlmIChyYW5nZSkKLSAgICAgICAgICAgICAgICB0ZXh0Rm9yUmFuZ2UgPSAocmFuZ2Up ID8gcGxhaW5UZXh0UmVwbGFjaW5nTm9CcmVha1NwYWNlKHJhbmdlLmdldCgpKSA6IGVtcHR5U3Ry aW5nKCk7CisgICAgICAgICAgICB0ZXh0Rm9yUmFuZ2UgPSBwbGFpblRleHRSZXBsYWNpbmdOb0Jy ZWFrU3BhY2UocmFuZ2UuZ2V0KCkpOwogICAgICAgICAgICAgdW5zaWduZWQgbG9vcENvdW50ID0g MDsKICAgICAgICAgICAgIGNvbnN0IHVuc2lnbmVkIG1heFBvc2l0aW9uc0F0dGVtcHRzID0gMTA7 CiAgICAgICAgICAgICB3aGlsZSAodGV4dEZvclJhbmdlLmxlbmd0aCgpICYmIHRleHRGb3JSYW5n ZS5sZW5ndGgoKSA+IG9yaWdpbmFsVGV4dC5sZW5ndGgoKSAmJiBsb29wQ291bnQgPCBtYXhQb3Np dGlvbnNBdHRlbXB0cykgewpAQCAtMjM1MSw5ICsyMzUzLDE1IEBAIGJvb2wgV2ViUGFnZTo6YXBw bHlBdXRvY29ycmVjdGlvbkludGVybmFsKGNvbnN0IFN0cmluZyYgY29ycmVjdGlvbiwgY29uc3Qg U3RyaW5nCiAgICAgICAgICAgICAgICAgICAgIHJhbmdlID0gbnVsbHB0cjsKICAgICAgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIHJhbmdlID0gUmFuZ2U6OmNyZWF0ZSgqZnJh bWUuZG9jdW1lbnQoKSwgcG9zaXRpb24sIGZyYW1lLnNlbGVjdGlvbigpLnNlbGVjdGlvbigpLnN0 YXJ0KCkpOwotICAgICAgICAgICAgICAgIHRleHRGb3JSYW5nZSA9IChyYW5nZSkgPyBwbGFpblRl eHRSZXBsYWNpbmdOb0JyZWFrU3BhY2UocmFuZ2UuZ2V0KCkpIDogZW1wdHlTdHJpbmcoKTsKKyAg ICAgICAgICAgICAgICB0ZXh0Rm9yUmFuZ2UgPSBwbGFpblRleHRSZXBsYWNpbmdOb0JyZWFrU3Bh Y2UocmFuZ2UuZ2V0KCkpOwogICAgICAgICAgICAgICAgIGxvb3BDb3VudCsrOwogICAgICAgICAg ICAgfQorICAgICAgICB9IGVsc2UgaWYgKHRleHRGb3JSYW5nZS5pc0VtcHR5KCkgJiYgcmFuZ2Ug JiYgIXJhbmdlLT5jb2xsYXBzZWQoKSkgeworICAgICAgICAgICAgLy8gSWYgJ3JhbmdlJyBkb2Vz IG5vdCBpbmNsdWRlIGFueSB0ZXh0IGJ1dCBpdCBpcyBub3QgY29sbGFwc2VkLCB3ZSBuZWVkIHRv IHNldAorICAgICAgICAgICAgLy8gJ3JhbmdlJyB0byBtYXRjaCB0aGUgc2VsZWN0aW9uLiBPdGhl cndpc2Ugbm9uLXRleHQgbm9kZXMgd2lsbCBiZSByZW1vdmVkLgorICAgICAgICAgICAgcmFuZ2Ug PSBSYW5nZTo6Y3JlYXRlKCpmcmFtZS5kb2N1bWVudCgpLCBwb3NpdGlvbiwgcG9zaXRpb24pOwor ICAgICAgICAgICAgaWYgKCFyYW5nZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAvLyBSYW5nZSBzZWxlY3Rpb24uCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggYWFkYTk2Y2EwODJmYTVjMDRkZWVkNzUwZGZiNWM3ZTI2NzhlN2U0Yi4uNTcwZTMyOWI2ZGQ3 YTllNjA0OTdhNDAzODY1OTY5YzQwNjliMjI4NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE5 LTA5LTI3ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAg ICAgICAgW2lPU106IFdoZW4gaW5zZXJ0aW5nIGEgcGhvdG8gYW5kIHRoZW4gaW5zZXJ0aW5nIGF1 dG8tY29ycmVjdGVkIHRleHQsIHRoZSBwaG90byBpcyByZW1vdmVkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIyOTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvZXZlbnRzL2lvcy9hdXRvY29y cmVjdC1hZnRlci1pbWFnZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZXZl bnRzL2lvcy9hdXRvY29ycmVjdC1hZnRlci1pbWFnZS5odG1sOiBBZGRlZC4KKwogMjAxOS0wOS0y MyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgSW1wcm92ZSBD U1AgaW5oZXJpdGFuY2Ugc2VtYW50aWNzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy9pb3MvYXV0b2NvcnJlY3QtYWZ0ZXItaW1hZ2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvZmFzdC9ldmVudHMvaW9zL2F1dG9jb3JyZWN0LWFmdGVyLWltYWdlLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5iMTE4MGM4NzNjMmEzZWQ2YzVkYTU5MmI4MWIyZTUyYmVkZmRmODJkCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvaW9zL2F1dG9jb3JyZWN0LWFm dGVyLWltYWdlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEzIEBACitUaGUKK1RoaXMgdGVzdCB2 ZXJpZmllcyB0aGF0IGluc2VydGluZyBhbiBhdXRvLWNvcnJlY3RlZCB0ZXh0IGFmdGVyIGFuIGlt YWdlIGRvZXMgbm90IHJlbW92ZSB0aGUgaW1hZ2UuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNl ZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRF Ii4KKworUEFTUyBPYnNlcnZlZCBpbnB1dCBldmVudCBvZiBpbnB1dFR5cGUgaW5zZXJ0VGV4dAor UEFTUyBkb2N1bWVudC5hY3RpdmVFbGVtZW50IGlzIGVkaXRvcgorUEFTUyBlZGl0b3IuY2hpbGRy ZW4ubGVuZ3RoIGlzIDEKK1BBU1MgZWRpdG9yLmNoaWxkcmVuWzBdIGluc3RhbmNlb2YgSFRNTElt YWdlRWxlbWVudCBpcyB0cnVlCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvaW9zL2F1 dG9jb3JyZWN0LWFmdGVyLWltYWdlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9pb3Mv YXV0b2NvcnJlY3QtYWZ0ZXItaW1hZ2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lMzJiNGI5Y2NhN2UyNTAy Yzc1MzVlYjE0OWNmZTQ0MzMyODg4MDhmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvaW9zL2F1dG9jb3JyZWN0LWFmdGVyLWltYWdlLmh0bWwKQEAgLTAsMCArMSw0 NCBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgdXNlRmxleGli bGVWaWV3cG9ydD10cnVlIF0gLS0+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9 InV0ZjgiPgorICAgIDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJpbml0aWFsLXNjYWxl PTEuMCwgdXNlci1zY2FsYWJsZT1ubywgd2lkdGg9ZGV2aWNlLXdpZHRoIj4KKyAgICA8c2NyaXB0 IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0PgorICAgIDxzY3Jp cHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKyAgICA8 c3R5bGU+CisgICAgICAgICNlZGl0b3IgeworICAgICAgICAgICAgbWF4LXdpZHRoOiAyMDBweDsK KyAgICAgICAgfQorICAgIDwvc3R5bGU+CisgICAgPHNjcmlwdD4KKyAgICAgICAganNUZXN0SXNB c3luYyA9IHRydWU7CisKKyAgICAgICAgYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIGFzeW5jICgp ID0+IHsKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uKGBUaGlzIHRlc3QgdmVyaWZpZXMgdGhhdCBp bnNlcnRpbmcgYW4gYXV0by1jb3JyZWN0ZWQgdGV4dCBhZnRlciBhbiBpbWFnZSBkb2VzIG5vdCBy ZW1vdmUgdGhlIGltYWdlLmApOworCisgICAgICAgICAgICBhZGRFdmVudExpc3RlbmVyKCJpbnB1 dCIsIGV2ZW50ID0+IHRlc3RQYXNzZWQoYE9ic2VydmVkIGlucHV0IGV2ZW50IG9mIGlucHV0VHlw ZSAke2V2ZW50LmlucHV0VHlwZX1gKSk7CisKKyAgICAgICAgICAgIGlmICghd2luZG93LnRlc3RS dW5uZXIgfHwgIXRlc3RSdW5uZXIucnVuVUlTY3JpcHQpCisgICAgICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgICAgICBlZGl0b3IgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZWRpdG9y Iik7CisgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5hY3RpdmF0ZUVsZW1lbnRBbmRXYWl0Rm9y SW5wdXRTZXNzaW9uKGVkaXRvcik7CisgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5hcHBseUF1 dG9jb3JyZWN0aW9uKCJUaGUiLCAiIik7CisgICAgICAgICAgICBzaG91bGRCZSgiZG9jdW1lbnQu YWN0aXZlRWxlbWVudCIsICJlZGl0b3IiKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJlZGl0b3Iu Y2hpbGRyZW4ubGVuZ3RoIiwgIjEiKTsKKyAgICAgICAgICAgIHNob3VsZEJlVHJ1ZSgiZWRpdG9y LmNoaWxkcmVuWzBdIGluc3RhbmNlb2YgSFRNTEltYWdlRWxlbWVudCIpOworICAgICAgICAgICAg ZWRpdG9yLmJsdXIoKTsKKyAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JLZXlib2Fy ZFRvSGlkZSgpOworICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgIH0pOworICAg IDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBjb250ZW50ZWRpdGFibGUgaWQ9 ImVkaXRvciI+CisgICAgICAgIDxpbWcgc3JjPSIuLi9yZXNvdXJjZXMvYWJlLnBuZyI+CisgICAg PC9kaXY+CisgICAgPGRpdiBpZD0iZGVzY3JpcHRpb24iPjwvZGl2PgorICAgIDxkaXYgaWQ9ImNv bnNvbGUiPjwvZGl2PgorPC9ib2R5PgorCis8L2h0bWw+Cg==