229652 2021-08-28 17:56:22 -0700 [LFC][IFC] Make line runs relative to the formatting root border box. 2021-08-29 09:11:17 -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 1788350 0 zalan 2021-08-28 17:56:22 -0700 as opposed to relative to the line box. 1788351 1 436726 zalan 2021-08-28 18:05:06 -0700 Created attachment 436726 Patch 1788355 2 436727 zalan 2021-08-28 18:59:14 -0700 Created attachment 436727 Patch 1788390 3 ews-feeder 2021-08-29 09:10:33 -0700 Committed r281744 (241086@main): <https://commits.webkit.org/241086@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436727. 1788391 4 webkit-bug-importer 2021-08-29 09:11:17 -0700 <rdar://problem/82499192> 436726 2021-08-28 18:05:06 -0700 2021-08-28 18:59:12 -0700 Patch bug-229652-20210828180505.patch text/plain 11056 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY4MGFmZWU1NTE5M2Rl NzhkODc4MzQ3ODQ2NTYzOTQ0M2E0OTE3ZS4uZmMwYjRiNWIyNjM4MTExYTBhMGViZDA3NGYyMTBk MWJmMDJhMGU4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA4LTI4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1ha2UgbGlu ZSBydW5zIHJlbGF0aXZlIHRvIHRoZSBmb3JtYXR0aW5nIHJvb3QgYm9yZGVyIGJveC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTY1MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIGNvbnN0cnVj dCB0aGUgbGluZSBydW5zIHJlbGF0aXZlIHRvIHRoZSBib3JkZXIgYm94IG9mIHRoZSBpbmxpbmUg Zm9ybWF0dGluZyBjb250ZXh0IHJvb3QKKyAgICAgICAgKGFzIG9wcG9zZWQgdG8gcmVsYXRpdmUg dG8gdGhlIGxpbmUgYm94KSwgc28gdGhhdCB0aGUgaW50ZWdyYXRpb24gcnVucyBjb3VsZCBqdXN0 IGNvcHkgdGhlaXIgcG9zaXRpb25zLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24g Zm9yIG1lcmdpbmcgbGluZSBydW5zIHdpdGggdGhlIGludGVncmF0aW9uIHJ1bnMuCisKKyAgICAg ICAgKiBkaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9yeS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpEaXNwbGF5OjpCb3hGYWN0b3J5OjpkaXNwbGF5Qm94Rm9yVGV4dFJ1biBjb25zdCk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZVNwYW5uaW5nSW5saW5lQm94ZXMpOgor ICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpJbmxp bmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVSdW5zIGNvbnN0KToKKwogMjAyMS0w OC0yOCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBNb3ZlIGNvbnRlbnQgYnVpbGRlciBmdW5jdGlvbmFsaXR5IHRvIGEgZGVkaWNhdGVkIGNsYXNz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9y eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9yeS5jcHAK aW5kZXggYzg4OGU4NzYwMjNkODc2MmNhYTMyN2U0MDgyMzMyMDNlNTk4M2M5OS4uMjM2YjllNzhh MWU4NmZkMzVhOTlkMjVhYmUxMzA4NzUzYTRiNDllMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZGlzcGxheS9jc3MvRGlzcGxheUJveEZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hGYWN0b3J5LmNwcApAQCAtMTUwLDcgKzE1MCw2IEBAIHN0 ZDo6dW5pcXVlX3B0cjxCb3g+IEJveEZhY3Rvcnk6OmRpc3BsYXlCb3hGb3JUZXh0UnVuKGNvbnN0 IExheW91dDo6TGluZVJ1biYgcnVuCiAgICAgYXV0byBsaW5lTGF5b3V0UmVjdCA9IExheW91dFJl Y3QgeyBsaW5lUmVjdC5sZWZ0KCksIGxpbmVSZWN0LnRvcCgpLCBsaW5lUmVjdC53aWR0aCgpLCBs aW5lUmVjdC5oZWlnaHQoKSB9OwogCiAgICAgYXV0byBydW5SZWN0ID0gTGF5b3V0UmVjdCB7IHJ1 bi5sb2dpY2FsTGVmdCgpLCBydW4ubG9naWNhbFRvcCgpLCBydW4ubG9naWNhbFdpZHRoKCksIHJ1 bi5sb2dpY2FsSGVpZ2h0KCkgfTsKLSAgICBydW5SZWN0Lm1vdmVCeShsaW5lTGF5b3V0UmVjdC5s b2NhdGlvbigpKTsKICAgICBydW5SZWN0Lm1vdmUoY29udGFpbmluZ0Jsb2NrQ29udGV4dC5vZmZz ZXRGcm9tUm9vdCk7CiAKICAgICBhdXRvIHN0eWxlID0gU3R5bGUgeyBydW4ubGF5b3V0Qm94KCku c3R5bGUoKSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5jcHAKaW5kZXggZjc0NDY5MTYyMTlkYWM5NDI3Mzg1NjZhNWY2ODNhZDNkMzM2 ZDk3NS4uNWY1MTcyMGNjODZiZWY3YmM2YzI1ZDQ0ZGU3ZjllNjlmMDIyOGNmMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBA IC02MCwxOSArNjAsMjUgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0 ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnMKICAgICBmb3IgKGF1dG8m IGxpbmVSdW4gOiBsaW5lQ29udGVudC5ydW5zKSB7CiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9 IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAgICAgICAgIHN3aXRjaCAobGluZVJ1bi50eXBlKCkpIHsK LSAgICAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpUZXh0OgotICAgICAgICAgICAgZm9ybWF0 dGluZ1N0YXRlLmFkZExpbmVSdW4oeyBsaW5lSW5kZXgsIExpbmVSdW46OlR5cGU6OlRleHQsIGxh eW91dEJveCwgbGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1biksIGxpbmVSdW4u ZXhwYW5zaW9uKCksIGxpbmVSdW4udGV4dENvbnRlbnQoKSB9KTsKKyAgICAgICAgY2FzZSBJbmxp bmVJdGVtOjpUeXBlOjpUZXh0OiB7CisgICAgICAgICAgICBhdXRvIHRleHRSdW5SZWN0ID0gbGlu ZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bik7CisgICAgICAgICAgICB0ZXh0UnVu UmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKKyAgICAgICAgICAgIGZvcm1hdHRp bmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBMaW5lUnVuOjpUeXBlOjpUZXh0LCBsYXlv dXRCb3gsIHRleHRSdW5SZWN0LCBsaW5lUnVuLmV4cGFuc2lvbigpLCBsaW5lUnVuLnRleHRDb250 ZW50KCkgfSk7CiAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBJbmxpbmVJdGVtOjpU eXBlOjpTb2Z0TGluZUJyZWFrOgotICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVS dW4oeyBsaW5lSW5kZXgsIExpbmVSdW46OlR5cGU6OlNvZnRMaW5lQnJlYWssIGxheW91dEJveCwg bGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1biksIGxpbmVSdW4uZXhwYW5zaW9u KCksIGxpbmVSdW4udGV4dENvbnRlbnQoKSB9KTsKKyAgICAgICAgfQorICAgICAgICBjYXNlIElu bGluZUl0ZW06OlR5cGU6OlNvZnRMaW5lQnJlYWs6IHsKKyAgICAgICAgICAgIGF1dG8gc29mdExp bmVCcmVha1J1blJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihsaW5lUnVuKTsK KyAgICAgICAgICAgIHNvZnRMaW5lQnJlYWtSdW5SZWN0Lm1vdmVCeShsaW5lQm94TG9naWNhbFRv cExlZnQpOworICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVSdW4oeyBsaW5lSW5k ZXgsIExpbmVSdW46OlR5cGU6OlNvZnRMaW5lQnJlYWssIGxheW91dEJveCwgc29mdExpbmVCcmVh a1J1blJlY3QsIGxpbmVSdW4uZXhwYW5zaW9uKCksIGxpbmVSdW4udGV4dENvbnRlbnQoKSB9KTsK ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgICAgIGNhc2UgSW5saW5lSXRlbTo6 VHlwZTo6SGFyZExpbmVCcmVhazogewogICAgICAgICAgICAgLy8gT25seSBoYXJkIGxpbmVicmVh a3MgaGF2ZSBhc3NvY2lhdGVkIGxheW91dCBib3hlcy4KICAgICAgICAgICAgIGF1dG8gbGluZUJy ZWFrQm94UmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JMaW5lQnJlYWtCb3gobGF5b3V0Qm94 KTsKKyAgICAgICAgICAgIGxpbmVCcmVha0JveFJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9w TGVmdCk7CiAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRl eCwgTGluZVJ1bjo6VHlwZTo6TGluZUJyZWFrQm94LCBsYXlvdXRCb3gsIGxpbmVCcmVha0JveFJl Y3QsIGxpbmVSdW4uZXhwYW5zaW9uKCksIHsgfSB9KTsKIAogICAgICAgICAgICAgYXV0byYgYm94 R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKLSAgICAg ICAgICAgIGxpbmVCcmVha0JveFJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CiAg ICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b0xheW91dFBvaW50KGxp bmVCcmVha0JveFJlY3QudG9wTGVmdCgpKSk7CiAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRD b250ZW50Qm94SGVpZ2h0KHRvTGF5b3V0VW5pdChsaW5lQnJlYWtCb3hSZWN0LmhlaWdodCgpKSk7 CiAgICAgICAgICAgICBicmVhazsKQEAgLTgxLDExICs4NywxMSBAQCB2b2lkIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZUNvbnRl bnQoY29ucwogICAgICAgICAgICAgQVNTRVJUKGxheW91dEJveC5pc0F0b21pY0lubGluZUxldmVs Qm94KCkpOwogICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUu Ym94R2VvbWV0cnkobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGF1dG8gbG9naWNhbEJvcmRlckJv eCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvckF0b21pY0lubGluZUxldmVsQm94KGxheW91 dEJveCwgYm94R2VvbWV0cnkpOworICAgICAgICAgICAgbG9naWNhbEJvcmRlckJveC5tb3ZlQnko bGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRM aW5lUnVuKHsgbGluZUluZGV4LCBMaW5lUnVuOjpUeXBlOjpBdG9taWNJbmxpbmVMZXZlbEJveCwg bGF5b3V0Qm94LCBsb2dpY2FsQm9yZGVyQm94LCBsaW5lUnVuLmV4cGFuc2lvbigpLCB7IH0gfSk7 CiAKICAgICAgICAgICAgIGF1dG8gYm9yZGVyQm94TG9naWNhbFRvcExlZnQgPSBsb2dpY2FsQm9y ZGVyQm94LnRvcExlZnQoKTsKICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCBpbmxpbmUgYm94ZXMg YXJlIHJlbGF0aXZlIHRvIHRoZSBsaW5lIGFuZCB0aGVpciB0b3AgcG9zaXRpb24gY2FuIGJlIG5l Z2F0aXZlLgotICAgICAgICAgICAgYm9yZGVyQm94TG9naWNhbFRvcExlZnQubW92ZUJ5KGxpbmVC b3hMb2dpY2FsVG9wTGVmdCk7CiAgICAgICAgICAgICAvLyBBdG9taWMgaW5saW5lIGJveGVzIGFy ZSBhbGwgc2V0LiBUaGVpciBtYXJnaW4vYm9yZGVyL2NvbnRlbnQgYm94IGdlb21ldHJpZXMgYXJl IGFscmVhZHkgY29tcHV0ZWQuIFdlIGp1c3QgaGF2ZSB0byBwb3NpdGlvbiB0aGVtIGhlcmUuCiAg ICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b0xheW91dFBvaW50KGJv cmRlckJveExvZ2ljYWxUb3BMZWZ0KSk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTk0LDYgKzEw MCw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBk YXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zCiAgICAgICAgICAgICAvLyBUaGlzIGlubGlu ZSBib3ggc2hvd2VkIHVwIGZpcnN0IG9uIHRoaXMgbGluZS4KICAgICAgICAgICAgIGF1dG8mIGJv eEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KGxheW91dEJveCk7CiAgICAg ICAgICAgICBhdXRvIGlubGluZUJveEJvcmRlckJveCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJv eEZvcklubGluZUJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKKyAgICAgICAgICAgIGlubGlu ZUJveEJvcmRlckJveC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKICAgICAgICAgICAg IGlmIChsaW5lQm94Lmhhc0NvbnRlbnQoKSkgewogICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBJ dCdzIGV4cGVjdGVkIHRvIG5vdCBoYXZlIGFueSBydW5zIG9uIGVtcHR5IGxpbmVzLiBXZSBzaG91 bGQgcmVjb25zaWRlciB0aGlzLgogICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRM aW5lUnVuKHsgbGluZUluZGV4LCBMaW5lUnVuOjpUeXBlOjpOb25Sb290SW5saW5lQm94LCBsYXlv dXRCb3gsIGlubGluZUJveEJvcmRlckJveCwgeyB9LCB7IH0sIGxpbmVCb3guaW5saW5lTGV2ZWxC b3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KS5oYXNDb250ZW50KCkgfSk7CkBAIC0xMDEsNyArMTA4 LDYgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRh dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnMKIAogICAgICAgICAgICAgYXV0byBpbmxpbmVC b3hTaXplID0gTGF5b3V0U2l6ZSB7IExheW91dFVuaXQ6OmZyb21GbG9hdENlaWwoaW5saW5lQm94 Qm9yZGVyQm94LndpZHRoKCkpLCBMYXlvdXRVbml0Ojpmcm9tRmxvYXRDZWlsKGlubGluZUJveEJv cmRlckJveC5oZWlnaHQoKSkgfTsKICAgICAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBSZWN0 IHsgTGF5b3V0UG9pbnQgeyBpbmxpbmVCb3hCb3JkZXJCb3gudG9wTGVmdCgpIH0sIGlubGluZUJv eFNpemUgfTsKLSAgICAgICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVCeShMYXlvdXRQb2ludCB7IGxp bmVCb3hMb2dpY2FsVG9wTGVmdCB9KTsKICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2lj YWxUb3BMZWZ0KGxvZ2ljYWxSZWN0LnRvcExlZnQoKSk7CiAgICAgICAgICAgICBhdXRvIGNvbnRl bnRCb3hIZWlnaHQgPSBsb2dpY2FsUmVjdC5oZWlnaHQoKSAtIChib3hHZW9tZXRyeS52ZXJ0aWNh bEJvcmRlcigpICsgYm94R2VvbWV0cnkudmVydGljYWxQYWRkaW5nKCkudmFsdWVfb3IoMF9sdSkp OwogICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChjb250ZW50Qm94 SGVpZ2h0KTsKQEAgLTEzMywxMiArMTM5LDEyIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lU3Bhbm5pbmdJbmxpCiAg ICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KGxh eW91dEJveCk7CiAgICAgICAgIC8vIElubGluZSBib3hlcyBtYXkgb3IgbWF5IG5vdCBiZSB3cmFw cGVkIGFuZCBoYXZlIHJ1bnMgb24gbXVsdGlwbGUgbGluZXMgKGUuZy4gPHNwYW4+Zmlyc3QgbGlu ZTxicj5zZWNvbmQgbGluZTxicj50aGlyZCBsaW5lPC9zcGFuPikKICAgICAgICAgYXV0byBpbmxp bmVCb3hCb3JkZXJCb3ggPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5 b3V0Qm94LCBib3hHZW9tZXRyeSk7CisgICAgICAgIGlubGluZUJveEJvcmRlckJveC5tb3ZlQnko bGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKIAogICAgICAgICBmb3JtYXR0aW5nU3RhdGUubGluZVJ1 bnMoKS5pbnNlcnQobGluZVNwYW5uaW5nSW5saW5lQm94SW5kZXgrKywgeyBsaW5lSW5kZXgsIExp bmVSdW46OlR5cGU6Ok5vblJvb3RJbmxpbmVCb3gsIGxheW91dEJveCwgaW5saW5lQm94Qm9yZGVy Qm94LCB7IH0sIHsgfSwgaW5saW5lTGV2ZWxCb3guaGFzQ29udGVudCgpLCB0cnVlIH0pOwogCiAg ICAgICAgIGF1dG8gaW5saW5lQm94U2l6ZSA9IExheW91dFNpemUgeyBMYXlvdXRVbml0Ojpmcm9t RmxvYXRDZWlsKGlubGluZUJveEJvcmRlckJveC53aWR0aCgpKSwgTGF5b3V0VW5pdDo6ZnJvbUZs b2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3guaGVpZ2h0KCkpIH07CiAgICAgICAgIGF1dG8gbG9n aWNhbFJlY3QgPSBSZWN0IHsgTGF5b3V0UG9pbnQgeyBpbmxpbmVCb3hCb3JkZXJCb3gudG9wTGVm dCgpIH0sIGlubGluZUJveFNpemUgfTsKLSAgICAgICAgbG9naWNhbFJlY3QubW92ZUJ5KExheW91 dFBvaW50IHsgbGluZUJveExvZ2ljYWxUb3BMZWZ0IH0pOwogICAgICAgICAvLyBNaWRkbGUgb3Ig ZW5kIG9mIHRoZSBpbmxpbmUgYm94LiBMZXQncyBzdHJldGNoIHRoZSBib3ggYXMgbmVlZGVkLgog ICAgICAgICBhdXRvIGVuY2xvc2luZ0JvcmRlckJveFJlY3QgPSBCb3hHZW9tZXRyeTo6Ym9yZGVy Qm94UmVjdChib3hHZW9tZXRyeSk7CiAgICAgICAgIGVuY2xvc2luZ0JvcmRlckJveFJlY3QuZXhw YW5kVG9Db250YWluKGxvZ2ljYWxSZWN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA1ZTE4OGMxNzJkODU2NDJjZjA1MTIxNDkzNDA1 MGQ3ZDljMTRmYTlhLi5jZWI4MDQyMzRhMzdjNjA4MDI0OTRhMDcxN2ExYWRmYmFiYjhiNDNiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBA IC0yNTUsMTIgKzI1NSwxMCBAQCB2b2lkIElubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNw bGF5TGluZVJ1bnMoY29uc3QgTGF5b3V0OjpJbmxpbmVMaW5lcyYgbGluZQogICAgICAgICB9CiAg ICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAgICAgICAgIGF1 dG8gbGluZUluZGV4ID0gbGluZVJ1bi5saW5lSW5kZXgoKTsKLSAgICAgICAgYXV0byYgbGluZUJv eExvZ2ljYWxSZWN0ID0gbGluZXNbbGluZUluZGV4XS5saW5lQm94TG9naWNhbFJlY3QoKTsKICAg ICAgICAgLy8gSW5saW5lIGJveGVzIGFyZSByZWxhdGl2ZSB0byB0aGUgbGluZSBib3ggd2hpbGUg ZmluYWwgcnVucyBuZWVkIHRvIGJlIHJlbGF0aXZlIHRvIHRoZSBwYXJlbnQgYm94CiAgICAgICAg IC8vIEZJWE1FOiBTaG91bGRuJ3Qgd2UganVzdCBsZWF2ZSB0aGVtIGJlIHJlbGF0aXZlIHRvIHRo ZSBsaW5lIGJveD8KICAgICAgICAgYXV0byBydW5SZWN0ID0gRmxvYXRSZWN0IHsgbGluZVJ1bi5s b2dpY2FsUmVjdCgpIH07CiAgICAgICAgIGF1dG8mIGdlb21ldHJ5ID0gbV9sYXlvdXRTdGF0ZS5n ZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOwotICAgICAgICBydW5SZWN0Lm1vdmVCeSh7IGxpbmVC b3hMb2dpY2FsUmVjdC5sZWZ0KCksIGxpbmVCb3hMb2dpY2FsUmVjdC50b3AoKSB9KTsKICAgICAg ICAgcnVuUmVjdC5zZXRTaXplKHsgZ2VvbWV0cnkuYm9yZGVyQm94V2lkdGgoKSwgZ2VvbWV0cnku Ym9yZGVyQm94SGVpZ2h0KCkgfSk7CiAgICAgICAgIGlmIChsaW5lTGV2ZWxWaXN1YWxBZGp1c3Rt ZW50c0ZvclJ1bnNbbGluZUluZGV4XS5uZWVkc0ludGVncmFsUG9zaXRpb24pCiAgICAgICAgICAg ICBydW5SZWN0LnNldFkocm91bmRUb0ludChydW5SZWN0LnkoKSkpOwpAQCAtMjY4LDcgKzI2Niw2 IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5lUnVucyhjb25z dCBMYXlvdXQ6OklubGluZUxpbmVzJiBsaW5lCiAgICAgICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9y dCBmb3IgY2FzZXMgd2hlbiB0aGUgcnVuIGlzIGFmdGVyIGVsbGlwc2lzLgogICAgICAgICBpZiAo bGluZVJ1bi5pc0lubGluZUJveCgpKSB7CiAgICAgICAgICAgICBhdXRvIGxpbmVSdW5SZWN0ID0g bGluZVJ1bi5sb2dpY2FsUmVjdCgpOwotICAgICAgICAgICAgbGluZVJ1blJlY3QubW92ZUJ5KGxp bmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCkpOwogICAgICAgICAgICAgYXV0byBoYXNTY3JvbGxh YmxlQ29udGVudCA9IFsmXSB7CiAgICAgICAgICAgICAgICAgLy8gSW4gc3RhbmRhcmRzIG1vZGUs IGlubGluZSBib3hlcyBhbHdheXMgc3RhcnQgd2l0aCBhbiBpbWFnaW5hcnkgc3RydXQuCiAgICAg ICAgICAgICAgICAgcmV0dXJuIG1fbGF5b3V0U3RhdGUuaW5TdGFuZGFyZHNNb2RlKCkgfHwgbGlu ZVJ1bi5oYXNDb250ZW50KCkgfHwgZ2VvbWV0cnkuaG9yaXpvbnRhbEJvcmRlcigpIHx8IChnZW9t ZXRyeS5ob3Jpem9udGFsUGFkZGluZygpICYmIGdlb21ldHJ5Lmhvcml6b250YWxQYWRkaW5nKCku dmFsdWUoKSk7CkBAIC0yODgsNyArMjg1LDYgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6 Y3JlYXRlRGlzcGxheUxpbmVSdW5zKGNvbnN0IExheW91dDo6SW5saW5lTGluZXMmIGxpbmUKICAg ICAgICAgYXV0byBsaW5lSW5kZXggPSBsaW5lUnVuLmxpbmVJbmRleCgpOwogICAgICAgICBhdXRv JiBsaW5lQm94TG9naWNhbFJlY3QgPSBsaW5lc1tsaW5lSW5kZXhdLmxpbmVCb3hMb2dpY2FsUmVj dCgpOwogICAgICAgICBhdXRvIHJ1blJlY3QgPSBGbG9hdFJlY3QgeyBsaW5lUnVuLmxvZ2ljYWxS ZWN0KCkgfTsKLSAgICAgICAgcnVuUmVjdC5tb3ZlQnkoeyBsaW5lQm94TG9naWNhbFJlY3QubGVm dCgpLCBsaW5lQm94TG9naWNhbFJlY3QudG9wKCkgfSk7CiAgICAgICAgIGlmIChsaW5lTGV2ZWxW aXN1YWxBZGp1c3RtZW50c0ZvclJ1bnNbbGluZUluZGV4XS5uZWVkc0ludGVncmFsUG9zaXRpb24p CiAgICAgICAgICAgICBydW5SZWN0LnNldFkocm91bmRUb0ludChydW5SZWN0LnkoKSkpOwogCg== 436727 2021-08-28 18:59:14 -0700 2021-08-29 09:10:34 -0700 Patch bug-229652-20210828185913.patch text/plain 11872 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY4MGFmZWU1NTE5M2Rl NzhkODc4MzQ3ODQ2NTYzOTQ0M2E0OTE3ZS4uZmMwYjRiNWIyNjM4MTExYTBhMGViZDA3NGYyMTBk MWJmMDJhMGU4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA4LTI4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1ha2UgbGlu ZSBydW5zIHJlbGF0aXZlIHRvIHRoZSBmb3JtYXR0aW5nIHJvb3QgYm9yZGVyIGJveC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTY1MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIGNvbnN0cnVj dCB0aGUgbGluZSBydW5zIHJlbGF0aXZlIHRvIHRoZSBib3JkZXIgYm94IG9mIHRoZSBpbmxpbmUg Zm9ybWF0dGluZyBjb250ZXh0IHJvb3QKKyAgICAgICAgKGFzIG9wcG9zZWQgdG8gcmVsYXRpdmUg dG8gdGhlIGxpbmUgYm94KSwgc28gdGhhdCB0aGUgaW50ZWdyYXRpb24gcnVucyBjb3VsZCBqdXN0 IGNvcHkgdGhlaXIgcG9zaXRpb25zLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24g Zm9yIG1lcmdpbmcgbGluZSBydW5zIHdpdGggdGhlIGludGVncmF0aW9uIHJ1bnMuCisKKyAgICAg ICAgKiBkaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9yeS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpEaXNwbGF5OjpCb3hGYWN0b3J5OjpkaXNwbGF5Qm94Rm9yVGV4dFJ1biBjb25zdCk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZVNwYW5uaW5nSW5saW5lQm94ZXMpOgor ICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpJbmxp bmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVSdW5zIGNvbnN0KToKKwogMjAyMS0w OC0yOCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBNb3ZlIGNvbnRlbnQgYnVpbGRlciBmdW5jdGlvbmFsaXR5IHRvIGEgZGVkaWNhdGVkIGNsYXNz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9y eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9yeS5jcHAK aW5kZXggYzg4OGU4NzYwMjNkODc2MmNhYTMyN2U0MDgyMzMyMDNlNTk4M2M5OS4uMjM2YjllNzhh MWU4NmZkMzVhOTlkMjVhYmUxMzA4NzUzYTRiNDllMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZGlzcGxheS9jc3MvRGlzcGxheUJveEZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hGYWN0b3J5LmNwcApAQCAtMTUwLDcgKzE1MCw2IEBAIHN0 ZDo6dW5pcXVlX3B0cjxCb3g+IEJveEZhY3Rvcnk6OmRpc3BsYXlCb3hGb3JUZXh0UnVuKGNvbnN0 IExheW91dDo6TGluZVJ1biYgcnVuCiAgICAgYXV0byBsaW5lTGF5b3V0UmVjdCA9IExheW91dFJl Y3QgeyBsaW5lUmVjdC5sZWZ0KCksIGxpbmVSZWN0LnRvcCgpLCBsaW5lUmVjdC53aWR0aCgpLCBs aW5lUmVjdC5oZWlnaHQoKSB9OwogCiAgICAgYXV0byBydW5SZWN0ID0gTGF5b3V0UmVjdCB7IHJ1 bi5sb2dpY2FsTGVmdCgpLCBydW4ubG9naWNhbFRvcCgpLCBydW4ubG9naWNhbFdpZHRoKCksIHJ1 bi5sb2dpY2FsSGVpZ2h0KCkgfTsKLSAgICBydW5SZWN0Lm1vdmVCeShsaW5lTGF5b3V0UmVjdC5s b2NhdGlvbigpKTsKICAgICBydW5SZWN0Lm1vdmUoY29udGFpbmluZ0Jsb2NrQ29udGV4dC5vZmZz ZXRGcm9tUm9vdCk7CiAKICAgICBhdXRvIHN0eWxlID0gU3R5bGUgeyBydW4ubGF5b3V0Qm94KCku c3R5bGUoKSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5jcHAKaW5kZXggZjc0NDY5MTYyMTlkYWM5NDI3Mzg1NjZhNWY2ODNhZDNkMzM2 ZDk3NS4uMjU4ZWVmMmU1OTdjNDhiMzNiZmI3NzNiZDI5OTI1ZWJiMWIwMDM3MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBA IC00NSw3ICs0NSw5IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpidWlsZChj b25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250CiB7CiAgICAgYXV0byYgZm9y bWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7CiAgICAgLy8gRXZlcnkgbGlu ZSBzdGFydHMgd2l0aCBhIHJvb3QgcnVuLCBldmVuIHRoZSBlbXB0eSBvbmVzLgotICAgIGZvcm1h dHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBMaW5lUnVuOjpUeXBlOjpSb290SW5s aW5lQm94LCByb290KCksIGxpbmVCb3gubG9naWNhbFJlY3RGb3JSb290SW5saW5lQm94KCksIHsg fSwgeyB9LCAgbGluZUJveC5yb290SW5saW5lQm94KCkuaGFzQ29udGVudCgpfSk7CisgICAgYXV0 byByb290SW5saW5lQm94UmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JSb290SW5saW5lQm94 KCk7CisgICAgcm9vdElubGluZUJveFJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7 CisgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVSdW4oeyBsaW5lSW5kZXgsIExpbmVSdW46OlR5 cGU6OlJvb3RJbmxpbmVCb3gsIHJvb3QoKSwgcm9vdElubGluZUJveFJlY3QsIHsgfSwgeyB9LCAg bGluZUJveC5yb290SW5saW5lQm94KCkuaGFzQ29udGVudCgpfSk7CiAKICAgICAvLyBTcGFubmlu ZyBpbmxpbmUgYm94ZXMgc3RhcnQgYXQgdGhlIHZlcnkgYmVnaW5uaW5nIG9mIHRoZSBsaW5lLgog ICAgIGF1dG8gbGluZVNwYW5uaW5nSW5saW5lQm94SW5kZXggPSBmb3JtYXR0aW5nU3RhdGUubGlu ZVJ1bnMoKS5zaXplKCk7CkBAIC02MCwxOSArNjIsMjUgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNv bnMKICAgICBmb3IgKGF1dG8mIGxpbmVSdW4gOiBsaW5lQ29udGVudC5ydW5zKSB7CiAgICAgICAg IGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAgICAgICAgIHN3aXRjaCAo bGluZVJ1bi50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpUZXh0Ogot ICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVSdW4oeyBsaW5lSW5kZXgsIExpbmVS dW46OlR5cGU6OlRleHQsIGxheW91dEJveCwgbGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4o bGluZVJ1biksIGxpbmVSdW4uZXhwYW5zaW9uKCksIGxpbmVSdW4udGV4dENvbnRlbnQoKSB9KTsK KyAgICAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpUZXh0OiB7CisgICAgICAgICAgICBhdXRv IHRleHRSdW5SZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bik7Cisg ICAgICAgICAgICB0ZXh0UnVuUmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKKyAg ICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBMaW5lUnVu OjpUeXBlOjpUZXh0LCBsYXlvdXRCb3gsIHRleHRSdW5SZWN0LCBsaW5lUnVuLmV4cGFuc2lvbigp LCBsaW5lUnVuLnRleHRDb250ZW50KCkgfSk7CiAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg Y2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpTb2Z0TGluZUJyZWFrOgotICAgICAgICAgICAgZm9ybWF0 dGluZ1N0YXRlLmFkZExpbmVSdW4oeyBsaW5lSW5kZXgsIExpbmVSdW46OlR5cGU6OlNvZnRMaW5l QnJlYWssIGxheW91dEJveCwgbGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1biks IGxpbmVSdW4uZXhwYW5zaW9uKCksIGxpbmVSdW4udGV4dENvbnRlbnQoKSB9KTsKKyAgICAgICAg fQorICAgICAgICBjYXNlIElubGluZUl0ZW06OlR5cGU6OlNvZnRMaW5lQnJlYWs6IHsKKyAgICAg ICAgICAgIGF1dG8gc29mdExpbmVCcmVha1J1blJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9y VGV4dFJ1bihsaW5lUnVuKTsKKyAgICAgICAgICAgIHNvZnRMaW5lQnJlYWtSdW5SZWN0Lm1vdmVC eShsaW5lQm94TG9naWNhbFRvcExlZnQpOworICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFk ZExpbmVSdW4oeyBsaW5lSW5kZXgsIExpbmVSdW46OlR5cGU6OlNvZnRMaW5lQnJlYWssIGxheW91 dEJveCwgc29mdExpbmVCcmVha1J1blJlY3QsIGxpbmVSdW4uZXhwYW5zaW9uKCksIGxpbmVSdW4u dGV4dENvbnRlbnQoKSB9KTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgICAg IGNhc2UgSW5saW5lSXRlbTo6VHlwZTo6SGFyZExpbmVCcmVhazogewogICAgICAgICAgICAgLy8g T25seSBoYXJkIGxpbmVicmVha3MgaGF2ZSBhc3NvY2lhdGVkIGxheW91dCBib3hlcy4KICAgICAg ICAgICAgIGF1dG8gbGluZUJyZWFrQm94UmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JMaW5l QnJlYWtCb3gobGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGxpbmVCcmVha0JveFJlY3QubW92ZUJ5 KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CiAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRk TGluZVJ1bih7IGxpbmVJbmRleCwgTGluZVJ1bjo6VHlwZTo6TGluZUJyZWFrQm94LCBsYXlvdXRC b3gsIGxpbmVCcmVha0JveFJlY3QsIGxpbmVSdW4uZXhwYW5zaW9uKCksIHsgfSB9KTsKIAogICAg ICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnko bGF5b3V0Qm94KTsKLSAgICAgICAgICAgIGxpbmVCcmVha0JveFJlY3QubW92ZUJ5KGxpbmVCb3hM b2dpY2FsVG9wTGVmdCk7CiAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVm dCh0b0xheW91dFBvaW50KGxpbmVCcmVha0JveFJlY3QudG9wTGVmdCgpKSk7CiAgICAgICAgICAg ICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KHRvTGF5b3V0VW5pdChsaW5lQnJlYWtC b3hSZWN0LmhlaWdodCgpKSk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTgxLDExICs4OSwxMSBA QCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdl b21ldHJ5Rm9yTGluZUNvbnRlbnQoY29ucwogICAgICAgICAgICAgQVNTRVJUKGxheW91dEJveC5p c0F0b21pY0lubGluZUxldmVsQm94KCkpOwogICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkg PSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGF1 dG8gbG9naWNhbEJvcmRlckJveCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvckF0b21pY0lu bGluZUxldmVsQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOworICAgICAgICAgICAgbG9naWNh bEJvcmRlckJveC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKICAgICAgICAgICAgIGZv cm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBMaW5lUnVuOjpUeXBlOjpBdG9t aWNJbmxpbmVMZXZlbEJveCwgbGF5b3V0Qm94LCBsb2dpY2FsQm9yZGVyQm94LCBsaW5lUnVuLmV4 cGFuc2lvbigpLCB7IH0gfSk7CiAKICAgICAgICAgICAgIGF1dG8gYm9yZGVyQm94TG9naWNhbFRv cExlZnQgPSBsb2dpY2FsQm9yZGVyQm94LnRvcExlZnQoKTsKICAgICAgICAgICAgIC8vIE5vdGUg dGhhdCBpbmxpbmUgYm94ZXMgYXJlIHJlbGF0aXZlIHRvIHRoZSBsaW5lIGFuZCB0aGVpciB0b3Ag cG9zaXRpb24gY2FuIGJlIG5lZ2F0aXZlLgotICAgICAgICAgICAgYm9yZGVyQm94TG9naWNhbFRv cExlZnQubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CiAgICAgICAgICAgICAvLyBBdG9t aWMgaW5saW5lIGJveGVzIGFyZSBhbGwgc2V0LiBUaGVpciBtYXJnaW4vYm9yZGVyL2NvbnRlbnQg Ym94IGdlb21ldHJpZXMgYXJlIGFscmVhZHkgY29tcHV0ZWQuIFdlIGp1c3QgaGF2ZSB0byBwb3Np dGlvbiB0aGVtIGhlcmUuCiAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVm dCh0b0xheW91dFBvaW50KGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0KSk7CiAgICAgICAgICAgICBi cmVhazsKQEAgLTk0LDYgKzEwMiw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy OjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zCiAgICAgICAg ICAgICAvLyBUaGlzIGlubGluZSBib3ggc2hvd2VkIHVwIGZpcnN0IG9uIHRoaXMgbGluZS4KICAg ICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5 KGxheW91dEJveCk7CiAgICAgICAgICAgICBhdXRvIGlubGluZUJveEJvcmRlckJveCA9IGxpbmVC b3gubG9naWNhbEJvcmRlckJveEZvcklubGluZUJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsK KyAgICAgICAgICAgIGlubGluZUJveEJvcmRlckJveC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BM ZWZ0KTsKICAgICAgICAgICAgIGlmIChsaW5lQm94Lmhhc0NvbnRlbnQoKSkgewogICAgICAgICAg ICAgICAgIC8vIEZJWE1FOiBJdCdzIGV4cGVjdGVkIHRvIG5vdCBoYXZlIGFueSBydW5zIG9uIGVt cHR5IGxpbmVzLiBXZSBzaG91bGQgcmVjb25zaWRlciB0aGlzLgogICAgICAgICAgICAgICAgIGZv cm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBMaW5lUnVuOjpUeXBlOjpOb25S b290SW5saW5lQm94LCBsYXlvdXRCb3gsIGlubGluZUJveEJvcmRlckJveCwgeyB9LCB7IH0sIGxp bmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KS5oYXNDb250ZW50KCkg fSk7CkBAIC0xMDEsNyArMTEwLDYgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6 OmNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnMKIAogICAgICAg ICAgICAgYXV0byBpbmxpbmVCb3hTaXplID0gTGF5b3V0U2l6ZSB7IExheW91dFVuaXQ6OmZyb21G bG9hdENlaWwoaW5saW5lQm94Qm9yZGVyQm94LndpZHRoKCkpLCBMYXlvdXRVbml0Ojpmcm9tRmxv YXRDZWlsKGlubGluZUJveEJvcmRlckJveC5oZWlnaHQoKSkgfTsKICAgICAgICAgICAgIGF1dG8g bG9naWNhbFJlY3QgPSBSZWN0IHsgTGF5b3V0UG9pbnQgeyBpbmxpbmVCb3hCb3JkZXJCb3gudG9w TGVmdCgpIH0sIGlubGluZUJveFNpemUgfTsKLSAgICAgICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVC eShMYXlvdXRQb2ludCB7IGxpbmVCb3hMb2dpY2FsVG9wTGVmdCB9KTsKICAgICAgICAgICAgIGJv eEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KGxvZ2ljYWxSZWN0LnRvcExlZnQoKSk7CiAgICAg ICAgICAgICBhdXRvIGNvbnRlbnRCb3hIZWlnaHQgPSBsb2dpY2FsUmVjdC5oZWlnaHQoKSAtIChi b3hHZW9tZXRyeS52ZXJ0aWNhbEJvcmRlcigpICsgYm94R2VvbWV0cnkudmVydGljYWxQYWRkaW5n KCkudmFsdWVfb3IoMF9sdSkpOwogICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJv eEhlaWdodChjb250ZW50Qm94SGVpZ2h0KTsKQEAgLTEzMywxMiArMTQxLDEyIEBAIHZvaWQgSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JM aW5lU3Bhbm5pbmdJbmxpCiAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0 YXRlLmJveEdlb21ldHJ5KGxheW91dEJveCk7CiAgICAgICAgIC8vIElubGluZSBib3hlcyBtYXkg b3IgbWF5IG5vdCBiZSB3cmFwcGVkIGFuZCBoYXZlIHJ1bnMgb24gbXVsdGlwbGUgbGluZXMgKGUu Zy4gPHNwYW4+Zmlyc3QgbGluZTxicj5zZWNvbmQgbGluZTxicj50aGlyZCBsaW5lPC9zcGFuPikK ICAgICAgICAgYXV0byBpbmxpbmVCb3hCb3JkZXJCb3ggPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJC b3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7CisgICAgICAgIGlubGluZUJv eEJvcmRlckJveC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKIAogICAgICAgICBmb3Jt YXR0aW5nU3RhdGUubGluZVJ1bnMoKS5pbnNlcnQobGluZVNwYW5uaW5nSW5saW5lQm94SW5kZXgr KywgeyBsaW5lSW5kZXgsIExpbmVSdW46OlR5cGU6Ok5vblJvb3RJbmxpbmVCb3gsIGxheW91dEJv eCwgaW5saW5lQm94Qm9yZGVyQm94LCB7IH0sIHsgfSwgaW5saW5lTGV2ZWxCb3guaGFzQ29udGVu dCgpLCB0cnVlIH0pOwogCiAgICAgICAgIGF1dG8gaW5saW5lQm94U2l6ZSA9IExheW91dFNpemUg eyBMYXlvdXRVbml0Ojpmcm9tRmxvYXRDZWlsKGlubGluZUJveEJvcmRlckJveC53aWR0aCgpKSwg TGF5b3V0VW5pdDo6ZnJvbUZsb2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3guaGVpZ2h0KCkpIH07 CiAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBSZWN0IHsgTGF5b3V0UG9pbnQgeyBpbmxpbmVC b3hCb3JkZXJCb3gudG9wTGVmdCgpIH0sIGlubGluZUJveFNpemUgfTsKLSAgICAgICAgbG9naWNh bFJlY3QubW92ZUJ5KExheW91dFBvaW50IHsgbGluZUJveExvZ2ljYWxUb3BMZWZ0IH0pOwogICAg ICAgICAvLyBNaWRkbGUgb3IgZW5kIG9mIHRoZSBpbmxpbmUgYm94LiBMZXQncyBzdHJldGNoIHRo ZSBib3ggYXMgbmVlZGVkLgogICAgICAgICBhdXRvIGVuY2xvc2luZ0JvcmRlckJveFJlY3QgPSBC b3hHZW9tZXRyeTo6Ym9yZGVyQm94UmVjdChib3hHZW9tZXRyeSk7CiAgICAgICAgIGVuY2xvc2lu Z0JvcmRlckJveFJlY3QuZXhwYW5kVG9Db250YWluKGxvZ2ljYWxSZWN0KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGlu ZUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA1ZTE4OGMxNzJk ODU2NDJjZjA1MTIxNDkzNDA1MGQ3ZDljMTRmYTlhLi5jZWI4MDQyMzRhMzdjNjA4MDI0OTRhMDcx N2ExYWRmYmFiYjhiNDNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29u dGVudEJ1aWxkZXIuY3BwCkBAIC0yNTUsMTIgKzI1NSwxMCBAQCB2b2lkIElubGluZUNvbnRlbnRC dWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZVJ1bnMoY29uc3QgTGF5b3V0OjpJbmxpbmVMaW5lcyYg bGluZQogICAgICAgICB9CiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0 Qm94KCk7CiAgICAgICAgIGF1dG8gbGluZUluZGV4ID0gbGluZVJ1bi5saW5lSW5kZXgoKTsKLSAg ICAgICAgYXV0byYgbGluZUJveExvZ2ljYWxSZWN0ID0gbGluZXNbbGluZUluZGV4XS5saW5lQm94 TG9naWNhbFJlY3QoKTsKICAgICAgICAgLy8gSW5saW5lIGJveGVzIGFyZSByZWxhdGl2ZSB0byB0 aGUgbGluZSBib3ggd2hpbGUgZmluYWwgcnVucyBuZWVkIHRvIGJlIHJlbGF0aXZlIHRvIHRoZSBw YXJlbnQgYm94CiAgICAgICAgIC8vIEZJWE1FOiBTaG91bGRuJ3Qgd2UganVzdCBsZWF2ZSB0aGVt IGJlIHJlbGF0aXZlIHRvIHRoZSBsaW5lIGJveD8KICAgICAgICAgYXV0byBydW5SZWN0ID0gRmxv YXRSZWN0IHsgbGluZVJ1bi5sb2dpY2FsUmVjdCgpIH07CiAgICAgICAgIGF1dG8mIGdlb21ldHJ5 ID0gbV9sYXlvdXRTdGF0ZS5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOwotICAgICAgICBydW5S ZWN0Lm1vdmVCeSh7IGxpbmVCb3hMb2dpY2FsUmVjdC5sZWZ0KCksIGxpbmVCb3hMb2dpY2FsUmVj dC50b3AoKSB9KTsKICAgICAgICAgcnVuUmVjdC5zZXRTaXplKHsgZ2VvbWV0cnkuYm9yZGVyQm94 V2lkdGgoKSwgZ2VvbWV0cnkuYm9yZGVyQm94SGVpZ2h0KCkgfSk7CiAgICAgICAgIGlmIChsaW5l TGV2ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnNbbGluZUluZGV4XS5uZWVkc0ludGVncmFsUG9z aXRpb24pCiAgICAgICAgICAgICBydW5SZWN0LnNldFkocm91bmRUb0ludChydW5SZWN0LnkoKSkp OwpAQCAtMjY4LDcgKzI2Niw2IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURp c3BsYXlMaW5lUnVucyhjb25zdCBMYXlvdXQ6OklubGluZUxpbmVzJiBsaW5lCiAgICAgICAgIC8v IEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgY2FzZXMgd2hlbiB0aGUgcnVuIGlzIGFmdGVyIGVsbGlw c2lzLgogICAgICAgICBpZiAobGluZVJ1bi5pc0lubGluZUJveCgpKSB7CiAgICAgICAgICAgICBh dXRvIGxpbmVSdW5SZWN0ID0gbGluZVJ1bi5sb2dpY2FsUmVjdCgpOwotICAgICAgICAgICAgbGlu ZVJ1blJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCkpOwogICAgICAgICAg ICAgYXV0byBoYXNTY3JvbGxhYmxlQ29udGVudCA9IFsmXSB7CiAgICAgICAgICAgICAgICAgLy8g SW4gc3RhbmRhcmRzIG1vZGUsIGlubGluZSBib3hlcyBhbHdheXMgc3RhcnQgd2l0aCBhbiBpbWFn aW5hcnkgc3RydXQuCiAgICAgICAgICAgICAgICAgcmV0dXJuIG1fbGF5b3V0U3RhdGUuaW5TdGFu ZGFyZHNNb2RlKCkgfHwgbGluZVJ1bi5oYXNDb250ZW50KCkgfHwgZ2VvbWV0cnkuaG9yaXpvbnRh bEJvcmRlcigpIHx8IChnZW9tZXRyeS5ob3Jpem9udGFsUGFkZGluZygpICYmIGdlb21ldHJ5Lmhv cml6b250YWxQYWRkaW5nKCkudmFsdWUoKSk7CkBAIC0yODgsNyArMjg1LDYgQEAgdm9pZCBJbmxp bmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVSdW5zKGNvbnN0IExheW91dDo6SW5s aW5lTGluZXMmIGxpbmUKICAgICAgICAgYXV0byBsaW5lSW5kZXggPSBsaW5lUnVuLmxpbmVJbmRl eCgpOwogICAgICAgICBhdXRvJiBsaW5lQm94TG9naWNhbFJlY3QgPSBsaW5lc1tsaW5lSW5kZXhd LmxpbmVCb3hMb2dpY2FsUmVjdCgpOwogICAgICAgICBhdXRvIHJ1blJlY3QgPSBGbG9hdFJlY3Qg eyBsaW5lUnVuLmxvZ2ljYWxSZWN0KCkgfTsKLSAgICAgICAgcnVuUmVjdC5tb3ZlQnkoeyBsaW5l Qm94TG9naWNhbFJlY3QubGVmdCgpLCBsaW5lQm94TG9naWNhbFJlY3QudG9wKCkgfSk7CiAgICAg ICAgIGlmIChsaW5lTGV2ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnNbbGluZUluZGV4XS5uZWVk c0ludGVncmFsUG9zaXRpb24pCiAgICAgICAgICAgICBydW5SZWN0LnNldFkocm91bmRUb0ludChy dW5SZWN0LnkoKSkpOwogCg==