265120 2023-11-19 20:42:04 -0800 [IFC] Merge font loading content and "CanUseSimplifiedTextMeasuring" traversals 2023-11-20 15:25:15 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1993810 0 zalan 2023-11-19 20:42:04 -0800 ssia 1993811 1 468669 zalan 2023-11-19 20:43:30 -0800 Created attachment 468669 Patch 1993902 2 468680 zalan 2023-11-20 07:24:14 -0800 Created attachment 468680 Patch 1993904 3 468681 zalan 2023-11-20 07:43:28 -0800 Created attachment 468681 Patch 1993937 4 468684 zalan 2023-11-20 09:16:39 -0800 Created attachment 468684 Patch 1993955 5 468687 zalan 2023-11-20 11:29:23 -0800 Created attachment 468687 [fast-cq]Patch 1993999 6 ews-feeder 2023-11-20 15:24:32 -0800 Committed 270989@main (991d8d4adc5a): <https://commits.webkit.org/270989@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468687. 1994000 7 webkit-bug-importer 2023-11-20 15:25:15 -0800 <rdar://problem/118663620> 468669 2023-11-19 20:43:30 -0800 2023-11-20 07:24:12 -0800 Patch bug-265120-20231119204330.patch text/plain 4635 zalan RnJvbSBlMjJkN2I0NjI0ZmVjNGNlY2M0ZjZlYzFkM2NmMWU4MGRkYTBiZDNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMTkgTm92IDIwMjMgMjA6NDI6MTcgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBN ZXJnZSBmb250IGxvYWRpbmcgY29udGVudCBhbmQKICJDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1 cmluZyIgdHJhdmVyc2FscwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI2NTEyMAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKFdlYkNvcmU6OlJlbmRlclRleHQ6OmluaXRpYXRlRm9u dExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUFuZENvbXB1dGVDYW5Vc2VTaW1wbGlmaWVkVGV4 dE1lYXN1cmluZyk6CihXZWJDb3JlOjpSZW5kZXJUZXh0OjpzdHlsZURpZENoYW5nZSk6CihXZWJD b3JlOjppbml0aWF0ZUZvbnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFJZkFwcGxpY2FibGUp OiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Lmg6Ci0tLQog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIHwgMTkgKysrKysrKysrKysr KysrKy0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaCAgIHwgIDEgKwog MiBmaWxlcyBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAppbmRleCBiMmFhYjE4MjBjYjAuLmFkMThk MWRmY2U0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcApAQCAtMjk0 LDggKzI5NCw5IEBAIGJvb2wgUmVuZGVyVGV4dDo6Y29tcHV0ZVVzZUJhY2tzbGFzaEFzWWVuU3lt Ym9sKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyB2b2lkIGluaXRpYXRl Rm9udExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUlmQXBwbGljYWJsZShjb25zdCBTdHJpbmcm IHRleHRDb250ZW50LCBjb25zdCBGb250Q2FzY2FkZSYgZm9udENhc2NhZGUpCit2b2lkIFJlbmRl clRleHQ6OmluaXRpYXRlRm9udExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUFuZENvbXB1dGVD YW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyhjb25zdCBTdHJpbmcmIHRleHRDb250ZW50LCBj b25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCiB7CisgICAgYXV0byYgZm9udENhc2NhZGUgPSBzdHls ZS5mb250Q2FzY2FkZSgpOwogICAgIC8vIFNlZSB3ZWJraXQub3JnL2IvMjUyNjY4CiAgICAgYXV0 byBmb250VmFyaWFudCA9IEF1dG9WYXJpYW50OwogI2lmIFVTRShGT05UX1ZBUklBTlRfVklBX0ZF QVRVUkVTKQpAQCAtMzA1LDYgKzMwNiwxNyBAQCBzdGF0aWMgdm9pZCBpbml0aWF0ZUZvbnRMb2Fk aW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFJZkFwcGxpY2FibGUoY29uc3QgU3RyaW5nJiB0ZQogICAg ICAgICBmb250VmFyaWFudCA9IE5vcm1hbFZhcmlhbnQ7CiAgICAgfQogI2VuZGlmCisgICAgYXV0 byB3aGl0ZXNwYWNlSXNDb2xsYXBzZWQgPSBzdHlsZS5jb2xsYXBzZVdoaXRlU3BhY2UoKTsKKyAg ICBhdXRvJiBwcmltYXJ5Rm9udCA9IGZvbnRDYXNjYWRlLnByaW1hcnlGb250KCk7CisgICAgbV9j YW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyA9ICFmb250Q2FzY2FkZS53b3JkU3BhY2luZygp ICYmICFmb250Q2FzY2FkZS5sZXR0ZXJTcGFjaW5nKCkgJiYgIXByaW1hcnlGb250LnN5bnRoZXRp Y0JvbGRPZmZzZXQoKTsKKworICAgIGlmIChtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5n KSB7CisgICAgICAgIC8vIEFkZGl0aW9uYWwgY2hlY2sgb24gdGhlIGZvbnQgY29kZXBhdGguCisg ICAgICAgIGF1dG8gcnVuID0gVGV4dFJ1biB7IHRleHRDb250ZW50IH07CisgICAgICAgIHJ1bi5z ZXRDaGFyYWN0ZXJTY2FuRm9yQ29kZVBhdGgoZmFsc2UpOworICAgICAgICBtX2NhblVzZVNpbXBs aWZpZWRUZXh0TWVhc3VyaW5nID0gZm9udENhc2NhZGUuY29kZVBhdGgocnVuKSA9PSBGb250Q2Fz Y2FkZTo6Q29kZVBhdGg6OlNpbXBsZTsKKyAgICB9CisKICAgICAvLyBGSVhNRTogUHJlLXdhcm0g Z2x5cGggbG9hZGluZyBpbiBGb250Q2FzY2FkZSB3aXRoIHRoZSBtb3N0IGNvbW1vbiByYW5nZS4K ICAgICBzdGQ6OmFycmF5PGJvb2wsIDI1Nj4gaGFzU2VlbiA9IHsgZmFsc2UgfTsKICAgICBmb3Ig KFVDaGFyMzIgY2hhcmFjdGVyIDogU3RyaW5nVmlldyh0ZXh0Q29udGVudCkuY29kZVBvaW50cygp KSB7CkBAIC0zMTMsNyArMzI1LDggQEAgc3RhdGljIHZvaWQgaW5pdGlhdGVGb250TG9hZGluZ0J5 QWNjZXNzaW5nR2x5cGhEYXRhSWZBcHBsaWNhYmxlKGNvbnN0IFN0cmluZyYgdGUKICAgICAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGhhc1NlZW5bY2hhcmFjdGVyXSA9IHRydWU7 CiAgICAgICAgIH0KLSAgICAgICAgZm9udENhc2NhZGUuZ2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGNo YXJhY3RlciwgZmFsc2UsIGZvbnRWYXJpYW50KTsKKyAgICAgICAgYXV0byBnbHlwaERhdGEgPSBm b250Q2FzY2FkZS5nbHlwaERhdGFGb3JDaGFyYWN0ZXIoY2hhcmFjdGVyLCBmYWxzZSwgZm9udFZh cmlhbnQpOworICAgICAgICBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nID0gbV9jYW5V c2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyAmJiBXaWR0aEl0ZXJhdG9yOjpjaGFyYWN0ZXJDYW5V c2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyhjaGFyYWN0ZXIsIHdoaXRlc3BhY2VJc0NvbGxhcHNl ZCkgJiYgZ2x5cGhEYXRhLmlzVmFsaWQoKSAmJiBnbHlwaERhdGEuZm9udCA9PSAmcHJpbWFyeUZv bnQ7CiAgICAgfQogfQogCkBAIC0zMzAsNyArMzQzLDcgQEAgdm9pZCBSZW5kZXJUZXh0OjpzdHls ZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0 eWwKIAogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSA9IHN0eWxlKCk7CiAgICAgaWYg KCFvbGRTdHlsZSkKLSAgICAgICAgaW5pdGlhdGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhE YXRhSWZBcHBsaWNhYmxlKG1fdGV4dCwgbmV3U3R5bGUuZm9udENhc2NhZGUoKSk7CisgICAgICAg IGluaXRpYXRlRm9udExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUFuZENvbXB1dGVDYW5Vc2VT aW1wbGlmaWVkVGV4dE1lYXN1cmluZyhtX3RleHQsIG5ld1N0eWxlKTsKICAgICBpZiAob2xkU3R5 bGUgJiYgb2xkU3R5bGUtPmZvbnRDYXNjYWRlKCkgIT0gbmV3U3R5bGUuZm9udENhc2NhZGUoKSkK ICAgICAgICAgbV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyA9IHsgfTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKaW5kZXggNjJlM2E3MTExYzk3Li44MGFhODgxZDMx NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaApAQCAtMjI5LDYgKzIyOSw3 IEBAIHByaXZhdGU6CiAKICAgICBmbG9hdCBtYXhXb3JkRnJhZ21lbnRXaWR0aChjb25zdCBSZW5k ZXJTdHlsZSYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgU3RyaW5nVmlldyB3b3JkLCB1bnNpZ25lZCBt aW5pbXVtUHJlZml4TGVuZ3RoLCB1bnNpZ25lZCBtaW5pbXVtU3VmZml4TGVuZ3RoLCBib29sIGN1 cnJlbnRDaGFyYWN0ZXJJc1NwYWNlLCB1bnNpZ25lZCBjaGFyYWN0ZXJJbmRleCwgZmxvYXQgeFBv cywgZmxvYXQgZW50aXJlV29yZFdpZHRoLCBXb3JkVHJhaWxpbmdTcGFjZSYsIFdlYWtIYXNoU2V0 PGNvbnN0IEZvbnQ+JiBmYWxsYmFja0ZvbnRzLCBHbHlwaE92ZXJmbG93Jik7CiAgICAgZmxvYXQg d2lkdGhGcm9tQ2FjaGVDb25zaWRlcmluZ1Bvc3NpYmxlVHJhaWxpbmdTcGFjZShjb25zdCBSZW5k ZXJTdHlsZSYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgdW5zaWduZWQgc3RhcnRJbmRleCwgdW5zaWdu ZWQgd29yZExlbiwgZmxvYXQgeFBvcywgYm9vbCBjdXJyZW50Q2hhcmFjdGVySXNTcGFjZSwgV29y ZFRyYWlsaW5nU3BhY2UmLCBXZWFrSGFzaFNldDxjb25zdCBGb250PiYgZmFsbGJhY2tGb250cywg R2x5cGhPdmVyZmxvdyYpIGNvbnN0OworICAgIHZvaWQgaW5pdGlhdGVGb250TG9hZGluZ0J5QWNj ZXNzaW5nR2x5cGhEYXRhQW5kQ29tcHV0ZUNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKGNv bnN0IFN0cmluZyYsIGNvbnN0IFJlbmRlclN0eWxlJik7CiAKICNpZiBFTkFCTEUoVEVYVF9BVVRP U0laSU5HKQogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJseSBiZSBwYXJ0IG9mIHRo ZSB0ZXh0IHNpemluZyBzdHJ1Y3R1cmVzIGluIERvY3VtZW50IGluc3RlYWQuIFRoYXQgd291bGQg c2F2ZSBzb21lIG1lbW9yeS4K 468680 2023-11-20 07:24:14 -0800 2023-11-20 07:43:25 -0800 Patch bug-265120-20231120072413.patch text/plain 4679 zalan RnJvbSAyZTU0YjU4MmM0ZDhhNjY2ZGM3ODM3MzMyN2IzZTkzYmI3ZmMxY2I3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgMjAgTm92IDIwMjMgMDc6MjI6NTggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBN ZXJnZSBmb250IGxvYWRpbmcgY29udGVudCBhbmQKICJDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1 cmluZyIgdHJhdmVyc2FscwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI2NTEyMAoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgoqIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKFdlYkNvcmU6OlJlbmRlclRleHQ6OmluaXRpYXRlRm9u dExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUFuZENvbXB1dGVDYW5Vc2VTaW1wbGlmaWVkVGV4 dE1lYXN1cmluZyk6CihXZWJDb3JlOjpSZW5kZXJUZXh0OjpzdHlsZURpZENoYW5nZSk6CihXZWJD b3JlOjppbml0aWF0ZUZvbnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFJZkFwcGxpY2FibGUp OiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Lmg6Ci0tLQog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIHwgMjAgKysrKysrKysrKysr KysrKystLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmggICB8ICAxICsK IDIgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggZjdmN2Q0YWQyOTAxLi4zZmZk ZjA0YmY4ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKQEAgLTI5 NSw4ICsyOTUsMTAgQEAgYm9vbCBSZW5kZXJUZXh0Ojpjb21wdXRlVXNlQmFja3NsYXNoQXNZZW5T eW1ib2woKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIHZvaWQgaW5pdGlh dGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhSWZBcHBsaWNhYmxlKGNvbnN0IFN0cmlu ZyYgdGV4dENvbnRlbnQsIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2FzY2FkZSkKK3ZvaWQgUmVu ZGVyVGV4dDo6aW5pdGlhdGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhQW5kQ29tcHV0 ZUNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKGNvbnN0IFN0cmluZyYgdGV4dENvbnRlbnQp CiB7CisgICAgYXV0byYgc3R5bGUgPSB0aGlzLT5zdHlsZSgpOworICAgIGF1dG8mIGZvbnRDYXNj YWRlID0gc3R5bGUuZm9udENhc2NhZGUoKTsKICAgICAvLyBTZWUgd2Via2l0Lm9yZy9iLzI1MjY2 OAogICAgIGF1dG8gZm9udFZhcmlhbnQgPSBBdXRvVmFyaWFudDsKICNpZiBVU0UoRk9OVF9WQVJJ QU5UX1ZJQV9GRUFUVVJFUykKQEAgLTMwNiw2ICszMDgsMTcgQEAgc3RhdGljIHZvaWQgaW5pdGlh dGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhSWZBcHBsaWNhYmxlKGNvbnN0IFN0cmlu ZyYgdGUKICAgICAgICAgZm9udFZhcmlhbnQgPSBOb3JtYWxWYXJpYW50OwogICAgIH0KICNlbmRp ZgorICAgIGF1dG8gd2hpdGVzcGFjZUlzQ29sbGFwc2VkID0gc3R5bGUuY29sbGFwc2VXaGl0ZVNw YWNlKCk7CisgICAgYXV0byYgcHJpbWFyeUZvbnQgPSBmb250Q2FzY2FkZS5wcmltYXJ5Rm9udCgp OworICAgIG1fY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcgPSAhZm9udENhc2NhZGUud29y ZFNwYWNpbmcoKSAmJiAhZm9udENhc2NhZGUubGV0dGVyU3BhY2luZygpICYmICFwcmltYXJ5Rm9u dC5zeW50aGV0aWNCb2xkT2Zmc2V0KCkgJiYgKCZmaXJzdExpbmVTdHlsZSgpID09ICZzdHlsZSB8 fCAmZm9udENhc2NhZGUgPT0gJmZpcnN0TGluZVN0eWxlKCkuZm9udENhc2NhZGUoKSk7CisKKyAg ICBpZiAobV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZykgeworICAgICAgICAvLyBBZGRp dGlvbmFsIGNoZWNrIG9uIHRoZSBmb250IGNvZGVwYXRoLgorICAgICAgICBhdXRvIHJ1biA9IFRl eHRSdW4geyB0ZXh0Q29udGVudCB9OworICAgICAgICBydW4uc2V0Q2hhcmFjdGVyU2NhbkZvckNv ZGVQYXRoKGZhbHNlKTsKKyAgICAgICAgbV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyA9 IGZvbnRDYXNjYWRlLmNvZGVQYXRoKHJ1bikgPT0gRm9udENhc2NhZGU6OkNvZGVQYXRoOjpTaW1w bGU7CisgICAgfQorCiAgICAgLy8gRklYTUU6IFByZS13YXJtIGdseXBoIGxvYWRpbmcgaW4gRm9u dENhc2NhZGUgd2l0aCB0aGUgbW9zdCBjb21tb24gcmFuZ2UuCiAgICAgc3RkOjpiaXRzZXQ8MjU2 PiBoYXNTZWVuOwogICAgIGZvciAoVUNoYXIzMiBjaGFyYWN0ZXIgOiBTdHJpbmdWaWV3KHRleHRD b250ZW50KS5jb2RlUG9pbnRzKCkpIHsKQEAgLTMxNCw3ICszMjcsOCBAQCBzdGF0aWMgdm9pZCBp bml0aWF0ZUZvbnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFJZkFwcGxpY2FibGUoY29uc3Qg U3RyaW5nJiB0ZQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgaGFzU2Vl bi5zZXQoY2hhcmFjdGVyKTsKICAgICAgICAgfQotICAgICAgICBmb250Q2FzY2FkZS5nbHlwaERh dGFGb3JDaGFyYWN0ZXIoY2hhcmFjdGVyLCBmYWxzZSwgZm9udFZhcmlhbnQpOworICAgICAgICBh dXRvIGdseXBoRGF0YSA9IGZvbnRDYXNjYWRlLmdseXBoRGF0YUZvckNoYXJhY3RlcihjaGFyYWN0 ZXIsIGZhbHNlLCBmb250VmFyaWFudCk7CisgICAgICAgIG1fY2FuVXNlU2ltcGxpZmllZFRleHRN ZWFzdXJpbmcgPSBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nICYmIFdpZHRoSXRlcmF0 b3I6OmNoYXJhY3RlckNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKGNoYXJhY3Rlciwgd2hp dGVzcGFjZUlzQ29sbGFwc2VkKSAmJiBnbHlwaERhdGEuaXNWYWxpZCgpICYmIGdseXBoRGF0YS5m b250ID09ICZwcmltYXJ5Rm9udDsKICAgICB9CiB9CiAKQEAgLTMzMSw3ICszNDUsNyBAQCB2b2lk IFJlbmRlclRleHQ6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBS ZW5kZXJTdHlsZSogb2xkU3R5bAogCiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlID0g c3R5bGUoKTsKICAgICBpZiAoIW9sZFN0eWxlKQotICAgICAgICBpbml0aWF0ZUZvbnRMb2FkaW5n QnlBY2Nlc3NpbmdHbHlwaERhdGFJZkFwcGxpY2FibGUobV90ZXh0LCBuZXdTdHlsZS5mb250Q2Fz Y2FkZSgpKTsKKyAgICAgICAgaW5pdGlhdGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRh QW5kQ29tcHV0ZUNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKG1fdGV4dCk7CiAgICAgaWYg KG9sZFN0eWxlICYmIG9sZFN0eWxlLT5mb250Q2FzY2FkZSgpICE9IG5ld1N0eWxlLmZvbnRDYXNj YWRlKCkpCiAgICAgICAgIG1fY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcgPSB7IH07CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCmluZGV4IDYyZTNhNzExMWM5Ny4uYzc0 Y2M3YjcxOTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4 dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKQEAgLTIyOSw2 ICsyMjksNyBAQCBwcml2YXRlOgogCiAgICAgZmxvYXQgbWF4V29yZEZyYWdtZW50V2lkdGgoY29u c3QgUmVuZGVyU3R5bGUmLCBjb25zdCBGb250Q2FzY2FkZSYsIFN0cmluZ1ZpZXcgd29yZCwgdW5z aWduZWQgbWluaW11bVByZWZpeExlbmd0aCwgdW5zaWduZWQgbWluaW11bVN1ZmZpeExlbmd0aCwg Ym9vbCBjdXJyZW50Q2hhcmFjdGVySXNTcGFjZSwgdW5zaWduZWQgY2hhcmFjdGVySW5kZXgsIGZs b2F0IHhQb3MsIGZsb2F0IGVudGlyZVdvcmRXaWR0aCwgV29yZFRyYWlsaW5nU3BhY2UmLCBXZWFr SGFzaFNldDxjb25zdCBGb250PiYgZmFsbGJhY2tGb250cywgR2x5cGhPdmVyZmxvdyYpOwogICAg IGZsb2F0IHdpZHRoRnJvbUNhY2hlQ29uc2lkZXJpbmdQb3NzaWJsZVRyYWlsaW5nU3BhY2UoY29u c3QgUmVuZGVyU3R5bGUmLCBjb25zdCBGb250Q2FzY2FkZSYsIHVuc2lnbmVkIHN0YXJ0SW5kZXgs IHVuc2lnbmVkIHdvcmRMZW4sIGZsb2F0IHhQb3MsIGJvb2wgY3VycmVudENoYXJhY3RlcklzU3Bh Y2UsIFdvcmRUcmFpbGluZ1NwYWNlJiwgV2Vha0hhc2hTZXQ8Y29uc3QgRm9udD4mIGZhbGxiYWNr Rm9udHMsIEdseXBoT3ZlcmZsb3cmKSBjb25zdDsKKyAgICB2b2lkIGluaXRpYXRlRm9udExvYWRp bmdCeUFjY2Vzc2luZ0dseXBoRGF0YUFuZENvbXB1dGVDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1 cmluZyhjb25zdCBTdHJpbmcmKTsKIAogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAgICAg Ly8gRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5IGJlIHBhcnQgb2YgdGhlIHRleHQgc2l6aW5n IHN0cnVjdHVyZXMgaW4gRG9jdW1lbnQgaW5zdGVhZC4gVGhhdCB3b3VsZCBzYXZlIHNvbWUgbWVt b3J5Lgo= 468681 2023-11-20 07:43:28 -0800 2023-11-20 09:35:22 -0800 Patch bug-265120-20231120074327.patch text/plain 4681 zalan RnJvbSAyZWIxOWI0YTk3YzUzZTU2ZjkzMTIxYmYxNzIwOTg2MTYwODBkOGMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgMjAgTm92IDIwMjMgMDc6MjI6NTggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBN ZXJnZSBmb250IGxvYWRpbmcgY29udGVudCBhbmQKICJDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1 cmluZyIgdHJhdmVyc2FscwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI2NTEyMAoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgoqIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKFdlYkNvcmU6OlJlbmRlclRleHQ6OmluaXRpYXRlRm9u dExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUFuZENvbXB1dGVDYW5Vc2VTaW1wbGlmaWVkVGV4 dE1lYXN1cmluZyk6CihXZWJDb3JlOjpSZW5kZXJUZXh0OjpzdHlsZURpZENoYW5nZSk6CihXZWJD b3JlOjppbml0aWF0ZUZvbnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFJZkFwcGxpY2FibGUp OiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Lmg6Ci0tLQog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIHwgMjAgKysrKysrKysrKysr KysrKystLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmggICB8ICAxICsK IDIgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggZjdmN2Q0YWQyOTAxLi45NTZi OTlhYzNjMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKQEAgLTI5 NSw4ICsyOTUsMTAgQEAgYm9vbCBSZW5kZXJUZXh0Ojpjb21wdXRlVXNlQmFja3NsYXNoQXNZZW5T eW1ib2woKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIHZvaWQgaW5pdGlh dGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhSWZBcHBsaWNhYmxlKGNvbnN0IFN0cmlu ZyYgdGV4dENvbnRlbnQsIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2FzY2FkZSkKK3ZvaWQgUmVu ZGVyVGV4dDo6aW5pdGlhdGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhQW5kQ29tcHV0 ZUNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKGNvbnN0IFN0cmluZyYgdGV4dENvbnRlbnQp CiB7CisgICAgYXV0byYgc3R5bGUgPSB0aGlzLT5zdHlsZSgpOworICAgIGF1dG8mIGZvbnRDYXNj YWRlID0gc3R5bGUuZm9udENhc2NhZGUoKTsKICAgICAvLyBTZWUgd2Via2l0Lm9yZy9iLzI1MjY2 OAogICAgIGF1dG8gZm9udFZhcmlhbnQgPSBBdXRvVmFyaWFudDsKICNpZiBVU0UoRk9OVF9WQVJJ QU5UX1ZJQV9GRUFUVVJFUykKQEAgLTMwNiw2ICszMDgsMTcgQEAgc3RhdGljIHZvaWQgaW5pdGlh dGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhSWZBcHBsaWNhYmxlKGNvbnN0IFN0cmlu ZyYgdGUKICAgICAgICAgZm9udFZhcmlhbnQgPSBOb3JtYWxWYXJpYW50OwogICAgIH0KICNlbmRp ZgorICAgIGF1dG8gd2hpdGVzcGFjZUlzQ29sbGFwc2VkID0gc3R5bGUuY29sbGFwc2VXaGl0ZVNw YWNlKCk7CisgICAgYXV0byYgcHJpbWFyeUZvbnQgPSBmb250Q2FzY2FkZS5wcmltYXJ5Rm9udCgp OworICAgIG1fY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcgPSAhZm9udENhc2NhZGUud29y ZFNwYWNpbmcoKSAmJiAhZm9udENhc2NhZGUubGV0dGVyU3BhY2luZygpICYmICFwcmltYXJ5Rm9u dC5zeW50aGV0aWNCb2xkT2Zmc2V0KCkgJiYgKCZmaXJzdExpbmVTdHlsZSgpID09ICZzdHlsZSB8 fCAmZm9udENhc2NhZGUgPT0gJmZpcnN0TGluZVN0eWxlKCkuZm9udENhc2NhZGUoKSk7CisKKyAg ICBpZiAoKm1fY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcpIHsKKyAgICAgICAgLy8gQWRk aXRpb25hbCBjaGVjayBvbiB0aGUgZm9udCBjb2RlcGF0aC4KKyAgICAgICAgYXV0byBydW4gPSBU ZXh0UnVuIHsgdGV4dENvbnRlbnQgfTsKKyAgICAgICAgcnVuLnNldENoYXJhY3RlclNjYW5Gb3JD b2RlUGF0aChmYWxzZSk7CisgICAgICAgIG1fY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcg PSBmb250Q2FzY2FkZS5jb2RlUGF0aChydW4pID09IEZvbnRDYXNjYWRlOjpDb2RlUGF0aDo6U2lt cGxlOworICAgIH0KKwogICAgIC8vIEZJWE1FOiBQcmUtd2FybSBnbHlwaCBsb2FkaW5nIGluIEZv bnRDYXNjYWRlIHdpdGggdGhlIG1vc3QgY29tbW9uIHJhbmdlLgogICAgIHN0ZDo6Yml0c2V0PDI1 Nj4gaGFzU2VlbjsKICAgICBmb3IgKFVDaGFyMzIgY2hhcmFjdGVyIDogU3RyaW5nVmlldyh0ZXh0 Q29udGVudCkuY29kZVBvaW50cygpKSB7CkBAIC0zMTQsNyArMzI3LDggQEAgc3RhdGljIHZvaWQg aW5pdGlhdGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhSWZBcHBsaWNhYmxlKGNvbnN0 IFN0cmluZyYgdGUKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGhhc1Nl ZW4uc2V0KGNoYXJhY3Rlcik7CiAgICAgICAgIH0KLSAgICAgICAgZm9udENhc2NhZGUuZ2x5cGhE YXRhRm9yQ2hhcmFjdGVyKGNoYXJhY3RlciwgZmFsc2UsIGZvbnRWYXJpYW50KTsKKyAgICAgICAg YXV0byBnbHlwaERhdGEgPSBmb250Q2FzY2FkZS5nbHlwaERhdGFGb3JDaGFyYWN0ZXIoY2hhcmFj dGVyLCBmYWxzZSwgZm9udFZhcmlhbnQpOworICAgICAgICBtX2NhblVzZVNpbXBsaWZpZWRUZXh0 TWVhc3VyaW5nID0gKm1fY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcgJiYgV2lkdGhJdGVy YXRvcjo6Y2hhcmFjdGVyQ2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcoY2hhcmFjdGVyLCB3 aGl0ZXNwYWNlSXNDb2xsYXBzZWQpICYmIGdseXBoRGF0YS5pc1ZhbGlkKCkgJiYgZ2x5cGhEYXRh LmZvbnQgPT0gJnByaW1hcnlGb250OwogICAgIH0KIH0KIApAQCAtMzMxLDcgKzM0NSw3IEBAIHZv aWQgUmVuZGVyVGV4dDo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0 IFJlbmRlclN0eWxlKiBvbGRTdHlsCiAKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUg PSBzdHlsZSgpOwogICAgIGlmICghb2xkU3R5bGUpCi0gICAgICAgIGluaXRpYXRlRm9udExvYWRp bmdCeUFjY2Vzc2luZ0dseXBoRGF0YUlmQXBwbGljYWJsZShtX3RleHQsIG5ld1N0eWxlLmZvbnRD YXNjYWRlKCkpOworICAgICAgICBpbml0aWF0ZUZvbnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERh dGFBbmRDb21wdXRlQ2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcobV90ZXh0KTsKICAgICBp ZiAob2xkU3R5bGUgJiYgb2xkU3R5bGUtPmZvbnRDYXNjYWRlKCkgIT0gbmV3U3R5bGUuZm9udENh c2NhZGUoKSkKICAgICAgICAgbV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyA9IHsgfTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKaW5kZXggNjJlM2E3MTExYzk3Li5j NzRjYzdiNzE5MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaApAQCAtMjI5 LDYgKzIyOSw3IEBAIHByaXZhdGU6CiAKICAgICBmbG9hdCBtYXhXb3JkRnJhZ21lbnRXaWR0aChj b25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgU3RyaW5nVmlldyB3b3JkLCB1 bnNpZ25lZCBtaW5pbXVtUHJlZml4TGVuZ3RoLCB1bnNpZ25lZCBtaW5pbXVtU3VmZml4TGVuZ3Ro LCBib29sIGN1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlLCB1bnNpZ25lZCBjaGFyYWN0ZXJJbmRleCwg ZmxvYXQgeFBvcywgZmxvYXQgZW50aXJlV29yZFdpZHRoLCBXb3JkVHJhaWxpbmdTcGFjZSYsIFdl YWtIYXNoU2V0PGNvbnN0IEZvbnQ+JiBmYWxsYmFja0ZvbnRzLCBHbHlwaE92ZXJmbG93Jik7CiAg ICAgZmxvYXQgd2lkdGhGcm9tQ2FjaGVDb25zaWRlcmluZ1Bvc3NpYmxlVHJhaWxpbmdTcGFjZShj b25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgdW5zaWduZWQgc3RhcnRJbmRl eCwgdW5zaWduZWQgd29yZExlbiwgZmxvYXQgeFBvcywgYm9vbCBjdXJyZW50Q2hhcmFjdGVySXNT cGFjZSwgV29yZFRyYWlsaW5nU3BhY2UmLCBXZWFrSGFzaFNldDxjb25zdCBGb250PiYgZmFsbGJh Y2tGb250cywgR2x5cGhPdmVyZmxvdyYpIGNvbnN0OworICAgIHZvaWQgaW5pdGlhdGVGb250TG9h ZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhQW5kQ29tcHV0ZUNhblVzZVNpbXBsaWZpZWRUZXh0TWVh c3VyaW5nKGNvbnN0IFN0cmluZyYpOwogCiAjaWYgRU5BQkxFKFRFWFRfQVVUT1NJWklORykKICAg ICAvLyBGSVhNRTogVGhpcyBzaG91bGQgcHJvYmFibHkgYmUgcGFydCBvZiB0aGUgdGV4dCBzaXpp bmcgc3RydWN0dXJlcyBpbiBEb2N1bWVudCBpbnN0ZWFkLiBUaGF0IHdvdWxkIHNhdmUgc29tZSBt ZW1vcnkuCg== 468684 2023-11-20 09:16:39 -0800 2023-11-20 11:29:21 -0800 Patch bug-265120-20231120091638.patch text/plain 5028 zalan RnJvbSA1YjgxYjhlYWUwMGExMGU0ODRmYWVjMDA5MjYyYjljODkwODVmNzU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgMjAgTm92IDIwMjMgMDc6MjI6NTggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBN ZXJnZSBmb250IGxvYWRpbmcgY29udGVudCBhbmQKICJDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1 cmluZyIgdHJhdmVyc2FscwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI2NTEyMAoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgoqIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKFdlYkNvcmU6OlJlbmRlclRleHQ6OmluaXRpYXRlRm9u dExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUFuZENvbXB1dGVDYW5Vc2VTaW1wbGlmaWVkVGV4 dE1lYXN1cmluZyk6CihXZWJDb3JlOjpSZW5kZXJUZXh0OjpzdHlsZURpZENoYW5nZSk6CihXZWJD b3JlOjppbml0aWF0ZUZvbnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFJZkFwcGxpY2FibGUp OiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Lmg6Ci0tLQog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIHwgMjIgKysrKysrKysrKysr KysrKysrKy0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaCAgIHwgIDEg KwogMiBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAppbmRleCBmN2Y3ZDRhZDI5MDEuLjIz NTA2ZTMzY2E0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRl eHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcApAQCAt Mjk1LDE3ICsyOTUsMzIgQEAgYm9vbCBSZW5kZXJUZXh0Ojpjb21wdXRlVXNlQmFja3NsYXNoQXNZ ZW5TeW1ib2woKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIHZvaWQgaW5p dGlhdGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhSWZBcHBsaWNhYmxlKGNvbnN0IFN0 cmluZyYgdGV4dENvbnRlbnQsIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2FzY2FkZSkKK3ZvaWQg UmVuZGVyVGV4dDo6aW5pdGlhdGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhQW5kQ29t cHV0ZUNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKGNvbnN0IFN0cmluZyYgdGV4dENvbnRl bnQpCiB7CisgICAgYXV0byYgc3R5bGUgPSB0aGlzLT5zdHlsZSgpOworICAgIGF1dG8mIGZvbnRD YXNjYWRlID0gc3R5bGUuZm9udENhc2NhZGUoKTsKICAgICAvLyBTZWUgd2Via2l0Lm9yZy9iLzI1 MjY2OAogICAgIGF1dG8gZm9udFZhcmlhbnQgPSBBdXRvVmFyaWFudDsKKyAgICBtX2NhblVzZVNp bXBsaWZpZWRUZXh0TWVhc3VyaW5nID0gdHJ1ZTsKICNpZiBVU0UoRk9OVF9WQVJJQU5UX1ZJQV9G RUFUVVJFUykKICAgICBpZiAoZm9udENhc2NhZGUuZm9udERlc2NyaXB0aW9uKCkudmFyaWFudENh cHMoKSA9PSBGb250VmFyaWFudENhcHM6OlNtYWxsKSB7CiAgICAgICAgIC8vIFRoaXMgbWF0Y2hl cyB0aGUgYmVoYXZpb3Igb2YgQ29tcGxleFRleHRDb250cm9sbGVyOjpjb2xsZWN0Q29tcGxleFRl eHRSdW5zKCk6IHRoYXQgZnVuY3Rpb24gZG9lc24ndCBwZXJmb3JtIGZvbnQgZmFsbGJhY2sKICAg ICAgICAgLy8gb24gdGhlIGNhcGl0YWxpemVkIGNoYXJhY3RlcnMgd2hlbiBzbWFsbCBjYXBzIGlz IGVuYWJsZWQsIHNvIHdlIHNob3VsZG4ndCBoZXJlIGVpdGhlci4KICAgICAgICAgZm9udFZhcmlh bnQgPSBOb3JtYWxWYXJpYW50OworICAgICAgICBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3Vy aW5nID0gZmFsc2U7CiAgICAgfQogI2VuZGlmCisgICAgYXV0byB3aGl0ZXNwYWNlSXNDb2xsYXBz ZWQgPSBzdHlsZS5jb2xsYXBzZVdoaXRlU3BhY2UoKTsKKyAgICBhdXRvJiBwcmltYXJ5Rm9udCA9 IGZvbnRDYXNjYWRlLnByaW1hcnlGb250KCk7CisgICAgbV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1l YXN1cmluZyA9ICptX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nICYmICFmb250Q2FzY2Fk ZS53b3JkU3BhY2luZygpICYmICFmb250Q2FzY2FkZS5sZXR0ZXJTcGFjaW5nKCkgJiYgIXByaW1h cnlGb250LnN5bnRoZXRpY0JvbGRPZmZzZXQoKSAmJiAoJmZpcnN0TGluZVN0eWxlKCkgPT0gJnN0 eWxlIHx8ICZmb250Q2FzY2FkZSA9PSAmZmlyc3RMaW5lU3R5bGUoKS5mb250Q2FzY2FkZSgpKTsK KworICAgIGlmICgqbV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZykgeworICAgICAgICAv LyBBZGRpdGlvbmFsIGNoZWNrIG9uIHRoZSBmb250IGNvZGVwYXRoLgorICAgICAgICBhdXRvIHJ1 biA9IFRleHRSdW4geyB0ZXh0Q29udGVudCB9OworICAgICAgICBydW4uc2V0Q2hhcmFjdGVyU2Nh bkZvckNvZGVQYXRoKGZhbHNlKTsKKyAgICAgICAgbV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1 cmluZyA9IGZvbnRDYXNjYWRlLmNvZGVQYXRoKHJ1bikgPT0gRm9udENhc2NhZGU6OkNvZGVQYXRo OjpTaW1wbGU7CisgICAgfQorCiAgICAgLy8gRklYTUU6IFByZS13YXJtIGdseXBoIGxvYWRpbmcg aW4gRm9udENhc2NhZGUgd2l0aCB0aGUgbW9zdCBjb21tb24gcmFuZ2UuCiAgICAgc3RkOjpiaXRz ZXQ8MjU2PiBoYXNTZWVuOwogICAgIGZvciAoVUNoYXIzMiBjaGFyYWN0ZXIgOiBTdHJpbmdWaWV3 KHRleHRDb250ZW50KS5jb2RlUG9pbnRzKCkpIHsKQEAgLTMxNCw3ICszMjksOCBAQCBzdGF0aWMg dm9pZCBpbml0aWF0ZUZvbnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFJZkFwcGxpY2FibGUo Y29uc3QgU3RyaW5nJiB0ZQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAg aGFzU2Vlbi5zZXQoY2hhcmFjdGVyKTsKICAgICAgICAgfQotICAgICAgICBmb250Q2FzY2FkZS5n bHlwaERhdGFGb3JDaGFyYWN0ZXIoY2hhcmFjdGVyLCBmYWxzZSwgZm9udFZhcmlhbnQpOworICAg ICAgICBhdXRvIGdseXBoRGF0YSA9IGZvbnRDYXNjYWRlLmdseXBoRGF0YUZvckNoYXJhY3Rlcihj aGFyYWN0ZXIsIGZhbHNlLCBmb250VmFyaWFudCk7CisgICAgICAgIG1fY2FuVXNlU2ltcGxpZmll ZFRleHRNZWFzdXJpbmcgPSAqbV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyAmJiBXaWR0 aEl0ZXJhdG9yOjpjaGFyYWN0ZXJDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyhjaGFyYWN0 ZXIsIHdoaXRlc3BhY2VJc0NvbGxhcHNlZCkgJiYgZ2x5cGhEYXRhLmlzVmFsaWQoKSAmJiBnbHlw aERhdGEuZm9udCA9PSAmcHJpbWFyeUZvbnQ7CiAgICAgfQogfQogCkBAIC0zMzEsNyArMzQ3LDcg QEAgdm9pZCBSZW5kZXJUZXh0OjpzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwg Y29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWwKIAogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdT dHlsZSA9IHN0eWxlKCk7CiAgICAgaWYgKCFvbGRTdHlsZSkKLSAgICAgICAgaW5pdGlhdGVGb250 TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhSWZBcHBsaWNhYmxlKG1fdGV4dCwgbmV3U3R5bGUu Zm9udENhc2NhZGUoKSk7CisgICAgICAgIGluaXRpYXRlRm9udExvYWRpbmdCeUFjY2Vzc2luZ0ds eXBoRGF0YUFuZENvbXB1dGVDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyhtX3RleHQpOwog ICAgIGlmIChvbGRTdHlsZSAmJiBvbGRTdHlsZS0+Zm9udENhc2NhZGUoKSAhPSBuZXdTdHlsZS5m b250Q2FzY2FkZSgpKQogICAgICAgICBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nID0g eyB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAppbmRleCA2MmUzYTcxMTFj OTcuLmM3NGNjN2I3MTkzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCkBA IC0yMjksNiArMjI5LDcgQEAgcHJpdmF0ZToKIAogICAgIGZsb2F0IG1heFdvcmRGcmFnbWVudFdp ZHRoKGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgRm9udENhc2NhZGUmLCBTdHJpbmdWaWV3IHdv cmQsIHVuc2lnbmVkIG1pbmltdW1QcmVmaXhMZW5ndGgsIHVuc2lnbmVkIG1pbmltdW1TdWZmaXhM ZW5ndGgsIGJvb2wgY3VycmVudENoYXJhY3RlcklzU3BhY2UsIHVuc2lnbmVkIGNoYXJhY3Rlcklu ZGV4LCBmbG9hdCB4UG9zLCBmbG9hdCBlbnRpcmVXb3JkV2lkdGgsIFdvcmRUcmFpbGluZ1NwYWNl JiwgV2Vha0hhc2hTZXQ8Y29uc3QgRm9udD4mIGZhbGxiYWNrRm9udHMsIEdseXBoT3ZlcmZsb3cm KTsKICAgICBmbG9hdCB3aWR0aEZyb21DYWNoZUNvbnNpZGVyaW5nUG9zc2libGVUcmFpbGluZ1Nw YWNlKGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgRm9udENhc2NhZGUmLCB1bnNpZ25lZCBzdGFy dEluZGV4LCB1bnNpZ25lZCB3b3JkTGVuLCBmbG9hdCB4UG9zLCBib29sIGN1cnJlbnRDaGFyYWN0 ZXJJc1NwYWNlLCBXb3JkVHJhaWxpbmdTcGFjZSYsIFdlYWtIYXNoU2V0PGNvbnN0IEZvbnQ+JiBm YWxsYmFja0ZvbnRzLCBHbHlwaE92ZXJmbG93JikgY29uc3Q7CisgICAgdm9pZCBpbml0aWF0ZUZv bnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFBbmRDb21wdXRlQ2FuVXNlU2ltcGxpZmllZFRl eHRNZWFzdXJpbmcoY29uc3QgU3RyaW5nJik7CiAKICNpZiBFTkFCTEUoVEVYVF9BVVRPU0laSU5H KQogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJseSBiZSBwYXJ0IG9mIHRoZSB0ZXh0 IHNpemluZyBzdHJ1Y3R1cmVzIGluIERvY3VtZW50IGluc3RlYWQuIFRoYXQgd291bGQgc2F2ZSBz b21lIG1lbW9yeS4K 468687 2023-11-20 11:29:23 -0800 2023-11-20 15:24:33 -0800 [fast-cq]Patch bug-265120-20231120112923.patch text/plain 6995 zalan RnJvbSBjMGNhMGMzMzEzYzc5ODllMDRjZGRjZWFjOTJiYWM4MjI1ODUwMDNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgMjAgTm92IDIwMjMgMDc6MjI6NTggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBN ZXJnZSBmb250IGxvYWRpbmcgY29udGVudCBhbmQKICJDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1 cmluZyIgdHJhdmVyc2FscwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI2NTEyMAoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgoqIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKFdlYkNvcmU6OlJlbmRlclRleHQ6OmluaXRpYXRlRm9u dExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUFuZENvbXB1dGVDYW5Vc2VTaW1wbGlmaWVkVGV4 dE1lYXN1cmluZyk6CihXZWJDb3JlOjpSZW5kZXJUZXh0OjpzdHlsZURpZENoYW5nZSk6CihXZWJD b3JlOjppbml0aWF0ZUZvbnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFJZkFwcGxpY2FibGUp OiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Lmg6Ci0tLQog Li4uL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwICAgICAgIHwgIDYgKystLS0K IC4uLi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaCB8ICAyICstCiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgICAgICAgfCAyMiArKysrKysr KysrKysrKysrLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oICAgICAg ICAgfCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJ dGVyYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJh dG9yLmNwcAppbmRleCAyMjZjZjA4MzczNGQuLjQ0M2ZmZjcxMDE2MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKQEAgLTYzNiwx MSArNjM2LDExIEBAIHZvaWQgV2lkdGhJdGVyYXRvcjo6YXBwbHlFeHRyYVNwYWNpbmdBZnRlclNo YXBpbmcoR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyLCB1bnNpCiAgICAgfQogfQogCi1ib29sIFdp ZHRoSXRlcmF0b3I6OmNoYXJhY3RlckNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKFVDaGFy IGNoYXJhY3RlciwgYm9vbCB3aGl0ZXNwYWNlSXNDb2xsYXBzZWQpCitib29sIFdpZHRoSXRlcmF0 b3I6OmNoYXJhY3RlckNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKFVDaGFyMzIgY29kZVBv aW50LCBib29sIHdoaXRlc3BhY2VJc0NvbGxhcHNlZCkKIHsKICAgICAvLyBUaGlzIGZ1bmN0aW9u IG5lZWRzIHRvIGJlIGtlcHQgaW4gc3luYyB3aXRoIGFwcGx5Q1NTVmlzaWJpbGl0eVJ1bGVzKCku CiAKLSAgICBzd2l0Y2ggKGNoYXJhY3RlcikgeworICAgIHN3aXRjaCAoY29kZVBvaW50KSB7CiAg ICAgY2FzZSBuZXdsaW5lQ2hhcmFjdGVyOgogICAgIGNhc2UgY2FycmlhZ2VSZXR1cm46CiAgICAg ICAgIHJldHVybiB0cnVlOwpAQCAtNjY5LDcgKzY2OSw3IEBAIGJvb2wgV2lkdGhJdGVyYXRvcjo6 Y2hhcmFjdGVyQ2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcoVUNoYXIgY2hhcmFjdGVyLCBi b29sCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGlmIChjaGFyYWN0ZXIgPj0gSGlyYWdh bmFMZXR0ZXJTbWFsbEEgfHwgaXNDb250cm9sQ2hhcmFjdGVyKGNoYXJhY3RlcikpCisgICAgaWYg KGNvZGVQb2ludCA+PSBIaXJhZ2FuYUxldHRlclNtYWxsQSB8fCBpc0NvbnRyb2xDaGFyYWN0ZXIo Y29kZVBvaW50KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9y LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmgKaW5k ZXggNDdjMTc5ODZmZDcwLi5iMjNlNTI5ZTY5ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmgKQEAgLTYwLDcgKzYwLDcgQEAgcHVibGlj OgogICAgIGZsb2F0IHJ1bldpZHRoU29GYXIoKSBjb25zdCB7IHJldHVybiBtX3J1bldpZHRoU29G YXI7IH0KICAgICB1bnNpZ25lZCBjdXJyZW50Q2hhcmFjdGVySW5kZXgoKSBjb25zdCB7IHJldHVy biBtX2N1cnJlbnRDaGFyYWN0ZXJJbmRleDsgfQogCi0gICAgc3RhdGljIGJvb2wgY2hhcmFjdGVy Q2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcoVUNoYXIsIGJvb2wgd2hpdGVzcGFjZUlzQ29s bGFwc2VkKTsKKyAgICBzdGF0aWMgYm9vbCBjaGFyYWN0ZXJDYW5Vc2VTaW1wbGlmaWVkVGV4dE1l YXN1cmluZyhVQ2hhcjMyLCBib29sIHdoaXRlc3BhY2VJc0NvbGxhcHNlZCk7CiAKIHByaXZhdGU6 CiAgICAgR2x5cGhEYXRhIGdseXBoRGF0YUZvckNoYXJhY3RlcihVQ2hhcjMyLCBib29sIG1pcnJv cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggZjdmN2Q0YWQy OTAxLi5kMTA1YTA0MTA4YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5j cHAKQEAgLTI5NSwxNyArMjk1LDMyIEBAIGJvb2wgUmVuZGVyVGV4dDo6Y29tcHV0ZVVzZUJhY2tz bGFzaEFzWWVuU3ltYm9sKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyB2 b2lkIGluaXRpYXRlRm9udExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUlmQXBwbGljYWJsZShj b25zdCBTdHJpbmcmIHRleHRDb250ZW50LCBjb25zdCBGb250Q2FzY2FkZSYgZm9udENhc2NhZGUp Cit2b2lkIFJlbmRlclRleHQ6OmluaXRpYXRlRm9udExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0 YUFuZENvbXB1dGVDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyhjb25zdCBTdHJpbmcmIHRl eHRDb250ZW50KQogeworICAgIGF1dG8mIHN0eWxlID0gdGhpcy0+c3R5bGUoKTsKKyAgICBhdXRv JiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNjYWRlKCk7CiAgICAgLy8gU2VlIHdlYmtpdC5v cmcvYi8yNTI2NjgKICAgICBhdXRvIGZvbnRWYXJpYW50ID0gQXV0b1ZhcmlhbnQ7CisgICAgbV9j YW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyA9IGNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCgp OwogI2lmIFVTRShGT05UX1ZBUklBTlRfVklBX0ZFQVRVUkVTKQogICAgIGlmIChmb250Q2FzY2Fk ZS5mb250RGVzY3JpcHRpb24oKS52YXJpYW50Q2FwcygpID09IEZvbnRWYXJpYW50Q2Fwczo6U21h bGwpIHsKICAgICAgICAgLy8gVGhpcyBtYXRjaGVzIHRoZSBiZWhhdmlvciBvZiBDb21wbGV4VGV4 dENvbnRyb2xsZXI6OmNvbGxlY3RDb21wbGV4VGV4dFJ1bnMoKTogdGhhdCBmdW5jdGlvbiBkb2Vz bid0IHBlcmZvcm0gZm9udCBmYWxsYmFjawogICAgICAgICAvLyBvbiB0aGUgY2FwaXRhbGl6ZWQg Y2hhcmFjdGVycyB3aGVuIHNtYWxsIGNhcHMgaXMgZW5hYmxlZCwgc28gd2Ugc2hvdWxkbid0IGhl cmUgZWl0aGVyLgogICAgICAgICBmb250VmFyaWFudCA9IE5vcm1hbFZhcmlhbnQ7CisgICAgICAg IG1fY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcgPSBmYWxzZTsKICAgICB9CiAjZW5kaWYK KyAgICBhdXRvIHdoaXRlc3BhY2VJc0NvbGxhcHNlZCA9IHN0eWxlLmNvbGxhcHNlV2hpdGVTcGFj ZSgpOworICAgIGF1dG8mIHByaW1hcnlGb250ID0gZm9udENhc2NhZGUucHJpbWFyeUZvbnQoKTsK KyAgICBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nID0gKm1fY2FuVXNlU2ltcGxpZmll ZFRleHRNZWFzdXJpbmcgJiYgIWZvbnRDYXNjYWRlLndvcmRTcGFjaW5nKCkgJiYgIWZvbnRDYXNj YWRlLmxldHRlclNwYWNpbmcoKSAmJiAhcHJpbWFyeUZvbnQuc3ludGhldGljQm9sZE9mZnNldCgp ICYmICgmZmlyc3RMaW5lU3R5bGUoKSA9PSAmc3R5bGUgfHwgJmZvbnRDYXNjYWRlID09ICZmaXJz dExpbmVTdHlsZSgpLmZvbnRDYXNjYWRlKCkpOworCisgICAgaWYgKCptX2NhblVzZVNpbXBsaWZp ZWRUZXh0TWVhc3VyaW5nKSB7CisgICAgICAgIC8vIEFkZGl0aW9uYWwgY2hlY2sgb24gdGhlIGZv bnQgY29kZXBhdGguCisgICAgICAgIGF1dG8gcnVuID0gVGV4dFJ1biB7IHRleHRDb250ZW50IH07 CisgICAgICAgIHJ1bi5zZXRDaGFyYWN0ZXJTY2FuRm9yQ29kZVBhdGgoZmFsc2UpOworICAgICAg ICBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nID0gZm9udENhc2NhZGUuY29kZVBhdGgo cnVuKSA9PSBGb250Q2FzY2FkZTo6Q29kZVBhdGg6OlNpbXBsZTsKKyAgICB9CisKICAgICAvLyBG SVhNRTogUHJlLXdhcm0gZ2x5cGggbG9hZGluZyBpbiBGb250Q2FzY2FkZSB3aXRoIHRoZSBtb3N0 IGNvbW1vbiByYW5nZS4KICAgICBzdGQ6OmJpdHNldDwyNTY+IGhhc1NlZW47CiAgICAgZm9yIChV Q2hhcjMyIGNoYXJhY3RlciA6IFN0cmluZ1ZpZXcodGV4dENvbnRlbnQpLmNvZGVQb2ludHMoKSkg ewpAQCAtMzE0LDcgKzMyOSw4IEBAIHN0YXRpYyB2b2lkIGluaXRpYXRlRm9udExvYWRpbmdCeUFj Y2Vzc2luZ0dseXBoRGF0YUlmQXBwbGljYWJsZShjb25zdCBTdHJpbmcmIHRlCiAgICAgICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgICAgICBoYXNTZWVuLnNldChjaGFyYWN0ZXIpOwogICAg ICAgICB9Ci0gICAgICAgIGZvbnRDYXNjYWRlLmdseXBoRGF0YUZvckNoYXJhY3RlcihjaGFyYWN0 ZXIsIGZhbHNlLCBmb250VmFyaWFudCk7CisgICAgICAgIGF1dG8gZ2x5cGhEYXRhID0gZm9udENh c2NhZGUuZ2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGNoYXJhY3RlciwgZmFsc2UsIGZvbnRWYXJpYW50 KTsKKyAgICAgICAgbV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyA9ICptX2NhblVzZVNp bXBsaWZpZWRUZXh0TWVhc3VyaW5nICYmIFdpZHRoSXRlcmF0b3I6OmNoYXJhY3RlckNhblVzZVNp bXBsaWZpZWRUZXh0TWVhc3VyaW5nKGNoYXJhY3Rlciwgd2hpdGVzcGFjZUlzQ29sbGFwc2VkKSAm JiBnbHlwaERhdGEuaXNWYWxpZCgpICYmIGdseXBoRGF0YS5mb250ID09ICZwcmltYXJ5Rm9udDsK ICAgICB9CiB9CiAKQEAgLTMzMSw3ICszNDcsNyBAQCB2b2lkIFJlbmRlclRleHQ6OnN0eWxlRGlk Q2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bAog CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlID0gc3R5bGUoKTsKICAgICBpZiAoIW9s ZFN0eWxlKQotICAgICAgICBpbml0aWF0ZUZvbnRMb2FkaW5nQnlBY2Nlc3NpbmdHbHlwaERhdGFJ ZkFwcGxpY2FibGUobV90ZXh0LCBuZXdTdHlsZS5mb250Q2FzY2FkZSgpKTsKKyAgICAgICAgaW5p dGlhdGVGb250TG9hZGluZ0J5QWNjZXNzaW5nR2x5cGhEYXRhQW5kQ29tcHV0ZUNhblVzZVNpbXBs aWZpZWRUZXh0TWVhc3VyaW5nKG1fdGV4dCk7CiAgICAgaWYgKG9sZFN0eWxlICYmIG9sZFN0eWxl LT5mb250Q2FzY2FkZSgpICE9IG5ld1N0eWxlLmZvbnRDYXNjYWRlKCkpCiAgICAgICAgIG1fY2Fu VXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcgPSB7IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dC5oCmluZGV4IDYyZTNhNzExMWM5Ny4uYzc0Y2M3YjcxOTM5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKQEAgLTIyOSw2ICsyMjksNyBAQCBwcml2YXRlOgog CiAgICAgZmxvYXQgbWF4V29yZEZyYWdtZW50V2lkdGgoY29uc3QgUmVuZGVyU3R5bGUmLCBjb25z dCBGb250Q2FzY2FkZSYsIFN0cmluZ1ZpZXcgd29yZCwgdW5zaWduZWQgbWluaW11bVByZWZpeExl bmd0aCwgdW5zaWduZWQgbWluaW11bVN1ZmZpeExlbmd0aCwgYm9vbCBjdXJyZW50Q2hhcmFjdGVy SXNTcGFjZSwgdW5zaWduZWQgY2hhcmFjdGVySW5kZXgsIGZsb2F0IHhQb3MsIGZsb2F0IGVudGly ZVdvcmRXaWR0aCwgV29yZFRyYWlsaW5nU3BhY2UmLCBXZWFrSGFzaFNldDxjb25zdCBGb250PiYg ZmFsbGJhY2tGb250cywgR2x5cGhPdmVyZmxvdyYpOwogICAgIGZsb2F0IHdpZHRoRnJvbUNhY2hl Q29uc2lkZXJpbmdQb3NzaWJsZVRyYWlsaW5nU3BhY2UoY29uc3QgUmVuZGVyU3R5bGUmLCBjb25z dCBGb250Q2FzY2FkZSYsIHVuc2lnbmVkIHN0YXJ0SW5kZXgsIHVuc2lnbmVkIHdvcmRMZW4sIGZs b2F0IHhQb3MsIGJvb2wgY3VycmVudENoYXJhY3RlcklzU3BhY2UsIFdvcmRUcmFpbGluZ1NwYWNl JiwgV2Vha0hhc2hTZXQ8Y29uc3QgRm9udD4mIGZhbGxiYWNrRm9udHMsIEdseXBoT3ZlcmZsb3cm KSBjb25zdDsKKyAgICB2b2lkIGluaXRpYXRlRm9udExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0 YUFuZENvbXB1dGVDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyhjb25zdCBTdHJpbmcmKTsK IAogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxk IHByb2JhYmx5IGJlIHBhcnQgb2YgdGhlIHRleHQgc2l6aW5nIHN0cnVjdHVyZXMgaW4gRG9jdW1l bnQgaW5zdGVhZC4gVGhhdCB3b3VsZCBzYXZlIHNvbWUgbWVtb3J5Lgo=