234688 2021-12-26 09:39:14 -0800 [IFC][Integration] Update text renderer's needsVisualReordering bit 2021-12-26 11:27:17 -0800 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 1826867 0 zalan 2021-12-26 09:39:14 -0800 ssia 1826868 1 447975 zalan 2021-12-26 09:45:11 -0800 Created attachment 447975 Patch 1826891 2 ews-feeder 2021-12-26 11:26:00 -0800 Committed r287447 (245582@main): <https://commits.webkit.org/245582@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447975. 1826893 3 webkit-bug-importer 2021-12-26 11:27:17 -0800 <rdar://problem/86920223> 447975 2021-12-26 09:45:11 -0800 2021-12-26 11:26:02 -0800 Patch bug-234688-20211226094510.patch text/plain 10581 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI5N2U3ZWYzMzFkOWFk NTlkMDFlM2QyNmE0ZWQwYzZlYzY5OGNmYi4uY2ZmMjU0MzAwNGJiOWI1YTIyY2VmNzEwNDFiNWY2 NWFlOGJlMjdlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTEyLTI2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g VXBkYXRlIHRleHQgcmVuZGVyZXIncyBuZWVkc1Zpc3VhbFJlb3JkZXJpbmcgYml0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ2ODgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIHNpbWlsYXIg dG8gbGVnYWN5IGxpbmUgbGF5b3V0IHdoZXJlIHRoZSBSZW5kZXJUZXh0J3MgbmVlZHNWaXN1YWxS ZW9yZGVyaW5nIGlzCisgICAgICAgIHVwZGF0ZWQgYXMgdGhlIChiaWRpKSB0ZXh0IGJveCBpcyBi ZWluZyBwbGFjZWQgb24gdGhlIGxpbmUuCisgICAgICAgIEhlcmUgd2UgdXBkYXRlIHRoaXMgYml0 IHJpZ2h0IGFmdGVyIHRoZSBsaW5lIGxheW91dCwgd2hlbiB3ZSBmaW5pc2hlZCBjb25zdHJ1Y3Rp bmcgdGhlIGRpc3BsYXkgYm94ZXMuIAorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVudCk6CisgICAgICAgICog bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Qm94VHJlZTo6YnVpbGRUcmVlKToKKyAgICAg ICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29u dGVudEJ1aWxkZXI6OklubGluZUNvbnRlbnRCdWlsZGVyKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dEludGVncmF0aW9uOjpJbmxpbmVDb250ZW50QnVpbGRlcjo6YnVpbGQgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRC dWlsZGVyLmg6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0SW5saW5lVGV4dEJv eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRCb3g6OklubGluZVRl eHRCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjptX2NhblVzZVNpbXBsaWZpZWRDb250 ZW50TWVhc3VyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6bV9jb250YWluc0JpZGlU ZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRJbmxpbmVU ZXh0Qm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRCb3g6OmNhblVz ZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lVGV4dEJveDo6Y29udGFpbnNCaWRpVGV4dCBjb25zdCk6IERlbGV0ZWQuIE5v IG5lZWQgdG8gY2FjaGUgdGhpcyB2YWx1ZSBvbiB0aGUgbGF5b3V0IGJveAorICAgICAgICBJbmxp bmVUZXh0SXRlbXMgbW9yZSBvciBsZXNzIGhhdmUgdGhlIHNhbWUgbGlmZWN5Y2xlIGFzIHRoZWly IGFzc29jaWF0ZWQgbGF5b3V0IGJveGVzLgorICAgICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xh eW91dFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VHJlZUJ1aWxk ZXI6OmNyZWF0ZVRleHRCb3gpOgorCiAyMDIxLTEyLTI2ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBtYWtlVGV4dExvZ2ljYWxPcmRlckNhY2hlSWZOZWVkZWQgaXMg b25seSBpbnRlcmVzdGVkIGluIHdoZXRoZXIgdGhlIGNvbnRlbnQgbmVlZHMgdmlzdWFsIHJlb3Jk ZXJpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmluZGV4IGIy ZjRmMDNkZmM4M2NjZjA0ZDI0ZWIxMDcxNjVhNzFiNmE5ODlhMDguLjRiZjQwOTlhN2U4YjNmMmEw OGQ5MTVlOTA5NmE1ZWIzZDU0M2Q5ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRl bXNCdWlsZGVyLmNwcApAQCAtNDUyLDcgKzQ1Miw3IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVy OjpoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBJ CiAgICAgaWYgKCFjb250ZW50TGVuZ3RoKQogICAgICAgICByZXR1cm4gaW5saW5lSXRlbXMuYXBw ZW5kKElubGluZVRleHRJdGVtOjpjcmVhdGVFbXB0eUl0ZW0oaW5saW5lVGV4dEJveCkpOwogCi0g ICAgbV9uZWVkc1Zpc3VhbFJlb3JkZXJpbmcgPSBtX25lZWRzVmlzdWFsUmVvcmRlcmluZyB8fCBp bmxpbmVUZXh0Qm94LmNvbnRhaW5zQmlkaVRleHQoKTsKKyAgICBtX25lZWRzVmlzdWFsUmVvcmRl cmluZyA9IG1fbmVlZHNWaXN1YWxSZW9yZGVyaW5nIHx8IFRleHRVdGlsOjpjb250YWluc1N0cm9u Z0RpcmVjdGlvbmFsaXR5VGV4dCh0ZXh0KTsKICAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRleHRC b3guc3R5bGUoKTsKICAgICBhdXRvIHNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyA9IFRleHRV dGlsOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEJveCk7CiAgICAgYXV0 byBzaG91bGRQcmVzZXJ2ZU5ld2xpbmUgPSBUZXh0VXRpbDo6c2hvdWxkUHJlc2VydmVOZXdsaW5l KGlubGluZVRleHRCb3gpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAppbmRleCA4MjI0MDMw ZTY4NjdiMjVkOGIwZWUyNTdkYWUxMGQ0MzYwNTUwODM3Li42MGI1NDc3MjJjZmRmYTczZjQ2OGZh ZTRkZWIzZWZjODZhYjE3ZGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcApAQCAtOTcs MTEgKzk3LDggQEAgdm9pZCBCb3hUcmVlOjpidWlsZFRyZWUoKQogICAgICAgICAgICAgYXV0byYg dGV4dFJlbmRlcmVyID0gZG93bmNhc3Q8UmVuZGVyVGV4dD4oY2hpbGRSZW5kZXJlcik7CiAgICAg ICAgICAgICBhdXRvIHN0eWxlID0gUmVuZGVyU3R5bGU6OmNyZWF0ZUFub255bW91c1N0eWxlV2l0 aERpc3BsYXkodGV4dFJlbmRlcmVyLnN0eWxlKCksIERpc3BsYXlUeXBlOjpJbmxpbmUpOwogICAg ICAgICAgICAgYXV0byB0ZXh0ID0gc3R5bGUudGV4dFNlY3VyaXR5KCkgPT0gVGV4dFNlY3VyaXR5 OjpOb25lID8gdGV4dFJlbmRlcmVyLnRleHQoKSA6IFJlbmRlckJsb2NrOjp1cGRhdGVTZWN1cml0 eURpc2NDaGFyYWN0ZXJzKHN0eWxlLCB0ZXh0UmVuZGVyZXIudGV4dCgpKTsKLSAgICAgICAgICAg IGF1dG8gY29udGFpbnNCaWRpVGV4dCA9IExheW91dDo6VGV4dFV0aWw6OmNvbnRhaW5zU3Ryb25n RGlyZWN0aW9uYWxpdHlUZXh0KHRleHQpOwotICAgICAgICAgICAgaWYgKGNvbnRhaW5zQmlkaVRl eHQpCi0gICAgICAgICAgICAgICAgdGV4dFJlbmRlcmVyLnNldE5lZWRzVmlzdWFsUmVvcmRlcmlu ZygpOwogICAgICAgICAgICAgYXV0byB1c2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyA9IHRleHRS ZW5kZXJlci5jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZygpICYmICghZmlyc3RMaW5lU3R5 bGUgfHwgZmlyc3RMaW5lU3R5bGUtPmZvbnRDYXNjYWRlKCkgPT0gc3R5bGUuZm9udENhc2NhZGUo KSk7Ci0gICAgICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxMYXlvdXQ6OklubGluZVRleHRCb3g+ KHRleHQsIHVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nLCBjb250YWluc0JpZGlUZXh0LCBXVEZN b3ZlKHN0eWxlKSwgV1RGTW92ZShmaXJzdExpbmVTdHlsZSkpOworICAgICAgICAgICAgcmV0dXJu IG1ha2VVbmlxdWU8TGF5b3V0OjpJbmxpbmVUZXh0Qm94Pih0ZXh0LCB1c2VTaW1wbGlmaWVkVGV4 dE1lYXN1cmluZywgV1RGTW92ZShzdHlsZSksIFdURk1vdmUoZmlyc3RMaW5lU3R5bGUpKTsKICAg ICAgICAgfQogCiAgICAgICAgIGF1dG8gc3R5bGUgPSBSZW5kZXJTdHlsZTo6Y2xvbmUoY2hpbGRS ZW5kZXJlci5zdHlsZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnRCdWlsZGVyLmNwcAppbmRleCA2NGY2Yjg3NGYzNjhlN2QwZDhkZWIyMDdkNDdkMTE0NDkzZTMx OWYxLi5iZWY5ZDVhYTI1MDk3ODg1NThlMjVhN2Y2N2VlMTUzYjJlNmY2YjRkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Jbmxp bmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC01Nyw3ICs1 Nyw3IEBAIGlubGluZSBzdGF0aWMgZmxvYXQgbGluZU92ZXJmbG93V2lkdGgoY29uc3QgUmVuZGVy QmxvY2tGbG93JiBmbG93LCBMYXlvdXQ6OklubGluCiAgICAgcmV0dXJuIGxpbmVDb250ZW50V2lk dGggKyBlbmRQYWRkaW5nOwogfQogCi1JbmxpbmVDb250ZW50QnVpbGRlcjo6SW5saW5lQ29udGVu dEJ1aWxkZXIoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3csIGNvbnN0IEJveFRyZWUm IGJveFRyZWUpCitJbmxpbmVDb250ZW50QnVpbGRlcjo6SW5saW5lQ29udGVudEJ1aWxkZXIoY29u c3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3csIEJveFRyZWUmIGJveFRyZWUpCiAgICAgOiBt X2Jsb2NrRmxvdyhibG9ja0Zsb3cpCiAgICAgLCBtX2JveFRyZWUoYm94VHJlZSkKIHsKQEAgLTY3 LDYgKzY3LDE4IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmJ1aWxkKExheW91dDo6SW5s aW5lRm9ybWF0dGluZ1N0YXRlJiBpbmxpbmVGb3JtYXR0aW5nCiB7CiAgICAgLy8gRklYTUU6IFRo aXMgbWlnaHQgbmVlZCBhIGRpZmZlcmVudCBhcHByb2FjaCB3aXRoIHBhcnRpYWwgbGF5b3V0IHdo ZXJlIHRoZSBsYXlvdXQgY29kZSBuZWVkcyB0byBrbm93IGFib3V0IHRoZSBib3hlcy4KICAgICBp bmxpbmVDb250ZW50LmJveGVzID0gV1RGTW92ZShpbmxpbmVGb3JtYXR0aW5nU3RhdGUuYm94ZXMo KSk7CisKKyAgICBhdXRvIHVwZGF0ZUlmVGV4dFJlbmRlcmVyc05lZWRWaXN1YWxSZW9yZGVyaW5n ID0gWyZdIHsKKyAgICAgICAgLy8gRklYTUU6IFdlIG1heSB3YW50IHRvIGhhdmUgYSBnbG9iYWws ICJpcyB0aGlzIGEgYmlkaSBwYXJhZ3JhcGgiIGZsYWcgdG8gYXZvaWQgdGhpcyBsb29wIGZvciBu b24tcnRsLCBub24tYmlkaSBjb250ZW50LiAKKyAgICAgICAgZm9yIChhdXRvJiBkaXNwbGF5Qm94 IDogaW5saW5lQ29udGVudC5ib3hlcykgeworICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0g ZGlzcGxheUJveC5sYXlvdXRCb3goKTsKKyAgICAgICAgICAgIGlmICghaXM8TGF5b3V0OjpJbmxp bmVUZXh0Qm94PihsYXlvdXRCb3gpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICAgICAgaWYgKGRpc3BsYXlCb3guYmlkaUxldmVsKCkgIT0gVUJJRElfREVGQVVMVF9MVFIpIAor ICAgICAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlclRleHQ+KG1fYm94VHJlZS5yZW5kZXJlckZv ckxheW91dEJveChsYXlvdXRCb3gpKS5zZXROZWVkc1Zpc3VhbFJlb3JkZXJpbmcoKTsKKyAgICAg ICAgfQorICAgIH07CisgICAgdXBkYXRlSWZUZXh0UmVuZGVyZXJzTmVlZFZpc3VhbFJlb3JkZXJp bmcoKTsKICAgICBjcmVhdGVEaXNwbGF5TGluZXMoaW5saW5lRm9ybWF0dGluZ1N0YXRlLCBpbmxp bmVDb250ZW50KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRC dWlsZGVyLmgKaW5kZXggODdhOTA5NzFhZWI5NzRjMDNiZjM2MjllNGYyMDdkMmQ4ZmExZDYzOC4u MGYwOTgwMWFlMzhlM2NmOWE3NTZjMTliZTNjNjcyZmY3Zjk0ZjdhZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29u dGVudEJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5oCkBAIC00MSw3ICs0MSw3IEBAIHN0 cnVjdCBJbmxpbmVDb250ZW50OwogCiBjbGFzcyBJbmxpbmVDb250ZW50QnVpbGRlciB7CiBwdWJs aWM6Ci0gICAgSW5saW5lQ29udGVudEJ1aWxkZXIoY29uc3QgUmVuZGVyQmxvY2tGbG93JiwgY29u c3QgQm94VHJlZSYpOworICAgIElubGluZUNvbnRlbnRCdWlsZGVyKGNvbnN0IFJlbmRlckJsb2Nr RmxvdyYsIEJveFRyZWUmKTsKIAogICAgIHZvaWQgYnVpbGQoTGF5b3V0OjpJbmxpbmVGb3JtYXR0 aW5nU3RhdGUmLCBJbmxpbmVDb250ZW50JikgY29uc3Q7CiAKQEAgLTQ5LDcgKzQ5LDcgQEAgcHJp dmF0ZToKICAgICB2b2lkIGNyZWF0ZURpc3BsYXlMaW5lcyhMYXlvdXQ6OklubGluZUZvcm1hdHRp bmdTdGF0ZSYsIElubGluZUNvbnRlbnQmKSBjb25zdDsKIAogICAgIGNvbnN0IFJlbmRlckJsb2Nr RmxvdyYgbV9ibG9ja0Zsb3c7Ci0gICAgY29uc3QgQm94VHJlZSYgbV9ib3hUcmVlOworICAgIEJv eFRyZWUmIG1fYm94VHJlZTsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9sYXlvdXR0cmVlL0xheW91dElubGluZVRleHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2xheW91dHRyZWUvTGF5b3V0SW5saW5lVGV4dEJveC5jcHAKaW5kZXggMDlmODhiZTcx NWIwOTM1Y2U5Y2E2YmRmMmY1NTA4MWNiZmY4ZjIwNi4uY2M5Mzk5N2E3MTdiMDM0Nzk0NTYyYWY5 NmRiMjAzODVkOTA5OGM1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91 dHRyZWUvTGF5b3V0SW5saW5lVGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2xheW91dHRyZWUvTGF5b3V0SW5saW5lVGV4dEJveC5jcHAKQEAgLTM2LDExICszNiwxMCBAQCBu YW1lc3BhY2UgTGF5b3V0IHsKIAogV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9JTVBMKElubGluZVRl eHRCb3gpOwogCi1JbmxpbmVUZXh0Qm94OjpJbmxpbmVUZXh0Qm94KFN0cmluZyBjb250ZW50LCBi b29sIGNhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nLCBib29sIGNvbnRhaW5zQmlkaVRl eHQsIFJlbmRlclN0eWxlJiYgc3R5bGUsIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4mJiBm aXJzdExpbmVTdHlsZSkKK0lubGluZVRleHRCb3g6OklubGluZVRleHRCb3goU3RyaW5nIGNvbnRl bnQsIGJvb2wgY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcsIFJlbmRlclN0eWxlJiYg c3R5bGUsIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4mJiBmaXJzdExpbmVTdHlsZSkKICAg ICA6IEJveCh7IH0sIFdURk1vdmUoc3R5bGUpLCBXVEZNb3ZlKGZpcnN0TGluZVN0eWxlKSwgQm94 OjpJbmxpbmVUZXh0Qm94RmxhZykKICAgICAsIG1fY29udGVudChjb250ZW50KQogICAgICwgbV9j YW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZyhjYW5Vc2VTaW1wbGlmaWVkQ29udGVudE1l YXN1cmluZykKLSAgICAsIG1fY29udGFpbnNCaWRpVGV4dChjb250YWluc0JpZGlUZXh0KQogewog ICAgIHNldElzQW5vbnltb3VzKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvbGF5b3V0dHJlZS9MYXlvdXRJbmxpbmVUZXh0Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvbGF5b3V0dHJlZS9MYXlvdXRJbmxpbmVUZXh0Qm94LmgKaW5kZXggYWI3NmQ5MzA1ZDE1NGZm MjE5ZmNkNzMxYjE1MGU0MzlkNzhjNzM0Yy4uZjlmYmM1YTM1ZWU3NjhhNTBkZGZmYjBlM2ViZWZi NDJlN2NiNzgwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUv TGF5b3V0SW5saW5lVGV4dEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0 cmVlL0xheW91dElubGluZVRleHRCb3guaApAQCAtMzcsMTggKzM3LDE2IEBAIG5hbWVzcGFjZSBM YXlvdXQgewogY2xhc3MgSW5saW5lVGV4dEJveCA6IHB1YmxpYyBCb3ggewogICAgIFdURl9NQUtF X0lTT19BTExPQ0FURUQoSW5saW5lVGV4dEJveCk7CiBwdWJsaWM6Ci0gICAgSW5saW5lVGV4dEJv eChTdHJpbmcsIGJvb2wgY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcsIGJvb2wgY29u dGFpbnNCaWRpVGV4dCwgUmVuZGVyU3R5bGUmJiwgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxl PiYmIGZpcnN0TGluZVN0eWxlID0gbnVsbHB0cik7CisgICAgSW5saW5lVGV4dEJveChTdHJpbmcs IGJvb2wgY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcsIFJlbmRlclN0eWxlJiYsIHN0 ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4mJiBmaXJzdExpbmVTdHlsZSA9IG51bGxwdHIpOwog ICAgIHZpcnR1YWwgfklubGluZVRleHRCb3goKSA9IGRlZmF1bHQ7CiAKICAgICBTdHJpbmcgY29u dGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudDsgfQogICAgIC8vIEZJWE1FOiBUaGlzIHNo b3VsZCBub3QgYmUgYSBib3gncyBwcm9wZXJ0eS4KICAgICBib29sIGNhblVzZVNpbXBsaWZpZWRD b250ZW50TWVhc3VyaW5nKCkgY29uc3QgeyByZXR1cm4gbV9jYW5Vc2VTaW1wbGlmaWVkQ29udGVu dE1lYXN1cmluZzsgfQotICAgIGJvb2wgY29udGFpbnNCaWRpVGV4dCgpIGNvbnN0IHsgcmV0dXJu IG1fY29udGFpbnNCaWRpVGV4dDsgfQogCiBwcml2YXRlOgogICAgIFN0cmluZyBtX2NvbnRlbnQ7 CiAgICAgYm9vbCBtX2NhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nIHsgZmFsc2UgfTsK LSAgICBib29sIG1fY29udGFpbnNCaWRpVGV4dCB7IGZhbHNlIH07CiB9OwogCiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5j cHAKaW5kZXggMDg2YzQ4ZDIzNTA1ZDczYTQyOGU5OTcyNjMwYmVlMjAzN2U0ODI1OC4uYzRiM2Q3 ZTcwZjMxZDg2ZGMzYTMwZThiZjc3ZjM3MmY2MzgzOTBiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcApAQCAtMTM0 LDcgKzEzNCw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxCb3g+IFRyZWVCdWlsZGVyOjpjcmVhdGVSZXBs YWNlZEJveChzdGQ6Om9wdGlvbmFsPEJveDo6RWxlbWVudEF0CiAKIHN0ZDo6dW5pcXVlX3B0cjxC b3g+IFRyZWVCdWlsZGVyOjpjcmVhdGVUZXh0Qm94KFN0cmluZyB0ZXh0LCBib29sIGNhblVzZVNp bXBsaWZpZWRUZXh0TWVhc3VyaW5nLCBSZW5kZXJTdHlsZSYmIHN0eWxlKQogewotICAgIHJldHVy biBtYWtlVW5pcXVlPElubGluZVRleHRCb3g+KHRleHQsIGNhblVzZVNpbXBsaWZpZWRUZXh0TWVh c3VyaW5nLCBUZXh0VXRpbDo6Y29udGFpbnNTdHJvbmdEaXJlY3Rpb25hbGl0eVRleHQodGV4dCks IFdURk1vdmUoc3R5bGUpKTsKKyAgICByZXR1cm4gbWFrZVVuaXF1ZTxJbmxpbmVUZXh0Qm94Pih0 ZXh0LCBjYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZywgV1RGTW92ZShzdHlsZSkpOwogfQog CiBzdGQ6OnVuaXF1ZV9wdHI8Qm94PiBUcmVlQnVpbGRlcjo6Y3JlYXRlTGluZUJyZWFrQm94KGJv b2wgaXNPcHRpb25hbCwgUmVuZGVyU3R5bGUmJiBzdHlsZSkK