248644 2022-12-01 19:50:18 -0800 [leading-trim][IFC] Add support for leading-trim on non-root inline boxes 2023-01-13 09:28:12 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 245599 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1916143 0 zalan 2022-12-01 19:50:18 -0800 ssia 1916144 1 463848 zalan 2022-12-01 20:00:52 -0800 Created attachment 463848 Patch 1916512 2 463880 zalan 2022-12-03 15:55:20 -0800 Created attachment 463880 [fast-cq]Patch 1916518 3 ews-feeder 2022-12-03 16:36:35 -0800 Committed 257338@main (951ce5d72f7b): <https://commits.webkit.org/257338@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 463880. 1916519 4 webkit-bug-importer 2022-12-03 16:37:17 -0800 <rdar://problem/102941401> 463848 2022-12-01 20:00:52 -0800 2022-12-03 15:55:18 -0800 Patch bug-248644-20221201200051.patch text/plain 11696 zalan RnJvbSAwNTkyZTM1ZTEyMThhODUyYWU0OTQ0MDFlZTk4MzFjM2M2NGU2MzM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMSBEZWMgMjAyMiAxOTo1MTo0OCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtsZWFkaW5n LXRyaW1dIEFkZCBzdXBwb3J0IGZvciBsZWFkaW5nLXRyaW0gb24gbm9uLXJvb3QKIGlubGluZSBi b3hlcyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQ4NjQ0CgpSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoaXMgcGF0Y2ggYWRkcyBpbml0aWFsIHN1cHBvcnQg Zm9yIGxlYWRpbmctdHJpbSBvbiBub24tcm9vdCBpbmxpbmUgYm94ZXMuCiJsZWFkaW5nLXRyaW0i IGNvbnN1bHRzICJ0ZXh0LWVkZ2UiIGFuZCB0cmltcyB0aGUgb3Zlci91bmRlciBzaWRlcyBhY2Nv cmRpbmdseS4KClRyaW1taW5nIGhlcmUgbWVhbnMgdGhhdCB0aGUgY29udGVudCBib3ggb2YgdGhl IGlubGluZSBib3ggc2hyaW5rcyB0byBtYXRjaCB3aGF0ICJ0ZXh0LWVkZ2UiIHNheXMuCkl0IGFs c28gbWVhbnMgdGhhdCBub3cgdGhlIGNvbnRlbnQgbG9naWNhbCB0b3AgaW5zaWRlIHRoZSBpbmxp bmUgYm94IGRvZXMgbm90IG5lY2Vzc2FyaWx5IG1hdGNoIHRoZSBpbmxpbmUgYm94J3MgbG9naWNh bCB0b3AuIGUuZy4gd2hlbiB0ZXh0LWVkZ2Ugc2F5cyAiZXgiIGFuZCBsZWFkaW5nLXRyaW0gc2F5 cyAic3RhcnQiLCB0aGUgIm92ZXIgZXgiIHBhcnQgb2YgdGhlIHRleHQgY29udGVudCBzdGFydHMg b3ZlcmZsb3dpbmcgdGhlIGlubGluZSBib3gncyBjb250ZW50IGJveCwgb3IgaW4gb3RoZXIgd29y ZHMgdGhlIHRleHQgY29udGVudCdzIHRvcCBwb3NpdGlvbiBpcyBhYm92ZSB0aGUgY29udGFpbmlu ZyBpbmxpbmUgYm94J3MgdG9wLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveC5oOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVM ZXZlbEJveDo6bGVhZGluZ1RyaW0gY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVMZXZl bEJveDo6aW5saW5lQm94Q29udGVudE9mZnNldEZvckxlYWRpbmdUcmltIGNvbnN0KToKKFdlYkNv cmU6OkxheW91dDo6SW5saW5lTGV2ZWxCb3g6OnNldElubGluZUJveENvbnRlbnRPZmZzZXRGb3JM ZWFkaW5nVHJpbSk6CihXZWJDb3JlOjpMYXlvdXQ6Om1fc3R5bGUpOgoqIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guY3BwOgooV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQm94Ojpsb2dpY2FsUmVjdEZvclRleHRSdW4gY29uc3QpOgoqIFNv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC b3hCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbXB1dGVk QXNlbnRBbmREZXNjZW50Rm9ySW5saW5lQm94IGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJveEJ1aWxkZXI6OnNldFZlcnRpY2FsUHJvcGVydGllc0ZvcklubGluZUxldmVsQm94IGNvbnN0 KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQm94QnVpbGRlci5oOgotLS0KIC4uLi9pbmxpbmUvSW5saW5lTGV2ZWxCb3guaCAgICAg ICAgICAgICAgICAgICB8ICA4ICsrLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQm94LmNwcCAgICAg ICAgICAgICAgICAgIHwgIDQgKy0KIC4uLi9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3Bw ICAgICAgICAgICB8IDU5ICsrKysrKysrKysrKysrKysrKy0KIC4uLi9pbmxpbmUvSW5saW5lTGlu ZUJveEJ1aWxkZXIuaCAgICAgICAgICAgICB8ICAyICsKIDQgZmlsZXMgY2hhbmdlZCwgNjkgaW5z ZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveC5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGV2ZWxCb3gu aAppbmRleCA1NmUxNGJmOTFlNzQuLmEzYjQ1NmJjNDYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGV2ZWxCb3guaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMZXZlbEJveC5oCkBAIC03Nyw3ICs3NywxMCBAQCBwdWJsaWM6CiAgICAgY29uc3QgRm9udE1l dHJpY3MmIHByaW1hcnltZXRyaWNzT2ZQcmltYXJ5Rm9udCgpIGNvbnN0IHsgcmV0dXJuIG1fc3R5 bGUucHJpbWFyeUZvbnRNZXRyaWNzOyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBmb250U2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fc3R5bGUucHJpbWFyeUZvbnRTaXplOyB9CiAKKyAgICAvLyBGSVhN RTogTWF5YmUgaXQncyB0aW1lIHRvIHN1YmNsYXNzIGlubGluZSBib3ggdHlwZXMuCiAgICAgVGV4 dEVkZ2UgdGV4dEVkZ2UoKSBjb25zdCB7IHJldHVybiBtX3N0eWxlLnRleHRFZGdlOyB9CisgICAg TGVhZGluZ1RyaW0gbGVhZGluZ1RyaW0oKSBjb25zdCB7IHJldHVybiBtX3N0eWxlLmxlYWRpbmdU cmltOyB9CisgICAgSW5saW5lTGF5b3V0VW5pdCBpbmxpbmVCb3hDb250ZW50T2Zmc2V0Rm9yTGVh ZGluZ1RyaW0oKSBjb25zdCB7IHJldHVybiBtX2lubGluZUJveENvbnRlbnRPZmZzZXRGb3JMZWFk aW5nVHJpbTsgfQogCiAgICAgYm9vbCBoYXNBbm5vdGF0aW9uKCkgY29uc3QgeyByZXR1cm4gaGFz Q29udGVudCgpICYmIG1fYW5ub3RhdGlvbi5oYXNfdmFsdWUoKTsgfTsKICAgICBzdGQ6Om9wdGlv bmFsPElubGluZUxheW91dFVuaXQ+IGFubm90YXRpb25BYm92ZSgpIGNvbnN0IHsgcmV0dXJuIGhh c0Fubm90YXRpb24oKSAmJiBtX2Fubm90YXRpb24tPnR5cGUgPT0gQW5ub3RhdGlvbjo6VHlwZTo6 QWJvdmUgPyBzdGQ6Om1ha2Vfb3B0aW9uYWwobV9hbm5vdGF0aW9uLT5zaXplKSA6IHN0ZDo6bnVs bG9wdDsgfQpAQCAtMTMyLDYgKzEzNSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRBc2NlbnQo SW5saW5lTGF5b3V0VW5pdCBhc2NlbnQpIHsgbV9hc2NlbnQgPSByb3VuZFRvSW50KGFzY2VudCk7 IH0KICAgICB2b2lkIHNldERlc2NlbnQoSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50KSB7IG1fZGVz Y2VudCA9IHJvdW5kVG9JbnQoZGVzY2VudCk7IH0KICAgICB2b2lkIHNldExheW91dEJvdW5kcyhj b25zdCBMYXlvdXRCb3VuZHMmIGxheW91dEJvdW5kcykgeyBtX2xheW91dEJvdW5kcyA9IHsgSW5s aW5lTGF5b3V0VW5pdChyb3VuZFRvSW50KGxheW91dEJvdW5kcy5hc2NlbnQpKSwgSW5saW5lTGF5 b3V0VW5pdChyb3VuZFRvSW50KGxheW91dEJvdW5kcy5kZXNjZW50KSkgfTsgfQorICAgIHZvaWQg c2V0SW5saW5lQm94Q29udGVudE9mZnNldEZvckxlYWRpbmdUcmltKElubGluZUxheW91dFVuaXQg b2Zmc2V0KSB7IG1faW5saW5lQm94Q29udGVudE9mZnNldEZvckxlYWRpbmdUcmltID0gb2Zmc2V0 OyB9CiAKICAgICB2b2lkIHNldElzRmlyc3RCb3goKSB7IG1faXNGaXJzdFdpdGhpbkxheW91dEJv eCA9IHRydWU7IH0KICAgICB2b2lkIHNldElzTGFzdEJveCgpIHsgbV9pc0xhc3RXaXRoaW5MYXlv dXRCb3ggPSB0cnVlOyB9CkBAIC0xNDEsNiArMTQ1LDcgQEAgcHJpdmF0ZToKICAgICAvLyBUaGlz IGlzIHRoZSBjb21iaW5hdGlvbiBvZiBtYXJnaW4gYW5kIGJvcmRlciBib3hlcy4gSW5saW5lIGxl dmVsIGJveGVzIGFyZSB2ZXJ0aWNhbGx5IGFsaWduZWQgdXNpbmcgdGhlaXIgbWFyZ2luIGJveGVz LgogICAgIElubGluZVJlY3QgbV9sb2dpY2FsUmVjdDsKICAgICBzdGQ6Om9wdGlvbmFsPExheW91 dEJvdW5kcz4gbV9sYXlvdXRCb3VuZHMgeyB9OworICAgIElubGluZUxheW91dFVuaXQgbV9pbmxp bmVCb3hDb250ZW50T2Zmc2V0Rm9yTGVhZGluZ1RyaW0geyAwLmYgfTsKICAgICBJbmxpbmVMYXlv dXRVbml0IG1fYXNjZW50IHsgMCB9OwogICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5p dD4gbV9kZXNjZW50OwogICAgIGJvb2wgbV9oYXNDb250ZW50IHsgZmFsc2UgfTsKQEAgLTE1NCw2 ICsxNTksNyBAQCBwcml2YXRlOgogICAgICAgICBjb25zdCBGb250TWV0cmljcyYgcHJpbWFyeUZv bnRNZXRyaWNzOwogICAgICAgICBjb25zdCBMZW5ndGgmIGxpbmVIZWlnaHQ7CiAgICAgICAgIFRl eHRFZGdlIHRleHRFZGdlOworICAgICAgICBMZWFkaW5nVHJpbSBsZWFkaW5nVHJpbTsKICAgICAg ICAgV1RGOjpPcHRpb25TZXQ8TGluZUJveENvbnRhaW4+IGxpbmVCb3hDb250YWluOwogICAgICAg ICBJbmxpbmVMYXlvdXRVbml0IHByaW1hcnlGb250U2l6ZSB7IDAgfTsKICAgICAgICAgVmVydGlj YWxBbGlnbm1lbnQgdmVydGljYWxBbGlnbm1lbnQgeyB9OwpAQCAtMTc0LDcgKzE4MCw3IEBAIGlu bGluZSBJbmxpbmVMZXZlbEJveDo6SW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gs IGNvbnN0IFJlbmRlclN0eWxlJiBzCiAgICAgLCBtX2lzRmlyc3RXaXRoaW5MYXlvdXRCb3gocG9z aXRpb25XaXRoaW5MYXlvdXRCb3guY29udGFpbnMoUG9zaXRpb25XaXRoaW5MYXlvdXRCb3g6OkZp cnN0KSkKICAgICAsIG1faXNMYXN0V2l0aGluTGF5b3V0Qm94KHBvc2l0aW9uV2l0aGluTGF5b3V0 Qm94LmNvbnRhaW5zKFBvc2l0aW9uV2l0aGluTGF5b3V0Qm94OjpMYXN0KSkKICAgICAsIG1fdHlw ZSh0eXBlKQotICAgICwgbV9zdHlsZSh7IHN0eWxlLmZvbnRDYXNjYWRlKCkubWV0cmljc09mUHJp bWFyeUZvbnQoKSwgc3R5bGUubGluZUhlaWdodCgpLCBzdHlsZS50ZXh0RWRnZSgpLCBzdHlsZS5s aW5lQm94Q29udGFpbigpLCBJbmxpbmVMYXlvdXRVbml0KHN0eWxlLmZvbnRDYXNjYWRlKCkuZm9u dERlc2NyaXB0aW9uKCkuY29tcHV0ZWRQaXhlbFNpemUoKSksIHsgfSB9KQorICAgICwgbV9zdHls ZSh7IHN0eWxlLmZvbnRDYXNjYWRlKCkubWV0cmljc09mUHJpbWFyeUZvbnQoKSwgc3R5bGUubGlu ZUhlaWdodCgpLCBzdHlsZS50ZXh0RWRnZSgpLCBzdHlsZS5sZWFkaW5nVHJpbSgpLCBzdHlsZS5s aW5lQm94Q29udGFpbigpLCBJbmxpbmVMYXlvdXRVbml0KHN0eWxlLmZvbnRDYXNjYWRlKCkuZm9u dERlc2NyaXB0aW9uKCkuY29tcHV0ZWRQaXhlbFNpemUoKSksIHsgfSB9KQogewogICAgIG1fc3R5 bGUudmVydGljYWxBbGlnbm1lbnQudHlwZSA9IHN0eWxlLnZlcnRpY2FsQWxpZ24oKTsKICAgICBp ZiAobV9zdHlsZS52ZXJ0aWNhbEFsaWdubWVudC50eXBlID09IFZlcnRpY2FsQWxpZ246Okxlbmd0 aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAKaW5kZXggMzcyZmUzNjIyZThhLi43 Mzg3MjI2ZDBiMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guY3BwCkBAIC01Mywx MyArNTMsMTMgQEAgSW5saW5lUmVjdCBMaW5lQm94Ojpsb2dpY2FsUmVjdEZvclRleHRSdW4oY29u c3QgTGluZTo6UnVuJiBydW4pIGNvbnN0CiAgICAgQVNTRVJUKHJ1bi5pc1RleHQoKSB8fCBydW4u aXNTb2Z0TGluZUJyZWFrKCkpOwogICAgIGF1dG8qIHBhcmVudElubGluZUJveCA9ICZpbmxpbmVM ZXZlbEJveEZvckxheW91dEJveChydW4ubGF5b3V0Qm94KCkucGFyZW50KCkpOwogICAgIEFTU0VS VChwYXJlbnRJbmxpbmVCb3gtPmlzSW5saW5lQm94KCkpOwotICAgIGF1dG8gcnVubG9naWNhbFRv cCA9IHBhcmVudElubGluZUJveC0+bG9naWNhbFRvcCgpOworICAgIGF1dG8gcnVubG9naWNhbFRv cCA9IHBhcmVudElubGluZUJveC0+bG9naWNhbFRvcCgpIC0gcGFyZW50SW5saW5lQm94LT5pbmxp bmVCb3hDb250ZW50T2Zmc2V0Rm9yTGVhZGluZ1RyaW0oKTsKICAgICBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxIZWlnaHQgPSBwYXJlbnRJbmxpbmVCb3gtPnByaW1hcnltZXRyaWNzT2ZQcmltYXJ5 Rm9udCgpLmhlaWdodCgpOwogCiAgICAgd2hpbGUgKHBhcmVudElubGluZUJveCAhPSAmbV9yb290 SW5saW5lQm94ICYmICFwYXJlbnRJbmxpbmVCb3gtPmhhc0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVu dCgpKSB7CiAgICAgICAgIHBhcmVudElubGluZUJveCA9ICZpbmxpbmVMZXZlbEJveEZvckxheW91 dEJveChwYXJlbnRJbmxpbmVCb3gtPmxheW91dEJveCgpLnBhcmVudCgpKTsKICAgICAgICAgQVNT RVJUKHBhcmVudElubGluZUJveC0+aXNJbmxpbmVCb3goKSk7Ci0gICAgICAgIHJ1bmxvZ2ljYWxU b3AgKz0gcGFyZW50SW5saW5lQm94LT5sb2dpY2FsVG9wKCk7CisgICAgICAgIHJ1bmxvZ2ljYWxU b3AgKz0gKHBhcmVudElubGluZUJveC0+bG9naWNhbFRvcCgpIC0gcGFyZW50SW5saW5lQm94LT5p bmxpbmVCb3hDb250ZW50T2Zmc2V0Rm9yTGVhZGluZ1RyaW0oKSk7CiAgICAgfQogICAgIHJldHVy biB7IHJ1bmxvZ2ljYWxUb3AsIHJ1bi5sb2dpY2FsTGVmdCgpLCBydW4ubG9naWNhbFdpZHRoKCks IGxvZ2ljYWxIZWlnaHQgfTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hC dWlsZGVyLmNwcAppbmRleCBkNTMzNzY2YWMwZmYuLmQzNDNjYTVhZTI2ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJveEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAtMjk0LDYgKzI5NCw1OSBA QCB2b2lkIExpbmVCb3hCdWlsZGVyOjpzZXRMYXlvdXRCb3VuZHNGb3JJbmxpbmVCb3goSW5saW5l TGV2ZWxCb3gmIGlubGluZUJveCwgRm9udAogICAgIGlubGluZUJveC5zZXRMYXlvdXRCb3VuZHMo eyBmbG9vcmYoYXNjZW50KSwgY2VpbGYoZGVzY2VudCkgfSk7CiB9CiAKK0FzY2VudEFuZERlc2Nl bnQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVkQXNlbnRBbmREZXNjZW50Rm9ySW5saW5lQm94KElu bGluZUxldmVsQm94JiBpbmxpbmVCb3gsIEZvbnRCYXNlbGluZSBmb250QmFzZWxpbmUpIGNvbnN0 Cit7CisgICAgQVNTRVJUKGlubGluZUJveC5pc0lubGluZUJveCgpKTsKKyAgICBpZiAoaW5saW5l Qm94LmlzUm9vdElubGluZUJveCgpKQorICAgICAgICByZXR1cm4gcHJpbWFyeUZvbnRNZXRyaWNz Rm9ySW5saW5lQm94KGlubGluZUJveCwgZm9udEJhc2VsaW5lKTsKKworICAgIGF1dG8mIGZvbnRN ZXRyaWNzID0gaW5saW5lQm94LnByaW1hcnltZXRyaWNzT2ZQcmltYXJ5Rm9udCgpOworICAgIGF1 dG8gbGVhZGluZ1RyaW0gPSBpbmxpbmVCb3gubGVhZGluZ1RyaW0oKTsKKyAgICBpZiAobGVhZGlu Z1RyaW0gPT0gTGVhZGluZ1RyaW06Ok5vcm1hbCkKKyAgICAgICAgcmV0dXJuIHByaW1hcnlGb250 TWV0cmljc0ZvcklubGluZUJveChpbmxpbmVCb3gsIGZvbnRCYXNlbGluZSk7CisgICAgYXV0byBh c2NlbnQgPSBbJl0oKSAtPiBJbmxpbmVMYXlvdXRVbml0IHsKKyAgICAgICAgaWYgKGxlYWRpbmdU cmltID09IExlYWRpbmdUcmltOjpFbmQpCisgICAgICAgICAgICByZXR1cm4gZm9udE1ldHJpY3Mu YXNjZW50KGZvbnRCYXNlbGluZSk7CisKKyAgICAgICAgc3dpdGNoIChpbmxpbmVCb3gudGV4dEVk Z2UoKS5vdmVyKSB7CisgICAgICAgIGNhc2UgVGV4dEVkZ2VUeXBlOjpMZWFkaW5nOgorICAgICAg ICBjYXNlIFRleHRFZGdlVHlwZTo6VGV4dDoKKyAgICAgICAgICAgIHJldHVybiBmb250TWV0cmlj cy5hc2NlbnQoZm9udEJhc2VsaW5lKTsKKyAgICAgICAgY2FzZSBUZXh0RWRnZVR5cGU6OkNhcEhl aWdodDoKKyAgICAgICAgICAgIHJldHVybiBmb250TWV0cmljcy5mbG9hdENhcEhlaWdodCgpOwor ICAgICAgICBjYXNlIFRleHRFZGdlVHlwZTo6RXhIZWlnaHQ6CisgICAgICAgICAgICByZXR1cm4g Zm9udE1ldHJpY3MueEhlaWdodCgpOworICAgICAgICBjYXNlIFRleHRFZGdlVHlwZTo6Q0pLSWRl b2dyYXBoaWM6CisgICAgICAgIGNhc2UgVGV4dEVkZ2VUeXBlOjpDSktJZGVvZ3JhcGhpY0luazoK KyAgICAgICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7CisgICAgICAgICAgICBy ZXR1cm4gZm9udE1ldHJpY3MuYXNjZW50KGZvbnRCYXNlbGluZSk7CisgICAgICAgIGRlZmF1bHQ6 CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgIHJldHVybiBm b250TWV0cmljcy5hc2NlbnQoZm9udEJhc2VsaW5lKTsKKyAgICAgICAgfQorICAgIH07CisgICAg YXV0byBkZXNjZW50ID0gWyZdKCkgLT4gSW5saW5lTGF5b3V0VW5pdCB7CisgICAgICAgIGlmIChs ZWFkaW5nVHJpbSA9PSBMZWFkaW5nVHJpbTo6U3RhcnQpCisgICAgICAgICAgICByZXR1cm4gZm9u dE1ldHJpY3MuZGVzY2VudChmb250QmFzZWxpbmUpOworCisgICAgICAgIHN3aXRjaCAoaW5saW5l Qm94LnRleHRFZGdlKCkudW5kZXIpIHsKKyAgICAgICAgY2FzZSBUZXh0RWRnZVR5cGU6OkxlYWRp bmc6CisgICAgICAgIGNhc2UgVGV4dEVkZ2VUeXBlOjpUZXh0OgorICAgICAgICAgICAgcmV0dXJu IGZvbnRNZXRyaWNzLmRlc2NlbnQoZm9udEJhc2VsaW5lKTsKKyAgICAgICAgY2FzZSBUZXh0RWRn ZVR5cGU6OkFscGhhYmV0aWM6CisgICAgICAgICAgICByZXR1cm4gMC5mOworICAgICAgICBjYXNl IFRleHRFZGdlVHlwZTo6Q0pLSWRlb2dyYXBoaWM6CisgICAgICAgIGNhc2UgVGV4dEVkZ2VUeXBl OjpDSktJZGVvZ3JhcGhpY0luazoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURf WUVUKCk7CisgICAgICAgICAgICByZXR1cm4gZm9udE1ldHJpY3MuZGVzY2VudChmb250QmFzZWxp bmUpOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgICAgICAgICByZXR1cm4gZm9udE1ldHJpY3MuZGVzY2VudChmb250QmFzZWxpbmUpOwor ICAgICAgICB9CisgICAgfTsKKyAgICByZXR1cm4geyBhc2NlbnQoKSwgZGVzY2VudCgpIH07Cit9 CisKIHZvaWQgTGluZUJveEJ1aWxkZXI6OnNldFZlcnRpY2FsUHJvcGVydGllc0ZvcklubGluZUxl dmVsQm94KGNvbnN0IExpbmVCb3gmIGxpbmVCb3gsIElubGluZUxldmVsQm94JiBpbmxpbmVMZXZl bEJveCkgY29uc3QKIHsKICAgICBhdXRvIHNldEFzY2VudEFuZERlc2NlbnQgPSBbJl0gKGF1dG8g YXNjZW50QW5kRGVzY2VudCkgewpAQCAtMzA0LDkgKzM1NywxMyBAQCB2b2lkIExpbmVCb3hCdWls ZGVyOjpzZXRWZXJ0aWNhbFByb3BlcnRpZXNGb3JJbmxpbmVMZXZlbEJveChjb25zdCBMaW5lQm94 JiBsaW5lQgogCiAgICAgaWYgKGlubGluZUxldmVsQm94LmlzSW5saW5lQm94KCkpIHsKICAgICAg ICAgc2V0TGF5b3V0Qm91bmRzRm9ySW5saW5lQm94KGlubGluZUxldmVsQm94LCBsaW5lQm94LmJh c2VsaW5lVHlwZSgpKTsKLSAgICAgICAgYXV0byBhc2NlbnRBbmREZXNjZW50ID0gcHJpbWFyeUZv bnRNZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUxldmVsQm94LCBsaW5lQm94LmJhc2VsaW5lVHlw ZSgpKTsKKyAgICAgICAgYXV0byBhc2NlbnRBbmREZXNjZW50ID0gY29tcHV0ZWRBc2VudEFuZERl c2NlbnRGb3JJbmxpbmVCb3goaW5saW5lTGV2ZWxCb3gsIGxpbmVCb3guYmFzZWxpbmVUeXBlKCkp OwogICAgICAgICBzZXRBc2NlbnRBbmREZXNjZW50KGFzY2VudEFuZERlc2NlbnQpOwogICAgICAg ICBpbmxpbmVMZXZlbEJveC5zZXRMb2dpY2FsSGVpZ2h0KGFzY2VudEFuZERlc2NlbnQuaGVpZ2h0 KCkpOworCisgICAgICAgIC8vIFdpdGggbGVhZGluZy10cmltLCB0aGUgaW5saW5lIGJveCB0b3Ag aXMgbm90IGFsd2F5cyB3aGVyZSB0aGUgY29udGVudCBzdGFydHMuCisgICAgICAgIGF1dG8gZm9u dE1ldHJpY0FzY2VudCA9IHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChpbmxpbmVMZXZl bEJveCwgbGluZUJveC5iYXNlbGluZVR5cGUoKSkuYXNjZW50OworICAgICAgICBpbmxpbmVMZXZl bEJveC5zZXRJbmxpbmVCb3hDb250ZW50T2Zmc2V0Rm9yTGVhZGluZ1RyaW0oZm9udE1ldHJpY0Fz Y2VudCAtIGFzY2VudEFuZERlc2NlbnQuYXNjZW50KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K ICAgICBpZiAoaW5saW5lTGV2ZWxCb3guaXNMaW5lQnJlYWtCb3goKSkgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJveEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKaW5kZXggYmJkZGZkODcwNDM2Li43YzEwZDM4 ZTRhODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaApAQCAt MzUsNiArMzUsNyBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIGNsYXNzIEJveDsKIGNsYXNzIEVsZW1l bnRCb3g7CiBjbGFzcyBMYXlvdXRTdGF0ZTsKK3N0cnVjdCBBc2NlbnRBbmREZXNjZW50OwogCiBj bGFzcyBMaW5lQm94QnVpbGRlciB7CiBwdWJsaWM6CkBAIC00NSw2ICs0Niw3IEBAIHB1YmxpYzoK IHByaXZhdGU6CiAgICAgdm9pZCBzZXRWZXJ0aWNhbFByb3BlcnRpZXNGb3JJbmxpbmVMZXZlbEJv eChjb25zdCBMaW5lQm94JiwgSW5saW5lTGV2ZWxCb3gmKSBjb25zdDsKICAgICB2b2lkIHNldExh eW91dEJvdW5kc0ZvcklubGluZUJveChJbmxpbmVMZXZlbEJveCYsIEZvbnRCYXNlbGluZSkgY29u c3Q7CisgICAgQXNjZW50QW5kRGVzY2VudCBjb21wdXRlZEFzZW50QW5kRGVzY2VudEZvcklubGlu ZUJveChJbmxpbmVMZXZlbEJveCYsIEZvbnRCYXNlbGluZSkgY29uc3Q7CiAgICAgdm9pZCBhZGp1 c3RJbmxpbmVCb3hIZWlnaHRzRm9yTGluZUJveENvbnRhaW5JZkFwcGxpY2FibGUoY29uc3QgTGlu ZUJ1aWxkZXI6OkxpbmVDb250ZW50JiwgTGluZUJveCYsIHNpemVfdCBsaW5lSW5kZXgpOwogICAg IElubGluZUxldmVsQm94OjpMYXlvdXRCb3VuZHMgYWRqdXN0ZWRMYXlvdXRCb3VuZHNXaXRoRmFs bGJhY2tGb250cyhJbmxpbmVMZXZlbEJveCYsIGNvbnN0IFRleHRVdGlsOjpGYWxsYmFja0ZvbnRM aXN0JiBmYWxsYmFja0ZvbnRzRm9yQ29udGVudCwgRm9udEJhc2VsaW5lKSBjb25zdDsKICAgICBU ZXh0VXRpbDo6RmFsbGJhY2tGb250TGlzdCBjb2xsZWN0RmFsbGJhY2tGb250cyhjb25zdCBJbmxp bmVMZXZlbEJveCYgcGFyZW50SW5saW5lQm94LCBjb25zdCBMaW5lOjpSdW4mLCBjb25zdCBSZW5k ZXJTdHlsZSYpOwo= 463880 2022-12-03 15:55:20 -0800 2022-12-03 16:36:36 -0800 [fast-cq]Patch bug-248644-20221203155519.patch text/plain 11734 zalan RnJvbSA1MWU2YTliNTM1OGRhNjkyMzFhMmQwNzcwM2E3MjA1ZGUxMDFjMjUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMyBEZWMgMjAyMiAxNTo1NDowNyAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtsZWFkaW5n LXRyaW1dW0lGQ10gQWRkIHN1cHBvcnQgZm9yIGxlYWRpbmctdHJpbSBvbiBub24tcm9vdAogaW5s aW5lIGJveGVzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDg2NDQK ClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKVGhpcyBwYXRjaCBhZGRzIGluaXRpYWwgc3Vw cG9ydCBmb3IgbGVhZGluZy10cmltIG9uIG5vbi1yb290IGlubGluZSBib3hlcy4KImxlYWRpbmct dHJpbSIgY29uc3VsdHMgInRleHQtZWRnZSIgYW5kIHRyaW1zIHRoZSBvdmVyL3VuZGVyIHNpZGVz IGFjY29yZGluZ2x5LgoKVHJpbW1pbmcgaGVyZSBtZWFucyB0aGF0IHRoZSBjb250ZW50IGJveCBv ZiB0aGUgaW5saW5lIGJveCBzaHJpbmtzIHRvIG1hdGNoIHdoYXQgInRleHQtZWRnZSIgc2F5cy4K SXQgYWxzbyBtZWFucyB0aGF0IG5vdyB0aGUgY29udGVudCBsb2dpY2FsIHRvcCBpbnNpZGUgdGhl IGlubGluZSBib3ggZG9lcyBub3QgbmVjZXNzYXJpbHkgbWF0Y2ggdGhlIGlubGluZSBib3gncyBs b2dpY2FsIHRvcC4gZS5nLiB3aGVuIHRleHQtZWRnZSBzYXlzICJleCIgYW5kIGxlYWRpbmctdHJp bSBzYXlzICJzdGFydCIsIHRoZSAib3ZlciBleCIgcGFydCBvZiB0aGUgdGV4dCBjb250ZW50IHN0 YXJ0cyBvdmVyZmxvd2luZyB0aGUgaW5saW5lIGJveCdzIGNvbnRlbnQgYm94LCBvciBpbiBvdGhl ciB3b3JkcyB0aGUgdGV4dCBjb250ZW50J3MgdG9wIHBvc2l0aW9uIGlzIGFib3ZlIHRoZSBjb250 YWluaW5nIGlubGluZSBib3gncyB0b3AuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxldmVsQm94Lmg6CihXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUxldmVsQm94OjpsZWFkaW5nVHJpbSBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUxldmVsQm94OjppbmxpbmVCb3hDb250ZW50T2Zmc2V0Rm9yTGVhZGluZ1RyaW0gY29uc3QpOgoo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVMZXZlbEJveDo6c2V0SW5saW5lQm94Q29udGVudE9mZnNl dEZvckxlYWRpbmdUcmltKToKKFdlYkNvcmU6OkxheW91dDo6bV9zdHlsZSk6CiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHA6 CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1biBjb25zdCk6 CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJveEJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29t cHV0ZWRBc2VudEFuZERlc2NlbnRGb3JJbmxpbmVCb3ggY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0 OjpMaW5lQm94QnVpbGRlcjo6c2V0VmVydGljYWxQcm9wZXJ0aWVzRm9ySW5saW5lTGV2ZWxCb3gg Y29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCb3hCdWlsZGVyLmg6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVMZXZlbEJveC5o ICAgICAgICAgICAgICAgICAgIHwgIDggKystCiAuLi4vaW5saW5lL0lubGluZUxpbmVCb3guY3Bw ICAgICAgICAgICAgICAgICAgfCAgNCArLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRl ci5jcHAgICAgICAgICAgIHwgNTkgKysrKysrKysrKysrKysrKysrLQogLi4uL2lubGluZS9Jbmxp bmVMaW5lQm94QnVpbGRlci5oICAgICAgICAgICAgIHwgIDIgKwogNCBmaWxlcyBjaGFuZ2VkLCA2 OSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxldmVsQm94LmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMZXZl bEJveC5oCmluZGV4IDU2ZTE0YmY5MWU3NC4uYTNiNDU2YmM0NjM5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxldmVsQm94LmgKQEAgLTc3LDcgKzc3LDEwIEBAIHB1YmxpYzoKICAgICBjb25zdCBG b250TWV0cmljcyYgcHJpbWFyeW1ldHJpY3NPZlByaW1hcnlGb250KCkgY29uc3QgeyByZXR1cm4g bV9zdHlsZS5wcmltYXJ5Rm9udE1ldHJpY3M7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0IGZvbnRT aXplKCkgY29uc3QgeyByZXR1cm4gbV9zdHlsZS5wcmltYXJ5Rm9udFNpemU7IH0KIAorICAgIC8v IEZJWE1FOiBNYXliZSBpdCdzIHRpbWUgdG8gc3ViY2xhc3MgaW5saW5lIGJveCB0eXBlcy4KICAg ICBUZXh0RWRnZSB0ZXh0RWRnZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3R5bGUudGV4dEVkZ2U7IH0K KyAgICBMZWFkaW5nVHJpbSBsZWFkaW5nVHJpbSgpIGNvbnN0IHsgcmV0dXJuIG1fc3R5bGUubGVh ZGluZ1RyaW07IH0KKyAgICBJbmxpbmVMYXlvdXRVbml0IGlubGluZUJveENvbnRlbnRPZmZzZXRG b3JMZWFkaW5nVHJpbSgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lQm94Q29udGVudE9mZnNldEZv ckxlYWRpbmdUcmltOyB9CiAKICAgICBib29sIGhhc0Fubm90YXRpb24oKSBjb25zdCB7IHJldHVy biBoYXNDb250ZW50KCkgJiYgbV9hbm5vdGF0aW9uLmhhc192YWx1ZSgpOyB9OwogICAgIHN0ZDo6 b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gYW5ub3RhdGlvbkFib3ZlKCkgY29uc3QgeyByZXR1 cm4gaGFzQW5ub3RhdGlvbigpICYmIG1fYW5ub3RhdGlvbi0+dHlwZSA9PSBBbm5vdGF0aW9uOjpU eXBlOjpBYm92ZSA/IHN0ZDo6bWFrZV9vcHRpb25hbChtX2Fubm90YXRpb24tPnNpemUpIDogc3Rk OjpudWxsb3B0OyB9CkBAIC0xMzIsNiArMTM1LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldEFz Y2VudChJbmxpbmVMYXlvdXRVbml0IGFzY2VudCkgeyBtX2FzY2VudCA9IHJvdW5kVG9JbnQoYXNj ZW50KTsgfQogICAgIHZvaWQgc2V0RGVzY2VudChJbmxpbmVMYXlvdXRVbml0IGRlc2NlbnQpIHsg bV9kZXNjZW50ID0gcm91bmRUb0ludChkZXNjZW50KTsgfQogICAgIHZvaWQgc2V0TGF5b3V0Qm91 bmRzKGNvbnN0IExheW91dEJvdW5kcyYgbGF5b3V0Qm91bmRzKSB7IG1fbGF5b3V0Qm91bmRzID0g eyBJbmxpbmVMYXlvdXRVbml0KHJvdW5kVG9JbnQobGF5b3V0Qm91bmRzLmFzY2VudCkpLCBJbmxp bmVMYXlvdXRVbml0KHJvdW5kVG9JbnQobGF5b3V0Qm91bmRzLmRlc2NlbnQpKSB9OyB9CisgICAg dm9pZCBzZXRJbmxpbmVCb3hDb250ZW50T2Zmc2V0Rm9yTGVhZGluZ1RyaW0oSW5saW5lTGF5b3V0 VW5pdCBvZmZzZXQpIHsgbV9pbmxpbmVCb3hDb250ZW50T2Zmc2V0Rm9yTGVhZGluZ1RyaW0gPSBv ZmZzZXQ7IH0KIAogICAgIHZvaWQgc2V0SXNGaXJzdEJveCgpIHsgbV9pc0ZpcnN0V2l0aGluTGF5 b3V0Qm94ID0gdHJ1ZTsgfQogICAgIHZvaWQgc2V0SXNMYXN0Qm94KCkgeyBtX2lzTGFzdFdpdGhp bkxheW91dEJveCA9IHRydWU7IH0KQEAgLTE0MSw2ICsxNDUsNyBAQCBwcml2YXRlOgogICAgIC8v IFRoaXMgaXMgdGhlIGNvbWJpbmF0aW9uIG9mIG1hcmdpbiBhbmQgYm9yZGVyIGJveGVzLiBJbmxp bmUgbGV2ZWwgYm94ZXMgYXJlIHZlcnRpY2FsbHkgYWxpZ25lZCB1c2luZyB0aGVpciBtYXJnaW4g Ym94ZXMuCiAgICAgSW5saW5lUmVjdCBtX2xvZ2ljYWxSZWN0OwogICAgIHN0ZDo6b3B0aW9uYWw8 TGF5b3V0Qm91bmRzPiBtX2xheW91dEJvdW5kcyB7IH07CisgICAgSW5saW5lTGF5b3V0VW5pdCBt X2lubGluZUJveENvbnRlbnRPZmZzZXRGb3JMZWFkaW5nVHJpbSB7IDAuZiB9OwogICAgIElubGlu ZUxheW91dFVuaXQgbV9hc2NlbnQgeyAwIH07CiAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlv dXRVbml0PiBtX2Rlc2NlbnQ7CiAgICAgYm9vbCBtX2hhc0NvbnRlbnQgeyBmYWxzZSB9OwpAQCAt MTU0LDYgKzE1OSw3IEBAIHByaXZhdGU6CiAgICAgICAgIGNvbnN0IEZvbnRNZXRyaWNzJiBwcmlt YXJ5Rm9udE1ldHJpY3M7CiAgICAgICAgIGNvbnN0IExlbmd0aCYgbGluZUhlaWdodDsKICAgICAg ICAgVGV4dEVkZ2UgdGV4dEVkZ2U7CisgICAgICAgIExlYWRpbmdUcmltIGxlYWRpbmdUcmltOwog ICAgICAgICBXVEY6Ok9wdGlvblNldDxMaW5lQm94Q29udGFpbj4gbGluZUJveENvbnRhaW47CiAg ICAgICAgIElubGluZUxheW91dFVuaXQgcHJpbWFyeUZvbnRTaXplIHsgMCB9OwogICAgICAgICBW ZXJ0aWNhbEFsaWdubWVudCB2ZXJ0aWNhbEFsaWdubWVudCB7IH07CkBAIC0xNzQsNyArMTgwLDcg QEAgaW5saW5lIElubGluZUxldmVsQm94OjpJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxheW91 dEJveCwgY29uc3QgUmVuZGVyU3R5bGUmIHMKICAgICAsIG1faXNGaXJzdFdpdGhpbkxheW91dEJv eChwb3NpdGlvbldpdGhpbkxheW91dEJveC5jb250YWlucyhQb3NpdGlvbldpdGhpbkxheW91dEJv eDo6Rmlyc3QpKQogICAgICwgbV9pc0xhc3RXaXRoaW5MYXlvdXRCb3gocG9zaXRpb25XaXRoaW5M YXlvdXRCb3guY29udGFpbnMoUG9zaXRpb25XaXRoaW5MYXlvdXRCb3g6Okxhc3QpKQogICAgICwg bV90eXBlKHR5cGUpCi0gICAgLCBtX3N0eWxlKHsgc3R5bGUuZm9udENhc2NhZGUoKS5tZXRyaWNz T2ZQcmltYXJ5Rm9udCgpLCBzdHlsZS5saW5lSGVpZ2h0KCksIHN0eWxlLnRleHRFZGdlKCksIHN0 eWxlLmxpbmVCb3hDb250YWluKCksIElubGluZUxheW91dFVuaXQoc3R5bGUuZm9udENhc2NhZGUo KS5mb250RGVzY3JpcHRpb24oKS5jb21wdXRlZFBpeGVsU2l6ZSgpKSwgeyB9IH0pCisgICAgLCBt X3N0eWxlKHsgc3R5bGUuZm9udENhc2NhZGUoKS5tZXRyaWNzT2ZQcmltYXJ5Rm9udCgpLCBzdHls ZS5saW5lSGVpZ2h0KCksIHN0eWxlLnRleHRFZGdlKCksIHN0eWxlLmxlYWRpbmdUcmltKCksIHN0 eWxlLmxpbmVCb3hDb250YWluKCksIElubGluZUxheW91dFVuaXQoc3R5bGUuZm9udENhc2NhZGUo KS5mb250RGVzY3JpcHRpb24oKS5jb21wdXRlZFBpeGVsU2l6ZSgpKSwgeyB9IH0pCiB7CiAgICAg bV9zdHlsZS52ZXJ0aWNhbEFsaWdubWVudC50eXBlID0gc3R5bGUudmVydGljYWxBbGlnbigpOwog ICAgIGlmIChtX3N0eWxlLnZlcnRpY2FsQWxpZ25tZW50LnR5cGUgPT0gVmVydGljYWxBbGlnbjo6 TGVuZ3RoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmNwcAppbmRleCAzNzJmZTM2MjJl OGEuLjczODcyMjZkMGIwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAKQEAg LTUzLDEzICs1MywxMyBAQCBJbmxpbmVSZWN0IExpbmVCb3g6OmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1 bihjb25zdCBMaW5lOjpSdW4mIHJ1bikgY29uc3QKICAgICBBU1NFUlQocnVuLmlzVGV4dCgpIHx8 IHJ1bi5pc1NvZnRMaW5lQnJlYWsoKSk7CiAgICAgYXV0byogcGFyZW50SW5saW5lQm94ID0gJmlu bGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KHJ1bi5sYXlvdXRCb3goKS5wYXJlbnQoKSk7CiAgICAg QVNTRVJUKHBhcmVudElubGluZUJveC0+aXNJbmxpbmVCb3goKSk7Ci0gICAgYXV0byBydW5sb2dp Y2FsVG9wID0gcGFyZW50SW5saW5lQm94LT5sb2dpY2FsVG9wKCk7CisgICAgYXV0byBydW5sb2dp Y2FsVG9wID0gcGFyZW50SW5saW5lQm94LT5sb2dpY2FsVG9wKCkgLSBwYXJlbnRJbmxpbmVCb3gt PmlubGluZUJveENvbnRlbnRPZmZzZXRGb3JMZWFkaW5nVHJpbSgpOwogICAgIElubGluZUxheW91 dFVuaXQgbG9naWNhbEhlaWdodCA9IHBhcmVudElubGluZUJveC0+cHJpbWFyeW1ldHJpY3NPZlBy aW1hcnlGb250KCkuaGVpZ2h0KCk7CiAKICAgICB3aGlsZSAocGFyZW50SW5saW5lQm94ICE9ICZt X3Jvb3RJbmxpbmVCb3ggJiYgIXBhcmVudElubGluZUJveC0+aGFzTGluZUJveFJlbGF0aXZlQWxp Z25tZW50KCkpIHsKICAgICAgICAgcGFyZW50SW5saW5lQm94ID0gJmlubGluZUxldmVsQm94Rm9y TGF5b3V0Qm94KHBhcmVudElubGluZUJveC0+bGF5b3V0Qm94KCkucGFyZW50KCkpOwogICAgICAg ICBBU1NFUlQocGFyZW50SW5saW5lQm94LT5pc0lubGluZUJveCgpKTsKLSAgICAgICAgcnVubG9n aWNhbFRvcCArPSBwYXJlbnRJbmxpbmVCb3gtPmxvZ2ljYWxUb3AoKTsKKyAgICAgICAgcnVubG9n aWNhbFRvcCArPSAocGFyZW50SW5saW5lQm94LT5sb2dpY2FsVG9wKCkgLSBwYXJlbnRJbmxpbmVC b3gtPmlubGluZUJveENvbnRlbnRPZmZzZXRGb3JMZWFkaW5nVHJpbSgpKTsKICAgICB9CiAgICAg cmV0dXJuIHsgcnVubG9naWNhbFRvcCwgcnVuLmxvZ2ljYWxMZWZ0KCksIHJ1bi5sb2dpY2FsV2lk dGgoKSwgbG9naWNhbEhlaWdodCB9OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJveEJ1aWxkZXIuY3BwCmluZGV4IDg1ODJhMTFkMjc5ZC4uNzQ4ZjZmZGJhMzRmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQm94QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCkBAIC0yOTQsNiArMjk0 LDU5IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OnNldExheW91dEJvdW5kc0ZvcklubGluZUJveChJ bmxpbmVMZXZlbEJveCYgaW5saW5lQm94LCBGb250CiAgICAgaW5saW5lQm94LnNldExheW91dEJv dW5kcyh7IGZsb29yZihhc2NlbnQpLCBjZWlsZihkZXNjZW50KSB9KTsKIH0KIAorQXNjZW50QW5k RGVzY2VudCBMaW5lQm94QnVpbGRlcjo6Y29tcHV0ZWRBc2VudEFuZERlc2NlbnRGb3JJbmxpbmVC b3goSW5saW5lTGV2ZWxCb3gmIGlubGluZUJveCwgRm9udEJhc2VsaW5lIGZvbnRCYXNlbGluZSkg Y29uc3QKK3sKKyAgICBBU1NFUlQoaW5saW5lQm94LmlzSW5saW5lQm94KCkpOworICAgIGlmIChp bmxpbmVCb3guaXNSb290SW5saW5lQm94KCkpCisgICAgICAgIHJldHVybiBwcmltYXJ5Rm9udE1l dHJpY3NGb3JJbmxpbmVCb3goaW5saW5lQm94LCBmb250QmFzZWxpbmUpOworCisgICAgYXV0byYg Zm9udE1ldHJpY3MgPSBpbmxpbmVCb3gucHJpbWFyeW1ldHJpY3NPZlByaW1hcnlGb250KCk7Cisg ICAgYXV0byBsZWFkaW5nVHJpbSA9IGlubGluZUJveC5sZWFkaW5nVHJpbSgpOworICAgIGlmIChs ZWFkaW5nVHJpbSA9PSBMZWFkaW5nVHJpbTo6Tm9ybWFsKQorICAgICAgICByZXR1cm4gcHJpbWFy eUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUJveCwgZm9udEJhc2VsaW5lKTsKKyAgICBh dXRvIGFzY2VudCA9IFsmXSgpIC0+IElubGluZUxheW91dFVuaXQgeworICAgICAgICBpZiAobGVh ZGluZ1RyaW0gPT0gTGVhZGluZ1RyaW06OkVuZCkKKyAgICAgICAgICAgIHJldHVybiBmb250TWV0 cmljcy5hc2NlbnQoZm9udEJhc2VsaW5lKTsKKworICAgICAgICBzd2l0Y2ggKGlubGluZUJveC50 ZXh0RWRnZSgpLm92ZXIpIHsKKyAgICAgICAgY2FzZSBUZXh0RWRnZVR5cGU6OkxlYWRpbmc6Cisg ICAgICAgIGNhc2UgVGV4dEVkZ2VUeXBlOjpUZXh0OgorICAgICAgICAgICAgcmV0dXJuIGZvbnRN ZXRyaWNzLmFzY2VudChmb250QmFzZWxpbmUpOworICAgICAgICBjYXNlIFRleHRFZGdlVHlwZTo6 Q2FwSGVpZ2h0OgorICAgICAgICAgICAgcmV0dXJuIGZvbnRNZXRyaWNzLmZsb2F0Q2FwSGVpZ2h0 KCk7CisgICAgICAgIGNhc2UgVGV4dEVkZ2VUeXBlOjpFeEhlaWdodDoKKyAgICAgICAgICAgIHJl dHVybiBmb250TWV0cmljcy54SGVpZ2h0KCk7CisgICAgICAgIGNhc2UgVGV4dEVkZ2VUeXBlOjpD SktJZGVvZ3JhcGhpYzoKKyAgICAgICAgY2FzZSBUZXh0RWRnZVR5cGU6OkNKS0lkZW9ncmFwaGlj SW5rOgorICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9ZRVQoKTsKKyAgICAgICAg ICAgIHJldHVybiBmb250TWV0cmljcy5hc2NlbnQoZm9udEJhc2VsaW5lKTsKKyAgICAgICAgZGVm YXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgcmV0 dXJuIGZvbnRNZXRyaWNzLmFzY2VudChmb250QmFzZWxpbmUpOworICAgICAgICB9CisgICAgfTsK KyAgICBhdXRvIGRlc2NlbnQgPSBbJl0oKSAtPiBJbmxpbmVMYXlvdXRVbml0IHsKKyAgICAgICAg aWYgKGxlYWRpbmdUcmltID09IExlYWRpbmdUcmltOjpTdGFydCkKKyAgICAgICAgICAgIHJldHVy biBmb250TWV0cmljcy5kZXNjZW50KGZvbnRCYXNlbGluZSk7CisKKyAgICAgICAgc3dpdGNoIChp bmxpbmVCb3gudGV4dEVkZ2UoKS51bmRlcikgeworICAgICAgICBjYXNlIFRleHRFZGdlVHlwZTo6 TGVhZGluZzoKKyAgICAgICAgY2FzZSBUZXh0RWRnZVR5cGU6OlRleHQ6CisgICAgICAgICAgICBy ZXR1cm4gZm9udE1ldHJpY3MuZGVzY2VudChmb250QmFzZWxpbmUpOworICAgICAgICBjYXNlIFRl eHRFZGdlVHlwZTo6QWxwaGFiZXRpYzoKKyAgICAgICAgICAgIHJldHVybiAwLmY7CisgICAgICAg IGNhc2UgVGV4dEVkZ2VUeXBlOjpDSktJZGVvZ3JhcGhpYzoKKyAgICAgICAgY2FzZSBUZXh0RWRn ZVR5cGU6OkNKS0lkZW9ncmFwaGljSW5rOgorICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1F TlRFRF9ZRVQoKTsKKyAgICAgICAgICAgIHJldHVybiBmb250TWV0cmljcy5kZXNjZW50KGZvbnRC YXNlbGluZSk7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKKyAgICAgICAgICAgIHJldHVybiBmb250TWV0cmljcy5kZXNjZW50KGZvbnRCYXNlbGlu ZSk7CisgICAgICAgIH0KKyAgICB9OworICAgIHJldHVybiB7IGFzY2VudCgpLCBkZXNjZW50KCkg fTsKK30KKwogdm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0VmVydGljYWxQcm9wZXJ0aWVzRm9ySW5s aW5lTGV2ZWxCb3goY29uc3QgTGluZUJveCYgbGluZUJveCwgSW5saW5lTGV2ZWxCb3gmIGlubGlu ZUxldmVsQm94KSBjb25zdAogewogICAgIGF1dG8gc2V0QXNjZW50QW5kRGVzY2VudCA9IFsmXSAo YXV0byBhc2NlbnRBbmREZXNjZW50LCBib29sIGFwcGx5TGVnYWN5Um91bmRpbmcgPSB0cnVlKSB7 CkBAIC0zMDQsOSArMzU3LDEzIEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OnNldFZlcnRpY2FsUHJv cGVydGllc0ZvcklubGluZUxldmVsQm94KGNvbnN0IExpbmVCb3gmIGxpbmVCCiAKICAgICBpZiAo aW5saW5lTGV2ZWxCb3guaXNJbmxpbmVCb3goKSkgewogICAgICAgICBzZXRMYXlvdXRCb3VuZHNG b3JJbmxpbmVCb3goaW5saW5lTGV2ZWxCb3gsIGxpbmVCb3guYmFzZWxpbmVUeXBlKCkpOwotICAg ICAgICBhdXRvIGFzY2VudEFuZERlc2NlbnQgPSBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJbmxpbmVC b3goaW5saW5lTGV2ZWxCb3gsIGxpbmVCb3guYmFzZWxpbmVUeXBlKCkpOworICAgICAgICBhdXRv IGFzY2VudEFuZERlc2NlbnQgPSBjb21wdXRlZEFzZW50QW5kRGVzY2VudEZvcklubGluZUJveChp bmxpbmVMZXZlbEJveCwgbGluZUJveC5iYXNlbGluZVR5cGUoKSk7CiAgICAgICAgIHNldEFzY2Vu dEFuZERlc2NlbnQoYXNjZW50QW5kRGVzY2VudCk7CiAgICAgICAgIGlubGluZUxldmVsQm94LnNl dExvZ2ljYWxIZWlnaHQoYXNjZW50QW5kRGVzY2VudC5oZWlnaHQoKSk7CisKKyAgICAgICAgLy8g V2l0aCBsZWFkaW5nLXRyaW0sIHRoZSBpbmxpbmUgYm94IHRvcCBpcyBub3QgYWx3YXlzIHdoZXJl IHRoZSBjb250ZW50IHN0YXJ0cy4KKyAgICAgICAgYXV0byBmb250TWV0cmljQXNjZW50ID0gcHJp bWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUxldmVsQm94LCBsaW5lQm94LmJhc2Vs aW5lVHlwZSgpKS5hc2NlbnQ7CisgICAgICAgIGlubGluZUxldmVsQm94LnNldElubGluZUJveENv bnRlbnRPZmZzZXRGb3JMZWFkaW5nVHJpbShmb250TWV0cmljQXNjZW50IC0gYXNjZW50QW5kRGVz Y2VudC5hc2NlbnQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChpbmxpbmVMZXZl bEJveC5pc0xpbmVCcmVha0JveCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJv eEJ1aWxkZXIuaAppbmRleCBiYmRkZmQ4NzA0MzYuLjdjMTBkMzhlNGE4MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJveEJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oCkBAIC0zNSw2ICszNSw3IEBAIG5hbWVz cGFjZSBMYXlvdXQgewogY2xhc3MgQm94OwogY2xhc3MgRWxlbWVudEJveDsKIGNsYXNzIExheW91 dFN0YXRlOworc3RydWN0IEFzY2VudEFuZERlc2NlbnQ7CiAKIGNsYXNzIExpbmVCb3hCdWlsZGVy IHsKIHB1YmxpYzoKQEAgLTQ1LDYgKzQ2LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lk IHNldFZlcnRpY2FsUHJvcGVydGllc0ZvcklubGluZUxldmVsQm94KGNvbnN0IExpbmVCb3gmLCBJ bmxpbmVMZXZlbEJveCYpIGNvbnN0OwogICAgIHZvaWQgc2V0TGF5b3V0Qm91bmRzRm9ySW5saW5l Qm94KElubGluZUxldmVsQm94JiwgRm9udEJhc2VsaW5lKSBjb25zdDsKKyAgICBBc2NlbnRBbmRE ZXNjZW50IGNvbXB1dGVkQXNlbnRBbmREZXNjZW50Rm9ySW5saW5lQm94KElubGluZUxldmVsQm94 JiwgRm9udEJhc2VsaW5lKSBjb25zdDsKICAgICB2b2lkIGFkanVzdElubGluZUJveEhlaWdodHNG b3JMaW5lQm94Q29udGFpbklmQXBwbGljYWJsZShjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRl bnQmLCBMaW5lQm94Jiwgc2l6ZV90IGxpbmVJbmRleCk7CiAgICAgSW5saW5lTGV2ZWxCb3g6Okxh eW91dEJvdW5kcyBhZGp1c3RlZExheW91dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzKElubGluZUxl dmVsQm94JiwgY29uc3QgVGV4dFV0aWw6OkZhbGxiYWNrRm9udExpc3QmIGZhbGxiYWNrRm9udHNG b3JDb250ZW50LCBGb250QmFzZWxpbmUpIGNvbnN0OwogICAgIFRleHRVdGlsOjpGYWxsYmFja0Zv bnRMaXN0IGNvbGxlY3RGYWxsYmFja0ZvbnRzKGNvbnN0IElubGluZUxldmVsQm94JiBwYXJlbnRJ bmxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1biYsIGNvbnN0IFJlbmRlclN0eWxlJik7Cg==