232655 2021-11-02 20:11:52 -0700 [LFC][IFC] Display box builder should take visual order into account when computing horizontal positions 2021-11-03 06:39:19 -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 1811376 0 zalan 2021-11-02 20:11:52 -0700 ssia 1811378 1 443168 zalan 2021-11-02 20:19:51 -0700 Created attachment 443168 Patch 1811386 2 443171 zalan 2021-11-02 21:31:53 -0700 Created attachment 443171 Patch 1811392 3 443171 koivisto 2021-11-02 22:35:17 -0700 Comment on attachment 443171 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443171&action=review > Source/WebCore/ChangeLog:9 > + With this change, now IFC can render simple RTL content. omg 1811453 4 zalan 2021-11-03 06:34:02 -0700 (In reply to Antti Koivisto from comment #3) > Comment on attachment 443171 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=443171&action=review > > > Source/WebCore/ChangeLog:9 > > + With this change, now IFC can render simple RTL content. > > omg 🆖✅ 1811454 5 ews-feeder 2021-11-03 06:38:02 -0700 Committed r285204 (243830@main): <https://commits.webkit.org/243830@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443171. 1811455 6 webkit-bug-importer 2021-11-03 06:39:19 -0700 <rdar://problem/84972370> 443168 2021-11-02 20:19:51 -0700 2021-11-02 21:31:51 -0700 Patch bug-232655-20211102201950.patch text/plain 11712 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc1N2FlZTVmOTcxNDIz ODdjNmE0NzMzZWI3ZWE2YTE1Y2VkZWIwYS4uYjJkZjBjNGUyMzBjYjI0MDEyNmFjOTliYWI3ZDhh ZjdiOWE5YjIwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEaXNwbGF5 IGJveCBidWlsZGVyIHNob3VsZCB0YWtlIHZpc3VhbCBvcmRlciBpbnRvIGFjY291bnQgd2hlbiBj b21wdXRpbmcgaG9yaXpvbnRhbCBwb3NpdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjY1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2ggd2UgdHVybiBsb2dpY2FsIGhvcml6 b250YWwgcG9zaXRpb25zIGludG8gInBoeXNpY2FsIiBwb3NpdGlvbnMgYmFzZWQgb24gdGhlIHZp c3VhbCBvcmRlciBvZiB0aGUgcnVucy4KKyAgICAgICAgV2l0aCB0aGlzIGNoYW5nZSwgbm93IElG QyBjYW4gcmVuZGVyIHNpbXBsZSBSVEwgY29udGVudC4KKworICAgICAgICAqIGxheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3Jl YXRlQm94ZXNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KTogTW92ZSBzaGFyZWQgY29k ZSB0byBkaXNwbGF5Qm94UmVjdC4gCisKIDIwMjEtMTEtMDIgIFJvYmluIE1vcmlzc2V0ICA8cm1v cmlzc2V0QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uIChyMjg0MzMwKTogWyBtYWNP UyB3azEgRGVidWcgXSB3ZWJhdWRpby9BdWRpb0J1ZmZlci9odWdlLWJ1ZmZlci5odG1sIGlzIGEg Zmxha3kgdGltZW91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlD b250ZW50QnVpbGRlci5jcHAKaW5kZXggM2VlYThmNTA2MTY3Yjg0NDg3MjY5M2JmYzc3OGNhNWY1 OGU5ZmM3My4uNjZiY2E2OGQwNjA3NzNhZDA2YTg5NzQwNmM2MDIxMGYzZmFhOTFlNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CkBAIC03NCwxNyArNzQsNjAgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNy ZWF0ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb24KICAgICBhdXRvJiBy dW5zID0gbGluZUNvbnRlbnQucnVuczsKICAgICBhdXRvIGNvbnRlbnROZWVkc0JpZGlSZW9yZGVy aW5nID0gIWxpbmVDb250ZW50LnZpc3VhbE9yZGVyTGlzdC5pc0VtcHR5KCk7CiAgICAgQVNTRVJU KCFjb250ZW50TmVlZHNCaWRpUmVvcmRlcmluZyB8fCBsaW5lQ29udGVudC52aXN1YWxPcmRlckxp c3Quc2l6ZSgpID09IHJ1bnMuc2l6ZSgpKTsKKworICAgIGF1dG8gY29udGVudFJpZ2h0SW5WaXN1 YWxPcmRlciA9IElubGluZUxheW91dFVuaXQgeyB9OwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgcnVucy5zaXplKCk7ICsraSkgewotICAgICAgICBhdXRvJiBsaW5lUnVuID0gcnVuc1tjb250 ZW50TmVlZHNCaWRpUmVvcmRlcmluZyA/IGxpbmVDb250ZW50LnZpc3VhbE9yZGVyTGlzdFtpXSA6 IGldOworICAgICAgICBhdXRvIHZpc3VhbEluZGV4ID0gY29udGVudE5lZWRzQmlkaVJlb3JkZXJp bmcgPyBsaW5lQ29udGVudC52aXN1YWxPcmRlckxpc3RbaV0gOiBpOworICAgICAgICBhdXRvJiBs aW5lUnVuID0gcnVuc1t2aXN1YWxJbmRleF07CiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxp bmVSdW4ubGF5b3V0Qm94KCk7CiAgICAgICAgIGF1dG8mIHN0eWxlID0gWyZdICgpIC0+IGNvbnN0 IFJlbmRlclN0eWxlJiB7CiAgICAgICAgICAgICByZXR1cm4gIWxpbmVJbmRleCA/IGxheW91dEJv eC5maXJzdExpbmVTdHlsZSgpIDogbGF5b3V0Qm94LnN0eWxlKCk7CiAgICAgICAgIH0oKTsKIAot ICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQoKSkgewotICAgICAgICAgICAgYXV0byB0ZXh0UnVu UmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pOwotICAgICAgICAg ICAgdGV4dFJ1blJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CisgICAgICAgIGF1 dG8gZGlzcGxheUJveFJlY3QgPSBbJl0geworICAgICAgICAgICAgYXV0byBsb2dpY2FsUmVjdCA9 IElubGluZVJlY3QgeyB9OwogCisgICAgICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQoKSB8fCBs aW5lUnVuLmlzU29mdExpbmVCcmVhaygpKQorICAgICAgICAgICAgICAgIGxvZ2ljYWxSZWN0ID0g bGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bik7CisgICAgICAgICAgICBlbHNl IGlmIChsaW5lUnVuLmlzSGFyZExpbmVCcmVhaygpKQorICAgICAgICAgICAgICAgIGxvZ2ljYWxS ZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvckxpbmVCcmVha0JveChsYXlvdXRCb3gpOworICAg ICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3Jt YXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAgICBpZiAo bGluZVJ1bi5pc0JveCgpKQorICAgICAgICAgICAgICAgICAgICBsb2dpY2FsUmVjdCA9IGxpbmVC b3gubG9naWNhbEJvcmRlckJveEZvckF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgYm94 R2VvbWV0cnkpOworICAgICAgICAgICAgICAgIGVsc2UgaWYgKGxpbmVSdW4uaXNJbmxpbmVCb3hT dGFydCgpIHx8IGxpbmVSdW4uaXNMaW5lU3Bhbm5pbmdJbmxpbmVCb3hTdGFydCgpKQorICAgICAg ICAgICAgICAgICAgICBsb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklu bGluZUJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKKyAgICAgICAgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgaWYgKCFjb250ZW50TmVlZHNCaWRpUmVvcmRlcmluZykgeworICAgICAgICAg ICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOworICAgICAg ICAgICAgICAgIHJldHVybiBsb2dpY2FsUmVjdDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGxvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdC55KCkpOwor ICAgICAgICAgICAgLy8gVXNlIHRoZSBkaXN0YW5jZSBmcm9tIHRoZSBsb2dpY2FsIHByZXZpb3Vz IHJ1biB0byBwbGFjZSB0aGUgZGlzcGxheSBib3ggaG9yaXpvbnRhbGx5IGluIHZpc3VhbCB0ZXJt cy4KKyAgICAgICAgICAgIGF1dG8qIGxvZ2ljYWxQcmV2aW91c1J1biA9IHZpc3VhbEluZGV4ID8g JnJ1bnNbdmlzdWFsSW5kZXggLSAxXSA6IG51bGxwdHI7CisgICAgICAgICAgICAvLyBDZXJ0YWlu IGNzcyBwcm9wZXJ0aWVzIChlLmcuIHdvcmQtc3BhY2luZykgbWF5IGludHJvZHVjZSBhIGdhcCBi ZXR3ZWVuIHJ1bnMuCisgICAgICAgICAgICBhdXRvIGRpc3RhbmNlRnJvbUxvZ2ljYWxQcmV2aW91 c1J1biA9IGxvZ2ljYWxQcmV2aW91c1J1biA/IGxpbmVSdW4ubG9naWNhbExlZnQoKSAtIGxvZ2lj YWxQcmV2aW91c1J1bi0+bG9naWNhbFJpZ2h0KCkgOiBsaW5lUnVuLmxvZ2ljYWxMZWZ0KCk7Cisg ICAgICAgICAgICBhdXRvIHZpc3VhbE9yZGVyUmVjdCA9IGxvZ2ljYWxSZWN0OworICAgICAgICAg ICAgaWYgKCFpKSB7CisgICAgICAgICAgICAgICAgLy8gRmlyc3QgdmlzdWFsIHJ1bi4gSW5pdGlh bCBjb250ZW50IHBvc2l0aW9uIGRlcGVuZHMgb24gdGhlIGJsb2NrJ3MgaW5saW5lIGRpcmVjdGlv bi4KKyAgICAgICAgICAgICAgICBhdXRvIHJvb3RJbmxpbmVCb3ggPSBib3hlc1swXTsKKyAgICAg ICAgICAgICAgICBBU1NFUlQocm9vdElubGluZUJveC5pc1Jvb3RJbmxpbmVCb3goKSk7CisKKyAg ICAgICAgICAgICAgICBhdXRvIHJvb3RJc1JpZ2h0VG9MZWZ0ID0gIXJvb3RJbmxpbmVCb3guc3R5 bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCk7CisgICAgICAgICAgICAgICAgYXV0byBjb250 ZW50TGVmdCA9IGxpbmVCb3hMb2dpY2FsVG9wTGVmdC54KCk7CisgICAgICAgICAgICAgICAgaWYg KHJvb3RJc1JpZ2h0VG9MZWZ0KQorICAgICAgICAgICAgICAgICAgICBjb250ZW50TGVmdCArPSBs aW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoIC0gcm9vdElubGluZUJveC5sb2dpY2FsV2lkdGgo KTsKKyAgICAgICAgICAgICAgICB2aXN1YWxPcmRlclJlY3Quc2V0TGVmdChjb250ZW50TGVmdCAr IGRpc3RhbmNlRnJvbUxvZ2ljYWxQcmV2aW91c1J1bik7CisgICAgICAgICAgICB9IGVsc2UKKyAg ICAgICAgICAgICAgICB2aXN1YWxPcmRlclJlY3Quc2V0TGVmdChjb250ZW50UmlnaHRJblZpc3Vh bE9yZGVyICsgZGlzdGFuY2VGcm9tTG9naWNhbFByZXZpb3VzUnVuKTsKKyAgICAgICAgICAgIGNv bnRlbnRSaWdodEluVmlzdWFsT3JkZXIgPSB2aXN1YWxPcmRlclJlY3QucmlnaHQoKTsKKyAgICAg ICAgICAgIHJldHVybiB2aXN1YWxPcmRlclJlY3Q7CisgICAgICAgIH07CisKKyAgICAgICAgaWYg KGxpbmVSdW4uaXNUZXh0KCkpIHsKKyAgICAgICAgICAgIGF1dG8gdGV4dFJ1blJlY3QgPSBkaXNw bGF5Qm94UmVjdCgpOwogICAgICAgICAgICAgYXV0byBpbmtPdmVyZmxvdyA9IFsmXSB7CiAgICAg ICAgICAgICAgICAgYXV0byBpbml0aWFsQ29udGFpbmdCbG9ja1NpemUgPSBSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdy YXRpb25FbmFibGVkKCkKICAgICAgICAgICAgICAgICAgICAgPyBmb3JtYXR0aW5nU3RhdGUubGF5 b3V0U3RhdGUoKS52aWV3cG9ydFNpemUoKQpAQCAtMTE2LDEwICsxNTksOCBAQCB2b2lkIElubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlQm94ZXNBbmRVcGRhdGVHZW9tZXRyeUZvckxp bmVDb250ZW50KGNvbgogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAg aWYgKGxpbmVSdW4uaXNTb2Z0TGluZUJyZWFrKCkpIHsKLSAgICAgICAgICAgIGF1dG8gc29mdExp bmVCcmVha1J1blJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihsaW5lUnVuKTsK LSAgICAgICAgICAgIHNvZnRMaW5lQnJlYWtSdW5SZWN0Lm1vdmVCeShsaW5lQm94TG9naWNhbFRv cExlZnQpOwotCiAgICAgICAgICAgICBBU1NFUlQobGluZVJ1bi50ZXh0Q29udGVudCgpICYmIGlz PElubGluZVRleHRCb3g+KGxheW91dEJveCkpOworICAgICAgICAgICAgYXV0byBzb2Z0TGluZUJy ZWFrUnVuUmVjdCA9IGRpc3BsYXlCb3hSZWN0KCk7CiAgICAgICAgICAgICBhdXRvJiB0ZXh0ID0g bGluZVJ1bi50ZXh0Q29udGVudCgpOwogICAgICAgICAgICAgYm94ZXMuYXBwZW5kKHsgbGluZUlu ZGV4CiAgICAgICAgICAgICAgICAgLCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6OlNvZnRMaW5l QnJlYWsKQEAgLTEzMyw4ICsxNzQsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRl cjo6Y3JlYXRlQm94ZXNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbgogICAgICAg ICB9CiAgICAgICAgIGlmIChsaW5lUnVuLmlzSGFyZExpbmVCcmVhaygpKSB7CiAgICAgICAgICAg ICAvLyBPbmx5IGhhcmQgbGluZWJyZWFrcyBoYXZlIGFzc29jaWF0ZWQgbGF5b3V0IGJveGVzLgot ICAgICAgICAgICAgYXV0byBsaW5lQnJlYWtCb3hSZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZv ckxpbmVCcmVha0JveChsYXlvdXRCb3gpOwotICAgICAgICAgICAgbGluZUJyZWFrQm94UmVjdC5t b3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKKyAgICAgICAgICAgIGF1dG8gbGluZUJyZWFr Qm94UmVjdCA9IGRpc3BsYXlCb3hSZWN0KCk7CiAgICAgICAgICAgICBib3hlcy5hcHBlbmQoeyBs aW5lSW5kZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6TGluZUJyZWFrQm94LCBsYXlvdXRC b3gsIGxpbmVSdW4uYmlkaUxldmVsKCksIGxpbmVCcmVha0JveFJlY3QsIGxpbmVCcmVha0JveFJl Y3QsIGxpbmVSdW4uZXhwYW5zaW9uKCksIHsgfSB9KTsKIAogICAgICAgICAgICAgYXV0byYgYm94 R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKQEAgLTE0 NCwxNiArMTg0LDEzIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVC b3hlc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uCiAgICAgICAgIH0KICAgICAg ICAgaWYgKGxpbmVSdW4uaXNCb3goKSkgewogICAgICAgICAgICAgQVNTRVJUKGxheW91dEJveC5p c0F0b21pY0lubGluZUxldmVsQm94KCkpOwotICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkg PSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKLSAgICAgICAgICAgIGF1 dG8gbG9naWNhbEJvcmRlckJveCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvckF0b21pY0lu bGluZUxldmVsQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwotICAgICAgICAgICAgbG9naWNh bEJvcmRlckJveC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKKyAgICAgICAgICAgIGF1 dG8gYm9yZGVyQm94UmVjdCA9IGRpc3BsYXlCb3hSZWN0KCk7CiAgICAgICAgICAgICAvLyBGSVhN RTogQWRkIGluayBvdmVyZmxvdyBzdXBwb3J0IGZvciBhdG9taWMgaW5saW5lIGxldmVsIGJveGVz IChlLmcuIGJveCBzaGFkb3cpLgotICAgICAgICAgICAgYm94ZXMuYXBwZW5kKHsgbGluZUluZGV4 LCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6OkF0b21pY0lubGluZUxldmVsQm94LCBsYXlvdXRC b3gsIGxpbmVSdW4uYmlkaUxldmVsKCksIGxvZ2ljYWxCb3JkZXJCb3gsIGxvZ2ljYWxCb3JkZXJC b3gsIGxpbmVSdW4uZXhwYW5zaW9uKCksIHsgfSB9KTsKKyAgICAgICAgICAgIGJveGVzLmFwcGVu ZCh7IGxpbmVJbmRleCwgSW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpBdG9taWNJbmxpbmVMZXZl bEJveCwgbGF5b3V0Qm94LCBsaW5lUnVuLmJpZGlMZXZlbCgpLCBib3JkZXJCb3hSZWN0LCBib3Jk ZXJCb3hSZWN0LCBsaW5lUnVuLmV4cGFuc2lvbigpLCB7IH0gfSk7CiAKLSAgICAgICAgICAgIGF1 dG8gYm9yZGVyQm94TG9naWNhbFRvcExlZnQgPSBsb2dpY2FsQm9yZGVyQm94LnRvcExlZnQoKTsK ICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCBpbmxpbmUgYm94ZXMgYXJlIHJlbGF0aXZlIHRvIHRo ZSBsaW5lIGFuZCB0aGVpciB0b3AgcG9zaXRpb24gY2FuIGJlIG5lZ2F0aXZlLgogICAgICAgICAg ICAgLy8gQXRvbWljIGlubGluZSBib3hlcyBhcmUgYWxsIHNldC4gVGhlaXIgbWFyZ2luL2JvcmRl ci9jb250ZW50IGJveCBnZW9tZXRyaWVzIGFyZSBhbHJlYWR5IGNvbXB1dGVkLiBXZSBqdXN0IGhh dmUgdG8gcG9zaXRpb24gdGhlbSBoZXJlLgotICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9n aWNhbFRvcExlZnQodG9MYXlvdXRQb2ludChib3JkZXJCb3hMb2dpY2FsVG9wTGVmdCkpOworICAg ICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KGxheW91dEJveCkuc2V0TG9naWNh bFRvcExlZnQodG9MYXlvdXRQb2ludChib3JkZXJCb3hSZWN0LnRvcExlZnQoKSkpOwogCiAgICAg ICAgICAgICBhdXRvIGFkanVzdFBhcmVudElubGluZUJveElua092ZXJmbG93ID0gWyZdIHsKICAg ICAgICAgICAgICAgICBhdXRvJiBwYXJlbnRJbmxpbmVCb3ggPSBsYXlvdXRCb3gucGFyZW50KCk7 CkBAIC0xNjIsMTYgKzE5OSwxNCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 Y3JlYXRlQm94ZXNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbgogICAgICAgICAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIFJF TEVBU0VfQVNTRVJUKG1faW5saW5lQm94SW5kZXhNYXAuY29udGFpbnMoJnBhcmVudElubGluZUJv eCkpOwotICAgICAgICAgICAgICAgIGJveGVzW21faW5saW5lQm94SW5kZXhNYXAuZ2V0KCZwYXJl bnRJbmxpbmVCb3gpXS5hZGp1c3RJbmtPdmVyZmxvdyhsb2dpY2FsQm9yZGVyQm94KTsKKyAgICAg ICAgICAgICAgICBib3hlc1ttX2lubGluZUJveEluZGV4TWFwLmdldCgmcGFyZW50SW5saW5lQm94 KV0uYWRqdXN0SW5rT3ZlcmZsb3coYm9yZGVyQm94UmVjdCk7CiAgICAgICAgICAgICB9OwogICAg ICAgICAgICAgYWRqdXN0UGFyZW50SW5saW5lQm94SW5rT3ZlcmZsb3coKTsKICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChsaW5lUnVuLmlzSW5saW5lQm94U3Rh cnQoKSkgewogICAgICAgICAgICAgLy8gVGhpcyBpbmxpbmUgYm94IHNob3dlZCB1cCBmaXJzdCBv biB0aGlzIGxpbmUuCi0gICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdT dGF0ZS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOwotICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hC b3JkZXJCb3ggPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94 LCBib3hHZW9tZXRyeSk7Ci0gICAgICAgICAgICBpbmxpbmVCb3hCb3JkZXJCb3gubW92ZUJ5KGxp bmVCb3hMb2dpY2FsVG9wTGVmdCk7CisgICAgICAgICAgICBhdXRvIGlubGluZUJveEJvcmRlckJv eCA9IGRpc3BsYXlCb3hSZWN0KCk7CiAgICAgICAgICAgICBpZiAobGluZUJveC5oYXNDb250ZW50 KCkpIHsKICAgICAgICAgICAgICAgICAvLyBGSVhNRTogSXQncyBleHBlY3RlZCB0byBub3QgaGF2 ZSBhbnkgYm94ZXMgb24gZW1wdHkgbGluZXMuIFdlIHNob3VsZCByZWNvbnNpZGVyIHRoaXMuCiAg ICAgICAgICAgICAgICAgbV9pbmxpbmVCb3hJbmRleE1hcC5hZGQoJmxheW91dEJveCwgYm94ZXMu c2l6ZSgpKTsKQEAgLTE4Miw2ICsyMTcsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVp bGRlcjo6Y3JlYXRlQm94ZXNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbgogICAg ICAgICAgICAgICAgIGJveGVzLmFwcGVuZCh7IGxpbmVJbmRleCwgSW5saW5lRGlzcGxheTo6Qm94 OjpUeXBlOjpOb25Sb290SW5saW5lQm94LCBsYXlvdXRCb3gsIGxpbmVSdW4uYmlkaUxldmVsKCks IGlubGluZUJveEJvcmRlckJveCwgaW5saW5lQm94Qm9yZGVyQm94LCB7IH0sIHsgfSwgaW5saW5l Qm94Lmhhc0NvbnRlbnQoKSwgaXNGaXJzdExhc3RCb3goaW5saW5lQm94KSB9KTsKICAgICAgICAg ICAgIH0KIAorICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUu Ym94R2VvbWV0cnkobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94U2l6ZSA9 IExheW91dFNpemUgeyBMYXlvdXRVbml0Ojpmcm9tRmxvYXRDZWlsKGlubGluZUJveEJvcmRlckJv eC53aWR0aCgpKSwgTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3gu aGVpZ2h0KCkpIH07CiAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gUmVjdCB7IExheW91 dFBvaW50IHsgaW5saW5lQm94Qm9yZGVyQm94LnRvcExlZnQoKSB9LCBpbmxpbmVCb3hTaXplIH07 CiAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdChsb2dpY2FsUmVjdC50 b3BMZWZ0KCkpOwpAQCAtMTk4LDE5ICsyMzQsMTcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXI6OmNyZWF0ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb24K ICAgICAgICAgICAgICAgICAvLyBkb24ndCBleHRlbmQgdGhlIHNwYW5uaW5nIGxpbmUgYm94IG92 ZXIgdG8gdGhpcyBsaW5lIC1hbHNvIHRoZXJlIGlzIG5vIG5leHQgbGluZSBpbiBjYXNlcyBsaWtl IHRoaXMuCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeShsYXlv dXRCb3gpOwotICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hCb3JkZXJCb3ggPSBsaW5lQm94Lmxv Z2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7Ci0gICAg ICAgICAgICBpbmxpbmVCb3hCb3JkZXJCb3gubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7 Ci0KICAgICAgICAgICAgIG1faW5saW5lQm94SW5kZXhNYXAuYWRkKCZsYXlvdXRCb3gsIGJveGVz LnNpemUoKSk7CiAKICAgICAgICAgICAgIGF1dG8mIGlubGluZUJveCA9IGxpbmVCb3guaW5saW5l TGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGF1dG8gaW5saW5l Qm94Qm9yZGVyQm94ID0gZGlzcGxheUJveFJlY3QoKTsKICAgICAgICAgICAgIEFTU0VSVCghaW5s aW5lQm94LmlzRmlyc3RCb3goKSk7CiAgICAgICAgICAgICBib3hlcy5hcHBlbmQoeyBsaW5lSW5k ZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6Tm9uUm9vdElubGluZUJveCwgbGF5b3V0Qm94 LCBsaW5lUnVuLmJpZGlMZXZlbCgpLCBpbmxpbmVCb3hCb3JkZXJCb3gsIGlubGluZUJveEJvcmRl ckJveCwgeyB9LCB7IH0sIGlubGluZUJveC5oYXNDb250ZW50KCksIGlzRmlyc3RMYXN0Qm94KGlu bGluZUJveCkgfSk7CiAKICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94U2l6ZSA9IExheW91dFNp emUgeyBMYXlvdXRVbml0Ojpmcm9tRmxvYXRDZWlsKGlubGluZUJveEJvcmRlckJveC53aWR0aCgp KSwgTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3guaGVpZ2h0KCkp IH07CiAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gUmVjdCB7IExheW91dFBvaW50IHsg aW5saW5lQm94Qm9yZGVyQm94LnRvcExlZnQoKSB9LCBpbmxpbmVCb3hTaXplIH07CiAgICAgICAg ICAgICAvLyBNaWRkbGUgb3IgZW5kIG9mIHRoZSBpbmxpbmUgYm94LiBMZXQncyBzdHJldGNoIHRo ZSBib3ggYXMgbmVlZGVkLgorICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0 aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGF1dG8gZW5jbG9z aW5nQm9yZGVyQm94UmVjdCA9IEJveEdlb21ldHJ5Ojpib3JkZXJCb3hSZWN0KGJveEdlb21ldHJ5 KTsKICAgICAgICAgICAgIGVuY2xvc2luZ0JvcmRlckJveFJlY3QuZXhwYW5kVG9Db250YWluKGxv Z2ljYWxSZWN0KTsKICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxMZWZ0KGVuY2xv c2luZ0JvcmRlckJveFJlY3QubGVmdCgpKTsK 443171 2021-11-02 21:31:53 -0700 2021-11-03 06:38:03 -0700 Patch bug-232655-20211102213153.patch text/plain 11935 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc1N2FlZTVmOTcxNDIz ODdjNmE0NzMzZWI3ZWE2YTE1Y2VkZWIwYS4uYjJkZjBjNGUyMzBjYjI0MDEyNmFjOTliYWI3ZDhh ZjdiOWE5YjIwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEaXNwbGF5 IGJveCBidWlsZGVyIHNob3VsZCB0YWtlIHZpc3VhbCBvcmRlciBpbnRvIGFjY291bnQgd2hlbiBj b21wdXRpbmcgaG9yaXpvbnRhbCBwb3NpdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjY1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2ggd2UgdHVybiBsb2dpY2FsIGhvcml6 b250YWwgcG9zaXRpb25zIGludG8gInBoeXNpY2FsIiBwb3NpdGlvbnMgYmFzZWQgb24gdGhlIHZp c3VhbCBvcmRlciBvZiB0aGUgcnVucy4KKyAgICAgICAgV2l0aCB0aGlzIGNoYW5nZSwgbm93IElG QyBjYW4gcmVuZGVyIHNpbXBsZSBSVEwgY29udGVudC4KKworICAgICAgICAqIGxheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3Jl YXRlQm94ZXNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KTogTW92ZSBzaGFyZWQgY29k ZSB0byBkaXNwbGF5Qm94UmVjdC4gCisKIDIwMjEtMTEtMDIgIFJvYmluIE1vcmlzc2V0ICA8cm1v cmlzc2V0QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uIChyMjg0MzMwKTogWyBtYWNP UyB3azEgRGVidWcgXSB3ZWJhdWRpby9BdWRpb0J1ZmZlci9odWdlLWJ1ZmZlci5odG1sIGlzIGEg Zmxha3kgdGltZW91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlD b250ZW50QnVpbGRlci5jcHAKaW5kZXggM2VlYThmNTA2MTY3Yjg0NDg3MjY5M2JmYzc3OGNhNWY1 OGU5ZmM3My4uNjY5OGMzMjNlZTM2ZjIwN2YzNjdjMDgwMjAyODhiZmFjOTVhZGY3ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CkBAIC03NCwxNyArNzQsNjMgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNy ZWF0ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb24KICAgICBhdXRvJiBy dW5zID0gbGluZUNvbnRlbnQucnVuczsKICAgICBhdXRvIGNvbnRlbnROZWVkc0JpZGlSZW9yZGVy aW5nID0gIWxpbmVDb250ZW50LnZpc3VhbE9yZGVyTGlzdC5pc0VtcHR5KCk7CiAgICAgQVNTRVJU KCFjb250ZW50TmVlZHNCaWRpUmVvcmRlcmluZyB8fCBsaW5lQ29udGVudC52aXN1YWxPcmRlckxp c3Quc2l6ZSgpID09IHJ1bnMuc2l6ZSgpKTsKKworICAgIGF1dG8gY29udGVudFJpZ2h0SW5WaXN1 YWxPcmRlciA9IElubGluZUxheW91dFVuaXQgeyB9OwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgcnVucy5zaXplKCk7ICsraSkgewotICAgICAgICBhdXRvJiBsaW5lUnVuID0gcnVuc1tjb250 ZW50TmVlZHNCaWRpUmVvcmRlcmluZyA/IGxpbmVDb250ZW50LnZpc3VhbE9yZGVyTGlzdFtpXSA6 IGldOworICAgICAgICBhdXRvIHZpc3VhbEluZGV4ID0gY29udGVudE5lZWRzQmlkaVJlb3JkZXJp bmcgPyBsaW5lQ29udGVudC52aXN1YWxPcmRlckxpc3RbaV0gOiBpOworICAgICAgICBhdXRvJiBs aW5lUnVuID0gcnVuc1t2aXN1YWxJbmRleF07CiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxp bmVSdW4ubGF5b3V0Qm94KCk7CiAgICAgICAgIGF1dG8mIHN0eWxlID0gWyZdICgpIC0+IGNvbnN0 IFJlbmRlclN0eWxlJiB7CiAgICAgICAgICAgICByZXR1cm4gIWxpbmVJbmRleCA/IGxheW91dEJv eC5maXJzdExpbmVTdHlsZSgpIDogbGF5b3V0Qm94LnN0eWxlKCk7CiAgICAgICAgIH0oKTsKIAot ICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQoKSkgewotICAgICAgICAgICAgYXV0byB0ZXh0UnVu UmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pOwotICAgICAgICAg ICAgdGV4dFJ1blJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CisgICAgICAgIGF1 dG8gZGlzcGxheUJveFJlY3QgPSBbJl0geworICAgICAgICAgICAgYXV0byBsb2dpY2FsUmVjdCA9 IElubGluZVJlY3QgeyB9OworCisgICAgICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQoKSB8fCBs aW5lUnVuLmlzU29mdExpbmVCcmVhaygpKQorICAgICAgICAgICAgICAgIGxvZ2ljYWxSZWN0ID0g bGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bik7CisgICAgICAgICAgICBlbHNl IGlmIChsaW5lUnVuLmlzSGFyZExpbmVCcmVhaygpKQorICAgICAgICAgICAgICAgIGxvZ2ljYWxS ZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvckxpbmVCcmVha0JveChsYXlvdXRCb3gpOworICAg ICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3Jt YXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAgICBpZiAo bGluZVJ1bi5pc0JveCgpKQorICAgICAgICAgICAgICAgICAgICBsb2dpY2FsUmVjdCA9IGxpbmVC b3gubG9naWNhbEJvcmRlckJveEZvckF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgYm94 R2VvbWV0cnkpOworICAgICAgICAgICAgICAgIGVsc2UgaWYgKGxpbmVSdW4uaXNJbmxpbmVCb3hT dGFydCgpIHx8IGxpbmVSdW4uaXNMaW5lU3Bhbm5pbmdJbmxpbmVCb3hTdGFydCgpKQorICAgICAg ICAgICAgICAgICAgICBsb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklu bGluZUJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKKyAgICAgICAgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgaWYgKCFjb250ZW50TmVlZHNCaWRpUmVvcmRlcmluZykgeworICAgICAgICAg ICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOworICAgICAg ICAgICAgICAgIHJldHVybiBsb2dpY2FsUmVjdDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGxvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdC55KCkpOwor ICAgICAgICAgICAgLy8gVXNlIHRoZSBkaXN0YW5jZSBmcm9tIHRoZSBsb2dpY2FsIHByZXZpb3Vz IHJ1biB0byBwbGFjZSB0aGUgZGlzcGxheSBib3ggaG9yaXpvbnRhbGx5IGluIHZpc3VhbCB0ZXJt cy4KKyAgICAgICAgICAgIGF1dG8qIGxvZ2ljYWxQcmV2aW91c1J1biA9IHZpc3VhbEluZGV4ID8g JnJ1bnNbdmlzdWFsSW5kZXggLSAxXSA6IG51bGxwdHI7CisgICAgICAgICAgICAvLyBDZXJ0YWlu IGNzcyBwcm9wZXJ0aWVzIChlLmcuIHdvcmQtc3BhY2luZykgbWF5IGludHJvZHVjZSBhIGdhcCBi ZXR3ZWVuIHJ1bnMuCisgICAgICAgICAgICBhdXRvIGRpc3RhbmNlRnJvbUxvZ2ljYWxQcmV2aW91 c1J1biA9IGxvZ2ljYWxQcmV2aW91c1J1biA/IGxpbmVSdW4ubG9naWNhbExlZnQoKSAtIGxvZ2lj YWxQcmV2aW91c1J1bi0+bG9naWNhbFJpZ2h0KCkgOiBsaW5lUnVuLmxvZ2ljYWxMZWZ0KCk7Cisg ICAgICAgICAgICBhdXRvIHZpc3VhbE9yZGVyUmVjdCA9IGxvZ2ljYWxSZWN0OworICAgICAgICAg ICAgYXV0byBjb250ZW50TGVmdCA9IGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKyBkaXN0YW5j ZUZyb21Mb2dpY2FsUHJldmlvdXNSdW47CisgICAgICAgICAgICBpZiAoIWkpIHsKKyAgICAgICAg ICAgICAgICAvLyBGaXJzdCB2aXN1YWwgcnVuLiBJbml0aWFsIGNvbnRlbnQgcG9zaXRpb24gZGVw ZW5kcyBvbiB0aGUgYmxvY2sncyBpbmxpbmUgZGlyZWN0aW9uLgorICAgICAgICAgICAgICAgIGNv bnRlbnRMZWZ0ICs9IGxpbmVCb3hMb2dpY2FsVG9wTGVmdC54KCk7CisKKyAgICAgICAgICAgICAg ICBhdXRvIHJvb3RJbmxpbmVCb3ggPSBib3hlc1swXTsKKyAgICAgICAgICAgICAgICBBU1NFUlQo cm9vdElubGluZUJveC5pc1Jvb3RJbmxpbmVCb3goKSk7CisgICAgICAgICAgICAgICAgaWYgKCFy b290SW5saW5lQm94LnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKQorICAgICAgICAg ICAgICAgICAgICBjb250ZW50TGVmdCArPSBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoIC0g cm9vdElubGluZUJveC5sb2dpY2FsV2lkdGgoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IHZpc3VhbE9yZGVyUmVjdC5zZXRMZWZ0KGNvbnRlbnRMZWZ0KTsKKyAgICAgICAgICAgIC8vIFRo ZSBpbmxpbmUgYm94IHJpZ2h0IGVkZ2UgaW5jbHVkZXMgaXRzIGNvbnRlbnQgYXMgd2VsbCBhcyB0 aGUgaW5saW5lIGJveCBlbmQgKHBhZGRpbmctcmlnaHQgZXRjKS4KKyAgICAgICAgICAgIC8vIFdo YXQgd2UgbmVlZCBoZXJlIGlzIHRoZSBpbmxpbmUgYm94IHN0YXJ0IHJ1bidzIHdpZHRoLgorICAg ICAgICAgICAgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciA9IGxpbmVSdW4uaXNJbmxpbmVCb3hT dGFydCgpIHx8IGxpbmVSdW4uaXNMaW5lU3Bhbm5pbmdJbmxpbmVCb3hTdGFydCgpCisgICAgICAg ICAgICAgICAgPyB2aXN1YWxPcmRlclJlY3QubGVmdCgpICsgbGluZVJ1bi5sb2dpY2FsV2lkdGgo KQorICAgICAgICAgICAgICAgIDogdmlzdWFsT3JkZXJSZWN0LnJpZ2h0KCk7CisgICAgICAgICAg ICByZXR1cm4gdmlzdWFsT3JkZXJSZWN0OworICAgICAgICB9OwogCisgICAgICAgIGlmIChsaW5l UnVuLmlzVGV4dCgpKSB7CisgICAgICAgICAgICBhdXRvIHRleHRSdW5SZWN0ID0gZGlzcGxheUJv eFJlY3QoKTsKICAgICAgICAgICAgIGF1dG8gaW5rT3ZlcmZsb3cgPSBbJl0gewogICAgICAgICAg ICAgICAgIGF1dG8gaW5pdGlhbENvbnRhaW5nQmxvY2tTaXplID0gUnVudGltZUVuYWJsZWRGZWF0 dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9u RW5hYmxlZCgpCiAgICAgICAgICAgICAgICAgICAgID8gZm9ybWF0dGluZ1N0YXRlLmxheW91dFN0 YXRlKCkudmlld3BvcnRTaXplKCkKQEAgLTExNiwxMCArMTYyLDggQEAgdm9pZCBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29u dGVudChjb24KICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChs aW5lUnVuLmlzU29mdExpbmVCcmVhaygpKSB7Ci0gICAgICAgICAgICBhdXRvIHNvZnRMaW5lQnJl YWtSdW5SZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bik7Ci0gICAg ICAgICAgICBzb2Z0TGluZUJyZWFrUnVuUmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0 KTsKLQogICAgICAgICAgICAgQVNTRVJUKGxpbmVSdW4udGV4dENvbnRlbnQoKSAmJiBpczxJbmxp bmVUZXh0Qm94PihsYXlvdXRCb3gpKTsKKyAgICAgICAgICAgIGF1dG8gc29mdExpbmVCcmVha1J1 blJlY3QgPSBkaXNwbGF5Qm94UmVjdCgpOwogICAgICAgICAgICAgYXV0byYgdGV4dCA9IGxpbmVS dW4udGV4dENvbnRlbnQoKTsKICAgICAgICAgICAgIGJveGVzLmFwcGVuZCh7IGxpbmVJbmRleAog ICAgICAgICAgICAgICAgICwgSW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpTb2Z0TGluZUJyZWFr CkBAIC0xMzMsOCArMTc3LDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNy ZWF0ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb24KICAgICAgICAgfQog ICAgICAgICBpZiAobGluZVJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAgLy8g T25seSBoYXJkIGxpbmVicmVha3MgaGF2ZSBhc3NvY2lhdGVkIGxheW91dCBib3hlcy4KLSAgICAg ICAgICAgIGF1dG8gbGluZUJyZWFrQm94UmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JMaW5l QnJlYWtCb3gobGF5b3V0Qm94KTsKLSAgICAgICAgICAgIGxpbmVCcmVha0JveFJlY3QubW92ZUJ5 KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CisgICAgICAgICAgICBhdXRvIGxpbmVCcmVha0JveFJl Y3QgPSBkaXNwbGF5Qm94UmVjdCgpOwogICAgICAgICAgICAgYm94ZXMuYXBwZW5kKHsgbGluZUlu ZGV4LCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6OkxpbmVCcmVha0JveCwgbGF5b3V0Qm94LCBs aW5lUnVuLmJpZGlMZXZlbCgpLCBsaW5lQnJlYWtCb3hSZWN0LCBsaW5lQnJlYWtCb3hSZWN0LCBs aW5lUnVuLmV4cGFuc2lvbigpLCB7IH0gfSk7CiAKICAgICAgICAgICAgIGF1dG8mIGJveEdlb21l dHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KGxheW91dEJveCk7CkBAIC0xNDQsMTYg KzE4NywxMyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlQm94ZXNB bmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbgogICAgICAgICB9CiAgICAgICAgIGlm IChsaW5lUnVuLmlzQm94KCkpIHsKICAgICAgICAgICAgIEFTU0VSVChsYXlvdXRCb3guaXNBdG9t aWNJbmxpbmVMZXZlbEJveCgpKTsKLSAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9y bWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KGxheW91dEJveCk7Ci0gICAgICAgICAgICBhdXRvIGxv Z2ljYWxCb3JkZXJCb3ggPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JBdG9taWNJbmxpbmVM ZXZlbEJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKLSAgICAgICAgICAgIGxvZ2ljYWxCb3Jk ZXJCb3gubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CisgICAgICAgICAgICBhdXRvIGJv cmRlckJveFJlY3QgPSBkaXNwbGF5Qm94UmVjdCgpOwogICAgICAgICAgICAgLy8gRklYTUU6IEFk ZCBpbmsgb3ZlcmZsb3cgc3VwcG9ydCBmb3IgYXRvbWljIGlubGluZSBsZXZlbCBib3hlcyAoZS5n LiBib3ggc2hhZG93KS4KLSAgICAgICAgICAgIGJveGVzLmFwcGVuZCh7IGxpbmVJbmRleCwgSW5s aW5lRGlzcGxheTo6Qm94OjpUeXBlOjpBdG9taWNJbmxpbmVMZXZlbEJveCwgbGF5b3V0Qm94LCBs aW5lUnVuLmJpZGlMZXZlbCgpLCBsb2dpY2FsQm9yZGVyQm94LCBsb2dpY2FsQm9yZGVyQm94LCBs aW5lUnVuLmV4cGFuc2lvbigpLCB7IH0gfSk7CisgICAgICAgICAgICBib3hlcy5hcHBlbmQoeyBs aW5lSW5kZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6QXRvbWljSW5saW5lTGV2ZWxCb3gs IGxheW91dEJveCwgbGluZVJ1bi5iaWRpTGV2ZWwoKSwgYm9yZGVyQm94UmVjdCwgYm9yZGVyQm94 UmVjdCwgbGluZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOwogCi0gICAgICAgICAgICBhdXRvIGJv cmRlckJveExvZ2ljYWxUb3BMZWZ0ID0gbG9naWNhbEJvcmRlckJveC50b3BMZWZ0KCk7CiAgICAg ICAgICAgICAvLyBOb3RlIHRoYXQgaW5saW5lIGJveGVzIGFyZSByZWxhdGl2ZSB0byB0aGUgbGlu ZSBhbmQgdGhlaXIgdG9wIHBvc2l0aW9uIGNhbiBiZSBuZWdhdGl2ZS4KICAgICAgICAgICAgIC8v IEF0b21pYyBpbmxpbmUgYm94ZXMgYXJlIGFsbCBzZXQuIFRoZWlyIG1hcmdpbi9ib3JkZXIvY29u dGVudCBib3ggZ2VvbWV0cmllcyBhcmUgYWxyZWFkeSBjb21wdXRlZC4gV2UganVzdCBoYXZlIHRv IHBvc2l0aW9uIHRoZW0gaGVyZS4KLSAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxU b3BMZWZ0KHRvTGF5b3V0UG9pbnQoYm9yZGVyQm94TG9naWNhbFRvcExlZnQpKTsKKyAgICAgICAg ICAgIGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpLnNldExvZ2ljYWxUb3BM ZWZ0KHRvTGF5b3V0UG9pbnQoYm9yZGVyQm94UmVjdC50b3BMZWZ0KCkpKTsKIAogICAgICAgICAg ICAgYXV0byBhZGp1c3RQYXJlbnRJbmxpbmVCb3hJbmtPdmVyZmxvdyA9IFsmXSB7CiAgICAgICAg ICAgICAgICAgYXV0byYgcGFyZW50SW5saW5lQm94ID0gbGF5b3V0Qm94LnBhcmVudCgpOwpAQCAt MTYyLDE2ICsyMDIsMTQgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0 ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb24KICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBSRUxFQVNF X0FTU0VSVChtX2lubGluZUJveEluZGV4TWFwLmNvbnRhaW5zKCZwYXJlbnRJbmxpbmVCb3gpKTsK LSAgICAgICAgICAgICAgICBib3hlc1ttX2lubGluZUJveEluZGV4TWFwLmdldCgmcGFyZW50SW5s aW5lQm94KV0uYWRqdXN0SW5rT3ZlcmZsb3cobG9naWNhbEJvcmRlckJveCk7CisgICAgICAgICAg ICAgICAgYm94ZXNbbV9pbmxpbmVCb3hJbmRleE1hcC5nZXQoJnBhcmVudElubGluZUJveCldLmFk anVzdElua092ZXJmbG93KGJvcmRlckJveFJlY3QpOwogICAgICAgICAgICAgfTsKICAgICAgICAg ICAgIGFkanVzdFBhcmVudElubGluZUJveElua092ZXJmbG93KCk7CiAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgfQogICAgICAgICBpZiAobGluZVJ1bi5pc0lubGluZUJveFN0YXJ0KCkp IHsKICAgICAgICAgICAgIC8vIFRoaXMgaW5saW5lIGJveCBzaG93ZWQgdXAgZmlyc3Qgb24gdGhp cyBsaW5lLgotICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUu Ym94R2VvbWV0cnkobGF5b3V0Qm94KTsKLSAgICAgICAgICAgIGF1dG8gaW5saW5lQm94Qm9yZGVy Qm94ID0gbGluZUJveC5sb2dpY2FsQm9yZGVyQm94Rm9ySW5saW5lQm94KGxheW91dEJveCwgYm94 R2VvbWV0cnkpOwotICAgICAgICAgICAgaW5saW5lQm94Qm9yZGVyQm94Lm1vdmVCeShsaW5lQm94 TG9naWNhbFRvcExlZnQpOworICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hCb3JkZXJCb3ggPSBk aXNwbGF5Qm94UmVjdCgpOwogICAgICAgICAgICAgaWYgKGxpbmVCb3guaGFzQ29udGVudCgpKSB7 CiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IEl0J3MgZXhwZWN0ZWQgdG8gbm90IGhhdmUgYW55 IGJveGVzIG9uIGVtcHR5IGxpbmVzLiBXZSBzaG91bGQgcmVjb25zaWRlciB0aGlzLgogICAgICAg ICAgICAgICAgIG1faW5saW5lQm94SW5kZXhNYXAuYWRkKCZsYXlvdXRCb3gsIGJveGVzLnNpemUo KSk7CkBAIC0xODIsNiArMjIwLDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6 OmNyZWF0ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb24KICAgICAgICAg ICAgICAgICBib3hlcy5hcHBlbmQoeyBsaW5lSW5kZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlw ZTo6Tm9uUm9vdElubGluZUJveCwgbGF5b3V0Qm94LCBsaW5lUnVuLmJpZGlMZXZlbCgpLCBpbmxp bmVCb3hCb3JkZXJCb3gsIGlubGluZUJveEJvcmRlckJveCwgeyB9LCB7IH0sIGlubGluZUJveC5o YXNDb250ZW50KCksIGlzRmlyc3RMYXN0Qm94KGlubGluZUJveCkgfSk7CiAgICAgICAgICAgICB9 CiAKKyAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdl b21ldHJ5KGxheW91dEJveCk7CiAgICAgICAgICAgICBhdXRvIGlubGluZUJveFNpemUgPSBMYXlv dXRTaXplIHsgTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3gud2lk dGgoKSksIExheW91dFVuaXQ6OmZyb21GbG9hdENlaWwoaW5saW5lQm94Qm9yZGVyQm94LmhlaWdo dCgpKSB9OwogICAgICAgICAgICAgYXV0byBsb2dpY2FsUmVjdCA9IFJlY3QgeyBMYXlvdXRQb2lu dCB7IGlubGluZUJveEJvcmRlckJveC50b3BMZWZ0KCkgfSwgaW5saW5lQm94U2l6ZSB9OwogICAg ICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbFRvcExlZnQobG9naWNhbFJlY3QudG9wTGVm dCgpKTsKQEAgLTE5OCwxOSArMjM3LDE3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjpjcmVhdGVCb3hlc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uCiAgICAg ICAgICAgICAgICAgLy8gZG9uJ3QgZXh0ZW5kIHRoZSBzcGFubmluZyBsaW5lIGJveCBvdmVyIHRv IHRoaXMgbGluZSAtYWxzbyB0aGVyZSBpcyBubyBuZXh0IGxpbmUgaW4gY2FzZXMgbGlrZSB0aGlz LgogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAg YXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94 KTsKLSAgICAgICAgICAgIGF1dG8gaW5saW5lQm94Qm9yZGVyQm94ID0gbGluZUJveC5sb2dpY2Fs Qm9yZGVyQm94Rm9ySW5saW5lQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwotICAgICAgICAg ICAgaW5saW5lQm94Qm9yZGVyQm94Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOwotCiAg ICAgICAgICAgICBtX2lubGluZUJveEluZGV4TWFwLmFkZCgmbGF5b3V0Qm94LCBib3hlcy5zaXpl KCkpOwogCiAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3ggPSBsaW5lQm94LmlubGluZUxldmVs Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CisgICAgICAgICAgICBhdXRvIGlubGluZUJveEJv cmRlckJveCA9IGRpc3BsYXlCb3hSZWN0KCk7CiAgICAgICAgICAgICBBU1NFUlQoIWlubGluZUJv eC5pc0ZpcnN0Qm94KCkpOwogICAgICAgICAgICAgYm94ZXMuYXBwZW5kKHsgbGluZUluZGV4LCBJ bmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6Ok5vblJvb3RJbmxpbmVCb3gsIGxheW91dEJveCwgbGlu ZVJ1bi5iaWRpTGV2ZWwoKSwgaW5saW5lQm94Qm9yZGVyQm94LCBpbmxpbmVCb3hCb3JkZXJCb3gs IHsgfSwgeyB9LCBpbmxpbmVCb3guaGFzQ29udGVudCgpLCBpc0ZpcnN0TGFzdEJveChpbmxpbmVC b3gpIH0pOwogCiAgICAgICAgICAgICBhdXRvIGlubGluZUJveFNpemUgPSBMYXlvdXRTaXplIHsg TGF5b3V0VW5pdDo6ZnJvbUZsb2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3gud2lkdGgoKSksIExh eW91dFVuaXQ6OmZyb21GbG9hdENlaWwoaW5saW5lQm94Qm9yZGVyQm94LmhlaWdodCgpKSB9Owog ICAgICAgICAgICAgYXV0byBsb2dpY2FsUmVjdCA9IFJlY3QgeyBMYXlvdXRQb2ludCB7IGlubGlu ZUJveEJvcmRlckJveC50b3BMZWZ0KCkgfSwgaW5saW5lQm94U2l6ZSB9OwogICAgICAgICAgICAg Ly8gTWlkZGxlIG9yIGVuZCBvZiB0aGUgaW5saW5lIGJveC4gTGV0J3Mgc3RyZXRjaCB0aGUgYm94 IGFzIG5lZWRlZC4KKyAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0 YXRlLmJveEdlb21ldHJ5KGxheW91dEJveCk7CiAgICAgICAgICAgICBhdXRvIGVuY2xvc2luZ0Jv cmRlckJveFJlY3QgPSBCb3hHZW9tZXRyeTo6Ym9yZGVyQm94UmVjdChib3hHZW9tZXRyeSk7CiAg ICAgICAgICAgICBlbmNsb3NpbmdCb3JkZXJCb3hSZWN0LmV4cGFuZFRvQ29udGFpbihsb2dpY2Fs UmVjdCk7CiAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsTGVmdChlbmNsb3NpbmdC b3JkZXJCb3hSZWN0LmxlZnQoKSk7Cg==