232217 2021-10-24 10:25:03 -0700 [LFC][IFC] Rename TextUtil::midWordBreak to breakWord 2021-10-25 06:35:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1808227 0 zalan 2021-10-24 10:25:03 -0700 it is not necessarily a _mid_ word break. We may end up breaking at the left/right side. 1808228 1 442312 zalan 2021-10-24 10:28:46 -0700 Created attachment 442312 Patch 1808259 2 442320 zalan 2021-10-24 13:59:12 -0700 Created attachment 442320 Patch 1808373 3 ews-feeder 2021-10-25 06:34:40 -0700 Committed r284780 (243489@main): <https://commits.webkit.org/243489@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442320. 1808374 4 webkit-bug-importer 2021-10-25 06:35:20 -0700 <rdar://problem/84612041> 442312 2021-10-24 10:28:46 -0700 2021-10-24 13:59:10 -0700 Patch bug-232217-20211024102844.patch text/plain 9049 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI3MTkwYmVlNGU2YmE0 MjY5NDdkNDVhYTAzMjdkOGQyYzYyZmFjZi4uNGE2YWUzZDM0ODZhMzQzZjViOWQzNDU2YjdjYThk MDVjZTk4YWRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEwLTI0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFJlbmFtZSBU ZXh0VXRpbDo6bWlkV29yZEJyZWFrIHRvIGJyZWFrV29yZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMjE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBmdW5jdGlvbiBtYXkgImJyZWFrIiB0aGUg Y29udGVudCBhdCB0aGUgbGVmdC9yaWdodCBib3VuZGFyeS4gVGhpcyBpcyBhbHNvIGluIHByZXBh cmF0aW9uIGZvcgorICAgICAgICB1c2luZyBtaWRXb3JkQnJlYWsgdGVybSB0byBpbmRpY2F0ZSBh IHBvc2l0aW9uIHNvbWV3aGVyZSB3aXRoaW4gdGhlIHdvcmQgYm91bmRhcnkuCisKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om1pZFdvcmRCcmVhayk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjp0cnlCcmVha2luZ1RleHRSdW4g Y29uc3QpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQv VGV4dFV0aWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRpbDo6YnJlYWtX b3JkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6Om1pZFdvcmRCcmVhayk6 IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4 dC9UZXh0VXRpbC5oOgorCiAyMDIxLTEwLTIzICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbTEZDXVtJRkNdIEJyZWFraW5nIGJlZm9yZSBoeXBoZW4gaXMgb25seSBh bGxvd2VkIHdoZW4gbGluZS1icmVhayBpcyBsb29zZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lQ29udGVudEJyZWFrZXIuY3BwCmluZGV4IGJiOTcxNmEzY2I2YWIxYWEyMDUwNWQyYTg5ODdm OWU4ZTMxMmVkNzQuLmFlMjFkYzVmMzhiNjkxNjZjODdlZDI0NGI5OGE3M2FhMmM0NzMzMGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTMwMiwy NSArMzAyLDI1IEBAIHN0YXRpYyBib29sIGlzV3JhcHBhYmxlUnVuKGNvbnN0IElubGluZUNvbnRl bnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6UnVuJiByCiAgICAgcmV0dXJuIFRleHRVdGls Ojppc1dyYXBwaW5nQWxsb3dlZChydW4uc3R5bGUpOwogfQogCi1zdGF0aWMgVGV4dFV0aWw6Ok1p ZFdvcmRCcmVhayBtaWRXb3JkQnJlYWsoY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRp bnVvdXNDb250ZW50OjpSdW4mIHRleHRSdW4sIElubGluZUxheW91dFVuaXQgcnVuTG9naWNhbExl ZnQsIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpCitzdGF0aWMgVGV4dFV0aWw6Oldv cmRCcmVha0xlZnQgbWlkV29yZEJyZWFrKGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250 aW51b3VzQ29udGVudDo6UnVuJiB0ZXh0UnVuLCBJbmxpbmVMYXlvdXRVbml0IHJ1bkxvZ2ljYWxM ZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKQogewogICAgIGF1dG8mIGlubGlu ZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KHRleHRSdW4uaW5saW5lSXRlbSk7 CiAgICAgYXV0byYgc3R5bGUgPSB0ZXh0UnVuLnN0eWxlOwogICAgIGF1dG8gbGluZUJyZWFrID0g c3R5bGUubGluZUJyZWFrKCk7CiAgICAgQVNTRVJUKGxpbmVCcmVhayA9PSBMaW5lQnJlYWs6OkFu eXdoZXJlIHx8IHN0eWxlLndvcmRCcmVhaygpID09IFdvcmRCcmVhazo6QnJlYWtBbGwgfHwgc3R5 bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpCcmVha1dvcmQgfHwgc3R5bGUub3ZlcmZsb3dX cmFwKCkgPT0gT3ZlcmZsb3dXcmFwOjpCcmVha1dvcmQgfHwgc3R5bGUub3ZlcmZsb3dXcmFwKCkg PT0gT3ZlcmZsb3dXcmFwOjpBbnl3aGVyZSk7CiAKLSAgICBhdXRvIG1pZFdvcmRCcmVhayA9IFRl eHRVdGlsOjptaWRXb3JkQnJlYWsoaW5saW5lVGV4dEl0ZW0sIHN0eWxlLmZvbnRDYXNjYWRlKCks IHRleHRSdW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0aCwgcnVuTG9naWNhbExlZnQpOwot ICAgIGlmICghbWlkV29yZEJyZWFrLmxlbmd0aCB8fCBtaWRXb3JkQnJlYWsubGVuZ3RoID09IGlu bGluZVRleHRJdGVtLmxlbmd0aCgpKQotICAgICAgICByZXR1cm4gbWlkV29yZEJyZWFrOworICAg IGF1dG8gd29yZEJyZWFrID0gVGV4dFV0aWw6OmJyZWFrV29yZChpbmxpbmVUZXh0SXRlbSwgc3R5 bGUuZm9udENhc2NhZGUoKSwgdGV4dFJ1bi5sb2dpY2FsV2lkdGgsIGF2YWlsYWJsZVdpZHRoLCBy dW5Mb2dpY2FsTGVmdCk7CisgICAgaWYgKCF3b3JkQnJlYWsubGVuZ3RoIHx8IHdvcmRCcmVhay5s ZW5ndGggPT0gaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCkpCisgICAgICAgIHJldHVybiB3b3JkQnJl YWs7CiAKICAgICBhdXRvIGNhbkJyZWFrQmV0d2VlbkFueVR5cG9ncmFwaGljQ2hhcmFjdGVyVW5p dCA9IGxpbmVCcmVhayA9PSBMaW5lQnJlYWs6OkFueXdoZXJlIHx8IHN0eWxlLndvcmRCcmVhaygp ID09IFdvcmRCcmVhazo6QnJlYWtXb3JkIHx8IHN0eWxlLm92ZXJmbG93V3JhcCgpID09IE92ZXJm bG93V3JhcDo6QnJlYWtXb3JkIHx8IHN0eWxlLm92ZXJmbG93V3JhcCgpID09IE92ZXJmbG93V3Jh cDo6QW55d2hlcmU7CiAgICAgaWYgKGNhbkJyZWFrQmV0d2VlbkFueVR5cG9ncmFwaGljQ2hhcmFj dGVyVW5pdCkKLSAgICAgICAgcmV0dXJuIG1pZFdvcmRCcmVhazsKKyAgICAgICAgcmV0dXJuIHdv cmRCcmVhazsKIAogICAgIC8vIEZpbmQgb3V0IGlmIHRoZSBjYW5kaWRhdGUgcG9zaXRpb24gZm9y IGFyYml0cmFyeSBicmVha2luZyBpcyB2YWxpZC4gV2UgY2FuJ3QgYWx3YXlzIGJyZWFrIGJldHdl ZW4gYW55IGNoYXJhY3RlcnMuCiAgICAgYXV0byB0ZXh0ID0gaW5saW5lVGV4dEl0ZW0uaW5saW5l VGV4dEJveCgpLmNvbnRlbnQoKTsKLSAgICBjb25zdCBhdXRvIGxlZnQgPSBtaWRXb3JkQnJlYWsu c3RhcnQ7Ci0gICAgYXV0byByaWdodCA9IGxlZnQgKyBtaWRXb3JkQnJlYWsubGVuZ3RoOworICAg IGNvbnN0IGF1dG8gbGVmdCA9IGlubGluZVRleHRJdGVtLnN0YXJ0KCk7CisgICAgYXV0byByaWdo dCA9IGxlZnQgKyB3b3JkQnJlYWsubGVuZ3RoOwogICAgIGZvciAoOyByaWdodCA+IGxlZnQ7IC0t cmlnaHQpIHsKICAgICAgICAgYXV0byBjYW5CcmVha0JlZm9yZSA9IFsmXShhdXRvIGNoYXJhY3Rl cikgewogICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGluY2x1ZGUgYWxsIHRoZSBj YXNlcyBmcm9tIGh0dHBzOi8vdW5pY29kZS5vcmcvcmVwb3J0cy90cjE0CkBAIC0zNDQsMTEgKzM0 NCwxMSBAQCBzdGF0aWMgVGV4dFV0aWw6Ok1pZFdvcmRCcmVhayBtaWRXb3JkQnJlYWsoY29uc3Qg SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdQogICAgICAgICAgICAgYnJlYWs7CiAgICAg fQogICAgIFJFTEVBU0VfQVNTRVJUKHJpZ2h0ID49IGxlZnQpOwotICAgIGlmIChsZWZ0ICsgbWlk V29yZEJyZWFrLmxlbmd0aCA9PSByaWdodCkKLSAgICAgICAgcmV0dXJuIG1pZFdvcmRCcmVhazsK KyAgICBpZiAobGVmdCArIHdvcmRCcmVhay5sZW5ndGggPT0gcmlnaHQpCisgICAgICAgIHJldHVy biB3b3JkQnJlYWs7CiAgICAgaWYgKGxlZnQgPT0gcmlnaHQpCi0gICAgICAgIHJldHVybiB7IGxl ZnQsIHsgfSwgeyB9IH07Ci0gICAgcmV0dXJuIHsgbGVmdCwgcmlnaHQgLSBsZWZ0LCBUZXh0VXRp bDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIHN0eWxlLmZvbnRDYXNjYWRlKCksIGxlZnQsIHJpZ2h0 LCBydW5Mb2dpY2FsTGVmdCkgfTsKKyAgICAgICAgcmV0dXJuIHsgfTsKKyAgICByZXR1cm4geyBy aWdodCAtIGxlZnQsIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgc3R5bGUuZm9udENh c2NhZGUoKSwgbGVmdCwgcmlnaHQsIHJ1bkxvZ2ljYWxMZWZ0KSB9OwogfQogCiBzdHJ1Y3QgQ2Fu ZGlkYXRlVGV4dFJ1bkZvckJyZWFraW5nIHsKQEAgLTQ0Miw3ICs0NDIsNyBAQCBzdGQ6Om9wdGlv bmFsPElubGluZUNvbnRlbnRCcmVha2VyOjpQYXJ0aWFsUnVuPiBJbmxpbmVDb250ZW50QnJlYWtl cjo6dHJ5QnJlYWtpbgogICAgICAgICAgICAgICAgIGF1dG8gYXZhaWxhYmxlV2lkdGhFeGNsdWRp bmdIeXBoZW4gPSBhdmFpbGFibGVXaWR0aCAtIGh5cGhlbldpZHRoOwogICAgICAgICAgICAgICAg IGlmIChhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhlbiA8PSAwIHx8ICFlbm91Z2hXaWR0aEZv ckh5cGhlbmF0aW9uKGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuLCBmb250Q2FzY2FkZS5w aXhlbFNpemUoKSkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7IH07Ci0gICAgICAgICAg ICAgICAgbGVmdFNpZGVMZW5ndGggPSBUZXh0VXRpbDo6bWlkV29yZEJyZWFrKGlubGluZVRleHRJ dGVtLCBmb250Q2FzY2FkZSwgY2FuZGlkYXRlUnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lk dGhFeGNsdWRpbmdIeXBoZW4sIGNhbmRpZGF0ZVRleHRSdW4ubG9naWNhbExlZnQpLmxlbmd0aDsK KyAgICAgICAgICAgICAgICBsZWZ0U2lkZUxlbmd0aCA9IFRleHRVdGlsOjpicmVha1dvcmQoaW5s aW5lVGV4dEl0ZW0sIGZvbnRDYXNjYWRlLCBjYW5kaWRhdGVSdW4ubG9naWNhbFdpZHRoLCBhdmFp bGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhlbiwgY2FuZGlkYXRlVGV4dFJ1bi5sb2dpY2FsTGVmdCku bGVuZ3RoOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKGxlZnRTaWRlTGVuZ3RoIDwg bGltaXRCZWZvcmUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKQEAgLTQ4NCw4ICs0ODQs OCBAQCBzdGQ6Om9wdGlvbmFsPElubGluZUNvbnRlbnRCcmVha2VyOjpQYXJ0aWFsUnVuPiBJbmxp bmVDb250ZW50QnJlYWtlcjo6dHJ5QnJlYWtpbgogICAgICAgICAgICAgICAgIC8vIEZhc3QgcGF0 aCBmb3IgY2FzZXMgd2hlbiB0aGVyZSdzIG5vIHJvb20gYXQgYWxsLiBUaGUgY29udGVudCBpcyBi cmVha2FibGUgYnV0IHdlIGRvbid0IGhhdmUgc3BhY2UgZm9yIGl0LgogICAgICAgICAgICAgICAg IHJldHVybiB7IH07CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBhdXRvIG1pZFdvcmRCcmVh ayA9IFRleHRVdGlsOjptaWRXb3JkQnJlYWsoaW5saW5lVGV4dEl0ZW0sIGZvbnRDYXNjYWRlLCBj YW5kaWRhdGVSdW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0aCwgY2FuZGlkYXRlVGV4dFJ1 bi5sb2dpY2FsTGVmdCk7Ci0gICAgICAgICAgICByZXR1cm4geyBtaWRXb3JkQnJlYWsubGVuZ3Ro LCBtaWRXb3JkQnJlYWsubG9naWNhbFdpZHRoIH07CisgICAgICAgICAgICBhdXRvIHdvcmRCcmVh ayA9IFRleHRVdGlsOjpicmVha1dvcmQoaW5saW5lVGV4dEl0ZW0sIGZvbnRDYXNjYWRlLCBjYW5k aWRhdGVSdW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0aCwgY2FuZGlkYXRlVGV4dFJ1bi5s b2dpY2FsTGVmdCk7CisgICAgICAgICAgICByZXR1cm4geyB3b3JkQnJlYWsubGVuZ3RoLCB3b3Jk QnJlYWsubG9naWNhbFdpZHRoIH07CiAgICAgICAgIH07CiAgICAgICAgIC8vIFdpdGggYXJiaXRy YXJ5IGJyZWFraW5nIHRoZXJlJ3MgYWx3YXlzIGEgdmFsaWQgYnJlYWtpbmcgcG9zaXRpb24gKGV2 ZW4gaWYgaXQgaXMgYmVmb3JlIHRoZSBmaXJzdCBwb3NpdGlvbikuCiAgICAgICAgIHJldHVybiB0 cnlCcmVha2luZ0F0QXJiaXRyYXJ5UG9zaXRpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0 VXRpbC5jcHAKaW5kZXggYWFmMGYwOGJlMGRkMTVmMjRhYzIzNTlmMTVhNGI0ZTZkMTcyMzUxZi4u NTUxM2YyN2ExNGEzMjY4ZWMwODA3YjcwNDdjOTY0ZTgwYTMwMWQyNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRp bC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvdGV4dC9UZXh0VXRpbC5jcHAKQEAgLTEzOSw3ICsxMzksNyBAQCBUZXh0VXRpbDo6RmFsbGJh Y2tGb250TGlzdCBUZXh0VXRpbDo6ZmFsbGJhY2tGb250c0ZvclJ1bihjb25zdCBMaW5lOjpSdW4m IHJ1biwgYwogICAgIHJldHVybiBmYWxsYmFja0ZvbnRzOwogfQogCi1UZXh0VXRpbDo6TWlkV29y ZEJyZWFrIFRleHRVdGlsOjptaWRXb3JkQnJlYWsoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGlu ZVRleHRJdGVtLCBjb25zdCBGb250Q2FzY2FkZSYgZm9udENhc2NhZGUsIElubGluZUxheW91dFVu aXQgdGV4dFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBJbmxpbmVMYXlv dXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCkKK1RleHRVdGlsOjpXb3JkQnJlYWtMZWZ0IFRleHRV dGlsOjpicmVha1dvcmQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBjb25z dCBGb250Q2FzY2FkZSYgZm9udENhc2NhZGUsIElubGluZUxheW91dFVuaXQgdGV4dFdpZHRoLCBJ bmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRM b2dpY2FsTGVmdCkKIHsKICAgICBBU1NFUlQoYXZhaWxhYmxlV2lkdGggPj0gMCk7CiAgICAgYXV0 byBzdGFydFBvc2l0aW9uID0gaW5saW5lVGV4dEl0ZW0uc3RhcnQoKTsKQEAgLTE3OCw3ICsxNzgs OCBAQCBUZXh0VXRpbDo6TWlkV29yZEJyZWFrIFRleHRVdGlsOjptaWRXb3JkQnJlYWsoY29uc3Qg SW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdAogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IH0KICAgICB9Ci0gICAgcmV0dXJuIHsgc3RhcnRQb3NpdGlvbiwgcmlnaHQgLSBzdGFydFBvc2l0 aW9uLCBsZWZ0U2lkZVdpZHRoIH07CisgICAgUkVMRUFTRV9BU1NFUlQocmlnaHQgPj0gc3RhcnRQ b3NpdGlvbik7CisgICAgcmV0dXJuIHsgcmlnaHQgLSBzdGFydFBvc2l0aW9uLCBsZWZ0U2lkZVdp ZHRoIH07CiB9CiAKIHVuc2lnbmVkIFRleHRVdGlsOjpmaW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9u KExhenlMaW5lQnJlYWtJdGVyYXRvciYgbGluZUJyZWFrSXRlcmF0b3IsIHVuc2lnbmVkIHN0YXJ0 UG9zaXRpb24sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuaCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4 dFV0aWwuaAppbmRleCA3ZjlkOTFlMTgwMmM2NzYwMDAyOGFjODBmZDIxNzU2NjQ2NGY1MWQzLi4y NjllNGMwMDE4ZDg3MjRmOTM3NDFlMzZlOGJhMTFhZDI0YzJmZWRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGls LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv dGV4dC9UZXh0VXRpbC5oCkBAIC01MSwxMiArNTEsMTEgQEAgcHVibGljOgogICAgIHVzaW5nIEZh bGxiYWNrRm9udExpc3QgPSBIYXNoU2V0PGNvbnN0IEZvbnQqPjsKICAgICBzdGF0aWMgRmFsbGJh Y2tGb250TGlzdCBmYWxsYmFja0ZvbnRzRm9yUnVuKGNvbnN0IExpbmU6OlJ1biYsIGNvbnN0IFJl bmRlclN0eWxlJik7CiAKLSAgICBzdHJ1Y3QgTWlkV29yZEJyZWFrIHsKLSAgICAgICAgc2l6ZV90 IHN0YXJ0IHsgMCB9OworICAgIHN0cnVjdCBXb3JkQnJlYWtMZWZ0IHsKICAgICAgICAgc2l6ZV90 IGxlbmd0aCB7IDAgfTsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGggeyAw IH07CiAgICAgfTsKLSAgICBzdGF0aWMgTWlkV29yZEJyZWFrIG1pZFdvcmRCcmVhayhjb25zdCBJ bmxpbmVUZXh0SXRlbSYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgSW5saW5lTGF5b3V0VW5pdCB0ZXh0 V2lkdGgsIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIElubGluZUxheW91dFVuaXQg Y29udGVudExvZ2ljYWxMZWZ0KTsKKyAgICBzdGF0aWMgV29yZEJyZWFrTGVmdCBicmVha1dvcmQo Y29uc3QgSW5saW5lVGV4dEl0ZW0mLCBjb25zdCBGb250Q2FzY2FkZSYsIElubGluZUxheW91dFVu aXQgdGV4dFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBJbmxpbmVMYXlv dXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCk7CiAKICAgICBzdGF0aWMgdW5zaWduZWQgZmluZE5l eHRCcmVha2FibGVQb3NpdGlvbihMYXp5TGluZUJyZWFrSXRlcmF0b3ImLCB1bnNpZ25lZCBzdGFy dFBvc2l0aW9uLCBjb25zdCBSZW5kZXJTdHlsZSYpOwogICAgIHN0YXRpYyBMaW5lQnJlYWtJdGVy YXRvck1vZGUgbGluZUJyZWFrSXRlcmF0b3JNb2RlKExpbmVCcmVhayk7Cg== 442320 2021-10-24 13:59:12 -0700 2021-10-25 06:34:41 -0700 Patch bug-232217-20211024135911.patch text/plain 9125 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmI1ODY2OTdmZjdlNjFj NWI2MWI0Y2U2NjE0MjU4NTllYWFmMTkyMC4uMDM2NDllMzAzZjM3ZDFmMTM0MmQxZWU2MDVlZGU2 MzQ0ODMzYjdiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEwLTI0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFJlbmFtZSBU ZXh0VXRpbDo6bWlkV29yZEJyZWFrIHRvIGJyZWFrV29yZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMjE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBmdW5jdGlvbiBtYXkgImJyZWFrIiB0aGUg Y29udGVudCBhdCB0aGUgbGVmdC9yaWdodCBib3VuZGFyeS4gVGhpcyBpcyBhbHNvIGluIHByZXBh cmF0aW9uIGZvcgorICAgICAgICB1c2luZyBtaWRXb3JkQnJlYWsgdGVybSB0byBpbmRpY2F0ZSBh IHBvc2l0aW9uIHNvbWV3aGVyZSB3aXRoaW4gdGhlIHdvcmQgYm91bmRhcnkuCisKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om1pZFdvcmRCcmVhayk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjp0cnlCcmVha2luZ1RleHRSdW4g Y29uc3QpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQv VGV4dFV0aWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRpbDo6YnJlYWtX b3JkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6Om1pZFdvcmRCcmVhayk6 IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4 dC9UZXh0VXRpbC5oOgorCiAyMDIxLTEwLTI0ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1 amlpQHNvbnkuY29tPgogCiAgICAgICAgIFRoZSBjb2RlIGRlY29kaW5nIHN0ZDo6b3B0aW9uYWw8 SW1hZ2VQYWludGluZ09wdGlvbnM+IGNhbid0IGJlIGNvbXBpbGVkIGJ5IFBsYXlTdGF0aW9uIGR1 ZSB0byB0aGUgSW1hZ2VQYWludGluZ09wdGlvbnMgdGVtcGxhdGUgY29uc3RydWN0b3IKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUNvbnRlbnRCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCAxZGJiMzAzZjFl ZDkxZDE2N2UxMGE4ZDRjNTY1OWI1MmI4ZWE3ODljLi5hMGRhYTQ1M2U3NWRlNmU0YjFkNjRlMTQ4 MGI1ODNjYThhNWMwZjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJy ZWFrZXIuY3BwCkBAIC0yOTUsMjUgKzI5NSwyNSBAQCBzdGF0aWMgYm9vbCBpc1dyYXBwYWJsZVJ1 bihjb25zdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OlJ1biYgcgog ICAgIHJldHVybiBUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQocnVuLnN0eWxlKTsKIH0KIAot c3RhdGljIFRleHRVdGlsOjpNaWRXb3JkQnJlYWsgbWlkV29yZEJyZWFrKGNvbnN0IElubGluZUNv bnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6UnVuJiB0ZXh0UnVuLCBJbmxpbmVMYXlv dXRVbml0IHJ1bkxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKQor c3RhdGljIFRleHRVdGlsOjpXb3JkQnJlYWtMZWZ0IG1pZFdvcmRCcmVhayhjb25zdCBJbmxpbmVD b250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OlJ1biYgdGV4dFJ1biwgSW5saW5lTGF5 b3V0VW5pdCBydW5Mb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCkK IHsKICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPih0 ZXh0UnVuLmlubGluZUl0ZW0pOwogICAgIGF1dG8mIHN0eWxlID0gdGV4dFJ1bi5zdHlsZTsKICAg ICBhdXRvIGxpbmVCcmVhayA9IHN0eWxlLmxpbmVCcmVhaygpOwogICAgIEFTU0VSVChsaW5lQnJl YWsgPT0gTGluZUJyZWFrOjpBbnl3aGVyZSB8fCBzdHlsZS53b3JkQnJlYWsoKSA9PSBXb3JkQnJl YWs6OkJyZWFrQWxsIHx8IHN0eWxlLndvcmRCcmVhaygpID09IFdvcmRCcmVhazo6QnJlYWtXb3Jk IHx8IHN0eWxlLm92ZXJmbG93V3JhcCgpID09IE92ZXJmbG93V3JhcDo6QnJlYWtXb3JkIHx8IHN0 eWxlLm92ZXJmbG93V3JhcCgpID09IE92ZXJmbG93V3JhcDo6QW55d2hlcmUpOwogCi0gICAgYXV0 byBtaWRXb3JkQnJlYWsgPSBUZXh0VXRpbDo6bWlkV29yZEJyZWFrKGlubGluZVRleHRJdGVtLCBz dHlsZS5mb250Q2FzY2FkZSgpLCB0ZXh0UnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lkdGgs IHJ1bkxvZ2ljYWxMZWZ0KTsKLSAgICBpZiAoIW1pZFdvcmRCcmVhay5sZW5ndGggfHwgbWlkV29y ZEJyZWFrLmxlbmd0aCA9PSBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSkKLSAgICAgICAgcmV0dXJu IG1pZFdvcmRCcmVhazsKKyAgICBhdXRvIHdvcmRCcmVhayA9IFRleHRVdGlsOjpicmVha1dvcmQo aW5saW5lVGV4dEl0ZW0sIHN0eWxlLmZvbnRDYXNjYWRlKCksIHRleHRSdW4ubG9naWNhbFdpZHRo LCBhdmFpbGFibGVXaWR0aCwgcnVuTG9naWNhbExlZnQpOworICAgIGlmICghd29yZEJyZWFrLmxl bmd0aCB8fCB3b3JkQnJlYWsubGVuZ3RoID09IGlubGluZVRleHRJdGVtLmxlbmd0aCgpKQorICAg ICAgICByZXR1cm4gd29yZEJyZWFrOwogCiAgICAgYXV0byBjYW5CcmVha0JldHdlZW5BbnlUeXBv Z3JhcGhpY0NoYXJhY3RlclVuaXQgPSBsaW5lQnJlYWsgPT0gTGluZUJyZWFrOjpBbnl3aGVyZSB8 fCBzdHlsZS53b3JkQnJlYWsoKSA9PSBXb3JkQnJlYWs6OkJyZWFrV29yZCB8fCBzdHlsZS5vdmVy Zmxvd1dyYXAoKSA9PSBPdmVyZmxvd1dyYXA6OkJyZWFrV29yZCB8fCBzdHlsZS5vdmVyZmxvd1dy YXAoKSA9PSBPdmVyZmxvd1dyYXA6OkFueXdoZXJlOwogICAgIGlmIChjYW5CcmVha0JldHdlZW5B bnlUeXBvZ3JhcGhpY0NoYXJhY3RlclVuaXQpCi0gICAgICAgIHJldHVybiBtaWRXb3JkQnJlYWs7 CisgICAgICAgIHJldHVybiB3b3JkQnJlYWs7CiAKICAgICAvLyBGaW5kIG91dCBpZiB0aGUgY2Fu ZGlkYXRlIHBvc2l0aW9uIGZvciBhcmJpdHJhcnkgYnJlYWtpbmcgaXMgdmFsaWQuIFdlIGNhbid0 IGFsd2F5cyBicmVhayBiZXR3ZWVuIGFueSBjaGFyYWN0ZXJzLgogICAgIGF1dG8gdGV4dCA9IGlu bGluZVRleHRJdGVtLmlubGluZVRleHRCb3goKS5jb250ZW50KCk7Ci0gICAgY29uc3QgYXV0byBs ZWZ0ID0gbWlkV29yZEJyZWFrLnN0YXJ0OwotICAgIGF1dG8gcmlnaHQgPSBsZWZ0ICsgbWlkV29y ZEJyZWFrLmxlbmd0aDsKKyAgICBjb25zdCBhdXRvIGxlZnQgPSBpbmxpbmVUZXh0SXRlbS5zdGFy dCgpOworICAgIGF1dG8gcmlnaHQgPSBsZWZ0ICsgd29yZEJyZWFrLmxlbmd0aDsKICAgICBmb3Ig KDsgcmlnaHQgPiBsZWZ0OyAtLXJpZ2h0KSB7CiAgICAgICAgIGF1dG8gY2FuQnJlYWtCZWZvcmUg PSBbJl0oYXV0byBjaGFyYWN0ZXIpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIHNob3Vs ZCBpbmNsdWRlIGFsbCB0aGUgY2FzZXMgZnJvbSBodHRwczovL3VuaWNvZGUub3JnL3JlcG9ydHMv dHIxNApAQCAtMzM3LDExICszMzcsMTEgQEAgc3RhdGljIFRleHRVdGlsOjpNaWRXb3JkQnJlYWsg bWlkV29yZEJyZWFrKGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3UKICAgICAg ICAgICAgIGJyZWFrOwogICAgIH0KICAgICBSRUxFQVNFX0FTU0VSVChyaWdodCA+PSBsZWZ0KTsK LSAgICBpZiAobGVmdCArIG1pZFdvcmRCcmVhay5sZW5ndGggPT0gcmlnaHQpCi0gICAgICAgIHJl dHVybiBtaWRXb3JkQnJlYWs7CisgICAgaWYgKGxlZnQgKyB3b3JkQnJlYWsubGVuZ3RoID09IHJp Z2h0KQorICAgICAgICByZXR1cm4gd29yZEJyZWFrOwogICAgIGlmIChsZWZ0ID09IHJpZ2h0KQot ICAgICAgICByZXR1cm4geyBsZWZ0LCB7IH0sIHsgfSB9OwotICAgIHJldHVybiB7IGxlZnQsIHJp Z2h0IC0gbGVmdCwgVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBzdHlsZS5mb250Q2Fz Y2FkZSgpLCBsZWZ0LCByaWdodCwgcnVuTG9naWNhbExlZnQpIH07CisgICAgICAgIHJldHVybiB7 IH07CisgICAgcmV0dXJuIHsgcmlnaHQgLSBsZWZ0LCBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4 dEl0ZW0sIHN0eWxlLmZvbnRDYXNjYWRlKCksIGxlZnQsIHJpZ2h0LCBydW5Mb2dpY2FsTGVmdCkg fTsKIH0KIAogc3RydWN0IENhbmRpZGF0ZVRleHRSdW5Gb3JCcmVha2luZyB7CkBAIC00MzUsNyAr NDM1LDcgQEAgc3RkOjpvcHRpb25hbDxJbmxpbmVDb250ZW50QnJlYWtlcjo6UGFydGlhbFJ1bj4g SW5saW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFraW4KICAgICAgICAgICAgICAgICBhdXRvIGF2 YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuID0gYXZhaWxhYmxlV2lkdGggLSBoeXBoZW5XaWR0 aDsKICAgICAgICAgICAgICAgICBpZiAoYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4gPD0g MCB8fCAhZW5vdWdoV2lkdGhGb3JIeXBoZW5hdGlvbihhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5 cGhlbiwgZm9udENhc2NhZGUucGl4ZWxTaXplKCkpKQogICAgICAgICAgICAgICAgICAgICByZXR1 cm4geyB9OwotICAgICAgICAgICAgICAgIGxlZnRTaWRlTGVuZ3RoID0gVGV4dFV0aWw6Om1pZFdv cmRCcmVhayhpbmxpbmVUZXh0SXRlbSwgZm9udENhc2NhZGUsIGNhbmRpZGF0ZVJ1bi5sb2dpY2Fs V2lkdGgsIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuLCBjYW5kaWRhdGVUZXh0UnVuLmxv Z2ljYWxMZWZ0KS5sZW5ndGg7CisgICAgICAgICAgICAgICAgbGVmdFNpZGVMZW5ndGggPSBUZXh0 VXRpbDo6YnJlYWtXb3JkKGlubGluZVRleHRJdGVtLCBmb250Q2FzY2FkZSwgY2FuZGlkYXRlUnVu LmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIGNhbmRpZGF0ZVRl eHRSdW4ubG9naWNhbExlZnQpLmxlbmd0aDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlm IChsZWZ0U2lkZUxlbmd0aCA8IGxpbWl0QmVmb3JlKQogICAgICAgICAgICAgICAgIHJldHVybiB7 IH07CkBAIC00NzcsOCArNDc3LDggQEAgc3RkOjpvcHRpb25hbDxJbmxpbmVDb250ZW50QnJlYWtl cjo6UGFydGlhbFJ1bj4gSW5saW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFraW4KICAgICAgICAg ICAgICAgICAvLyBGYXN0IHBhdGggZm9yIGNhc2VzIHdoZW4gdGhlcmUncyBubyByb29tIGF0IGFs bC4gVGhlIGNvbnRlbnQgaXMgYnJlYWthYmxlIGJ1dCB3ZSBkb24ndCBoYXZlIHNwYWNlIGZvciBp dC4KICAgICAgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICAgICAgfQotICAgICAgICAg ICAgYXV0byBtaWRXb3JkQnJlYWsgPSBUZXh0VXRpbDo6bWlkV29yZEJyZWFrKGlubGluZVRleHRJ dGVtLCBmb250Q2FzY2FkZSwgY2FuZGlkYXRlUnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lk dGgsIGNhbmRpZGF0ZVRleHRSdW4ubG9naWNhbExlZnQpOwotICAgICAgICAgICAgcmV0dXJuIHsg bWlkV29yZEJyZWFrLmxlbmd0aCwgbWlkV29yZEJyZWFrLmxvZ2ljYWxXaWR0aCB9OworICAgICAg ICAgICAgYXV0byB3b3JkQnJlYWsgPSBUZXh0VXRpbDo6YnJlYWtXb3JkKGlubGluZVRleHRJdGVt LCBmb250Q2FzY2FkZSwgY2FuZGlkYXRlUnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lkdGgs IGNhbmRpZGF0ZVRleHRSdW4ubG9naWNhbExlZnQpOworICAgICAgICAgICAgcmV0dXJuIHsgd29y ZEJyZWFrLmxlbmd0aCwgd29yZEJyZWFrLmxvZ2ljYWxXaWR0aCB9OwogICAgICAgICB9OwogICAg ICAgICAvLyBXaXRoIGFyYml0cmFyeSBicmVha2luZyB0aGVyZSdzIGFsd2F5cyBhIHZhbGlkIGJy ZWFraW5nIHBvc2l0aW9uIChldmVuIGlmIGl0IGlzIGJlZm9yZSB0aGUgZmlyc3QgcG9zaXRpb24p LgogICAgICAgICByZXR1cm4gdHJ5QnJlYWtpbmdBdEFyYml0cmFyeVBvc2l0aW9uKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90 ZXh0L1RleHRVdGlsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwCmluZGV4IGFhZjBmMDhiZTBkZDE1ZjI0YWMyMzU5 ZjE1YTRiNGU2ZDE3MjM1MWYuLjU1MTNmMjdhMTRhMzI2OGVjMDgwN2I3MDQ3Yzk2NGU4MGEzMDFk MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL3RleHQvVGV4dFV0aWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwCkBAIC0xMzksNyArMTM5LDcg QEAgVGV4dFV0aWw6OkZhbGxiYWNrRm9udExpc3QgVGV4dFV0aWw6OmZhbGxiYWNrRm9udHNGb3JS dW4oY29uc3QgTGluZTo6UnVuJiBydW4sIGMKICAgICByZXR1cm4gZmFsbGJhY2tGb250czsKIH0K IAotVGV4dFV0aWw6Ok1pZFdvcmRCcmVhayBUZXh0VXRpbDo6bWlkV29yZEJyZWFrKGNvbnN0IElu bGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNj YWRlLCBJbmxpbmVMYXlvdXRVbml0IHRleHRXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFi bGVXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCitUZXh0VXRpbDo6 V29yZEJyZWFrTGVmdCBUZXh0VXRpbDo6YnJlYWtXb3JkKGNvbnN0IElubGluZVRleHRJdGVtJiBp bmxpbmVUZXh0SXRlbSwgY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNjYWRlLCBJbmxpbmVMYXlv dXRVbml0IHRleHRXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgSW5saW5l TGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCiB7CiAgICAgQVNTRVJUKGF2YWlsYWJsZVdp ZHRoID49IDApOwogICAgIGF1dG8gc3RhcnRQb3NpdGlvbiA9IGlubGluZVRleHRJdGVtLnN0YXJ0 KCk7CkBAIC0xNzgsNyArMTc4LDggQEAgVGV4dFV0aWw6Ok1pZFdvcmRCcmVhayBUZXh0VXRpbDo6 bWlkV29yZEJyZWFrKGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXQKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQotICAgIHJldHVybiB7IHN0YXJ0UG9zaXRpb24s IHJpZ2h0IC0gc3RhcnRQb3NpdGlvbiwgbGVmdFNpZGVXaWR0aCB9OworICAgIFJFTEVBU0VfQVNT RVJUKHJpZ2h0ID49IHN0YXJ0UG9zaXRpb24pOworICAgIHJldHVybiB7IHJpZ2h0IC0gc3RhcnRQ b3NpdGlvbiwgbGVmdFNpZGVXaWR0aCB9OwogfQogCiB1bnNpZ25lZCBUZXh0VXRpbDo6ZmluZE5l eHRCcmVha2FibGVQb3NpdGlvbihMYXp5TGluZUJyZWFrSXRlcmF0b3ImIGxpbmVCcmVha0l0ZXJh dG9yLCB1bnNpZ25lZCBzdGFydFBvc2l0aW9uLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS90ZXh0L1RleHRVdGlsLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmgKaW5kZXggN2Y5ZDkxZTE4MDJjNjc2MDAwMjhhYzgw ZmQyMTc1NjY0NjRmNTFkMy4uMjY5ZTRjMDAxOGQ4NzI0ZjkzNzQxZTM2ZThiYTExYWQyNGMyZmVk ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvdGV4dC9UZXh0VXRpbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuaApAQCAtNTEsMTIgKzUxLDExIEBAIHB1 YmxpYzoKICAgICB1c2luZyBGYWxsYmFja0ZvbnRMaXN0ID0gSGFzaFNldDxjb25zdCBGb250Kj47 CiAgICAgc3RhdGljIEZhbGxiYWNrRm9udExpc3QgZmFsbGJhY2tGb250c0ZvclJ1bihjb25zdCBM aW5lOjpSdW4mLCBjb25zdCBSZW5kZXJTdHlsZSYpOwogCi0gICAgc3RydWN0IE1pZFdvcmRCcmVh ayB7Ci0gICAgICAgIHNpemVfdCBzdGFydCB7IDAgfTsKKyAgICBzdHJ1Y3QgV29yZEJyZWFrTGVm dCB7CiAgICAgICAgIHNpemVfdCBsZW5ndGggeyAwIH07CiAgICAgICAgIElubGluZUxheW91dFVu aXQgbG9naWNhbFdpZHRoIHsgMCB9OwogICAgIH07Ci0gICAgc3RhdGljIE1pZFdvcmRCcmVhayBt aWRXb3JkQnJlYWsoY29uc3QgSW5saW5lVGV4dEl0ZW0mLCBjb25zdCBGb250Q2FzY2FkZSYsIElu bGluZUxheW91dFVuaXQgdGV4dFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRo LCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCk7CisgICAgc3RhdGljIFdvcmRC cmVha0xlZnQgYnJlYWtXb3JkKGNvbnN0IElubGluZVRleHRJdGVtJiwgY29uc3QgRm9udENhc2Nh ZGUmLCBJbmxpbmVMYXlvdXRVbml0IHRleHRXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFi bGVXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpOwogCiAgICAgc3Rh dGljIHVuc2lnbmVkIGZpbmROZXh0QnJlYWthYmxlUG9zaXRpb24oTGF6eUxpbmVCcmVha0l0ZXJh dG9yJiwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbiwgY29uc3QgUmVuZGVyU3R5bGUmKTsKICAgICBz dGF0aWMgTGluZUJyZWFrSXRlcmF0b3JNb2RlIGxpbmVCcmVha0l0ZXJhdG9yTW9kZShMaW5lQnJl YWspOwo=