262003 2023-09-23 12:39:12 -0700 [IFC][Ruby] Add inter-character annotation placement support 2023-09-24 14:35:20 -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 1979579 0 zalan 2023-09-23 12:39:12 -0700 ssia 1979580 1 467836 zalan 2023-09-23 12:43:47 -0700 Created attachment 467836 Patch 1979641 2 467841 zalan 2023-09-24 09:12:00 -0700 Created attachment 467841 [fast-cq]Patch 1979671 3 ews-feeder 2023-09-24 14:34:30 -0700 Committed 268374@main (4e5391cc5952): <https://commits.webkit.org/268374@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467841. 1979672 4 webkit-bug-importer 2023-09-24 14:35:20 -0700 <rdar://problem/115964757> 467836 2023-09-23 12:43:47 -0700 2023-09-24 09:11:56 -0700 Patch bug-262003-20230923124347.patch text/plain 6491 zalan RnJvbSA1MzVmMDJjMDI0YjNkODEzOWZhYjYxNWQyZmY5ZTQ3ZjI1MmM5N2RmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMjMgU2VwIDIwMjMgMTI6Mzk6MjAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBBZGQgaW50ZXItY2hhcmFjdGVyIGFubm90YXRpb24gcGxhY2VtZW50IHN1cHBvcnQKIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjIwMDMKClJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgoKIkVhY2ggcnVieSBhbm5vdGF0aW9uIGlzIHBsYWNlZCBpbW1lZGlh dGVseSB0byB0aGUgcmlnaHQgb2YgdGhlIHJlbGV2YW50IHJ1YnkgYmFzZSIKaHR0cHM6Ly9kcmFm dHMuY3Nzd2cub3JnL2Nzcy1ydWJ5LyNpbnRlci1jaGFyYWN0ZXItbGF5b3V0CgoqIExheW91dFRl c3RzL2Zhc3QvcnVieS9iYXNlLXNob3J0ZXItdGhhbi10ZXh0Lmh0bWw6CiogU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIu Y3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6c2V0TGF5b3V0Qm91bmRzRm9y SW5saW5lQm94IGNvbnN0KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlv dXQ6OlJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6YW5ub3RhdGlvblBvc2l0aW9uKToKKFdlYkNvcmU6 OkxheW91dDo6UnVieUZvcm1hdHRpbmdDb250ZXh0Ojphbm5vdGF0aW9uVmVydGljYWxFeHRlbnQp OgooV2ViQ29yZTo6TGF5b3V0OjpSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6Om92ZXJoYW5nRm9yQW5u b3RhdGlvbkJlZm9yZSk6CihXZWJDb3JlOjpMYXlvdXQ6OlJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6 b3ZlcmhhbmdGb3JBbm5vdGF0aW9uQWZ0ZXIpOgooV2ViQ29yZTo6TGF5b3V0OjpSdWJ5Rm9ybWF0 dGluZ0NvbnRleHQ6OmFubm90YXRpb25FeHRlbnQpOiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250 ZXh0Lmg6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAgICAgICAgICAg ICB8ICAyICstCiAuLi4vaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAg IHwgMTggKysrKysrKysrKysrKy0tLS0tCiAuLi4vaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdD b250ZXh0LmggICAgICAgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygr KSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVp bGRlci5jcHAKaW5kZXggMWQ1M2IxMTU2OWZkLi5lN2VlOTRkMTgxYTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC b3hCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKQEAgLTIxNiw3ICsyMTYsNyBAQCB2 b2lkIExpbmVCb3hCdWlsZGVyOjpzZXRMYXlvdXRCb3VuZHNGb3JJbmxpbmVCb3goSW5saW5lTGV2 ZWxCb3gmIGlubGluZUJveCwgRm9udAogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAg IGlmIChpbmxpbmVCb3gubGF5b3V0Qm94KCkuaXNSdWJ5QmFzZSgpKSB7Ci0gICAgICAgICAgICBh dXRvIFtvdmVyLCB1bmRlcl0gPSBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQgeyBmb3JtYXR0aW5nQ29u dGV4dCgpIH0uYW5ub3RhdGlvbkV4dGVudChpbmxpbmVCb3gubGF5b3V0Qm94KCkpOworICAgICAg ICAgICAgYXV0byBbb3ZlciwgdW5kZXJdID0gUnVieUZvcm1hdHRpbmdDb250ZXh0IHsgZm9ybWF0 dGluZ0NvbnRleHQoKSB9LmFubm90YXRpb25WZXJ0aWNhbEV4dGVudChpbmxpbmVCb3gubGF5b3V0 Qm94KCkpOwogICAgICAgICAgICAgYXNjZW50ICs9IG92ZXI7CiAgICAgICAgICAgICBkZXNjZW50 ICs9IHVuZGVyOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1 YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZWY2NjVkYjc3YzU2Li43YWRiMGY3ZjJmNzkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4 dC5jcHAKQEAgLTE0NiwxOSArMTQ2LDI3IEBAIElubGluZUxheW91dFBvaW50IFJ1YnlGb3JtYXR0 aW5nQ29udGV4dDo6YW5ub3RhdGlvblBvc2l0aW9uKGNvbnN0IEJveCYgcnVieUJhc2VMCiAgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4geyB9OwogICAgIH0KKyAg ICBhdXRvIGFubm90YXRpb25Qb3NpdGlvbiA9IGFubm90YXRpb25Cb3gtPnN0eWxlKCkucnVieVBv c2l0aW9uKCk7CisgICAgaWYgKGFubm90YXRpb25Qb3NpdGlvbiA9PSBSdWJ5UG9zaXRpb246Oklu dGVyQ2hhcmFjdGVyKSB7CisgICAgICAgIGF1dG8gcnVieUJhc2VNYXJnaW5Cb3ggPSBCb3hHZW9t ZXRyeTo6bWFyZ2luQm94UmVjdChwYXJlbnRGb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9y Qm94KHJ1YnlCYXNlTGF5b3V0Qm94KSk7CisgICAgICAgIHJldHVybiB7IHJ1YnlCYXNlTWFyZ2lu Qm94LnJpZ2h0KCksIHsgfSB9OworICAgIH0KICAgICBhdXRvIGFubm90YXRpb25NYXJnaW5Cb3hI ZWlnaHQgPSBJbmxpbmVMYXlvdXRVbml0IHsgcGFyZW50Rm9ybWF0dGluZ0NvbnRleHQoKS5nZW9t ZXRyeUZvckJveCgqYW5ub3RhdGlvbkJveCkubWFyZ2luQm94SGVpZ2h0KCkgfTsKLSAgICBpZiAo YW5ub3RhdGlvbkJveC0+c3R5bGUoKS5ydWJ5UG9zaXRpb24oKSA9PSBSdWJ5UG9zaXRpb246OkJl Zm9yZSkKKyAgICBpZiAoYW5ub3RhdGlvblBvc2l0aW9uID09IFJ1YnlQb3NpdGlvbjo6QmVmb3Jl KQogICAgICAgICByZXR1cm4geyB7IH0sIC1hbm5vdGF0aW9uTWFyZ2luQm94SGVpZ2h0IH07CiAg ICAgcmV0dXJuIHsgeyB9LCBwYXJlbnRGb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94 KHJ1YnlCYXNlTGF5b3V0Qm94KS5tYXJnaW5Cb3hIZWlnaHQoKSB9OwogfQogCi1SdWJ5Rm9ybWF0 dGluZ0NvbnRleHQ6Ok92ZXJVbmRlciBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OmFubm90YXRpb25F eHRlbnQoY29uc3QgQm94JiBydWJ5QmFzZUxheW91dEJveCkKK1J1YnlGb3JtYXR0aW5nQ29udGV4 dDo6T3ZlclVuZGVyIFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6YW5ub3RhdGlvblZlcnRpY2FsRXh0 ZW50KGNvbnN0IEJveCYgcnVieUJhc2VMYXlvdXRCb3gpCiB7CiAgICAgYXV0byogYW5ub3RhdGlv bkJveCA9IHJ1YnlCYXNlTGF5b3V0Qm94LmFzc29jaWF0ZWRSdWJ5QW5ub3RhdGlvbkJveCgpOwog ICAgIGlmICghYW5ub3RhdGlvbkJveCkKICAgICAgICAgcmV0dXJuIHsgfTsKKyAgICBhdXRvIHJ1 YnlQb3NpdGlvbiA9IGFubm90YXRpb25Cb3gtPnN0eWxlKCkucnVieVBvc2l0aW9uKCk7CisgICAg aWYgKHJ1YnlQb3NpdGlvbiA9PSBSdWJ5UG9zaXRpb246OkludGVyQ2hhcmFjdGVyKQorICAgICAg ICByZXR1cm4geyB9OwogICAgIGF1dG8gYW5ub3RhdGlvbkJveExvZ2ljYWxIZWlnaHQgPSBJbmxp bmVMYXlvdXRVbml0IHsgcGFyZW50Rm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveCgq YW5ub3RhdGlvbkJveCkubWFyZ2luQm94SGVpZ2h0KCkgfTsKLSAgICBpZiAoYW5ub3RhdGlvbkJv eC0+c3R5bGUoKS5ydWJ5UG9zaXRpb24oKSA9PSBSdWJ5UG9zaXRpb246OkJlZm9yZSkKKyAgICBp ZiAocnVieVBvc2l0aW9uID09IFJ1YnlQb3NpdGlvbjo6QmVmb3JlKQogICAgICAgICByZXR1cm4g eyBhbm5vdGF0aW9uQm94TG9naWNhbEhlaWdodCwgeyB9IH07CiAgICAgcmV0dXJuIHsgeyB9LCBh bm5vdGF0aW9uQm94TG9naWNhbEhlaWdodCB9OwogfQpAQCAtMTczLDcgKzE4MSw3IEBAIElubGlu ZUxheW91dFVuaXQgUnVieUZvcm1hdHRpbmdDb250ZXh0OjpvdmVyaGFuZ0ZvckFubm90YXRpb25C ZWZvcmUoY29uc3QgQm94JiByCiAgICAgLy8gW3Jvb3QgaW5saW5lIGJveF1bcnVieSBjb250YWlu ZXJdW3J1YnkgYmFzZV1bcnVieSBhbm5vdGF0aW9uXQogICAgIEFTU0VSVChydWJ5QmFzZVN0YXJ0 SW5kZXggPj0gMik7CiAgICAgYXV0byogYW5ub3RhdGlvbkJveCA9IHJ1YnlCYXNlTGF5b3V0Qm94 LmFzc29jaWF0ZWRSdWJ5QW5ub3RhdGlvbkJveCgpOwotICAgIGlmICghYW5ub3RhdGlvbkJveCB8 fCBydWJ5QmFzZVN0YXJ0SW5kZXggPD0gMikKKyAgICBpZiAoIWFubm90YXRpb25Cb3ggfHwgYW5u b3RhdGlvbkJveC0+c3R5bGUoKS5ydWJ5UG9zaXRpb24oKSA9PSBSdWJ5UG9zaXRpb246OkludGVy Q2hhcmFjdGVyIHx8IHJ1YnlCYXNlU3RhcnRJbmRleCA8PSAyKQogICAgICAgICByZXR1cm4geyB9 OwogICAgIGF1dG8gb3ZlcmhhbmdWYWx1ZSA9IGhhbGZPZkFGdWxsV2lkdGhDaGFyYWN0ZXIoKmFu bm90YXRpb25Cb3gpOwogICAgIGF1dG8gd291bGRBbm5vdGF0aW9uT3ZlcmxhcCA9IFsmXSB7CkBA IC0xOTMsNyArMjAxLDcgQEAgSW5saW5lTGF5b3V0VW5pdCBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6 Om92ZXJoYW5nRm9yQW5ub3RhdGlvbkJlZm9yZShjb25zdCBCb3gmIHIKIElubGluZUxheW91dFVu aXQgUnVieUZvcm1hdHRpbmdDb250ZXh0OjpvdmVyaGFuZ0ZvckFubm90YXRpb25BZnRlcihjb25z dCBCb3gmIHJ1YnlCYXNlTGF5b3V0Qm94LCBzaXplX3QgcnVieUJhc2VDb250ZW50RW5kSW5kZXgs IGNvbnN0IElubGluZURpc3BsYXk6OkJveGVzJiBib3hlcykKIHsKICAgICBhdXRvKiBhbm5vdGF0 aW9uQm94ID0gcnVieUJhc2VMYXlvdXRCb3guYXNzb2NpYXRlZFJ1YnlBbm5vdGF0aW9uQm94KCk7 Ci0gICAgaWYgKCFhbm5vdGF0aW9uQm94IHx8IHJ1YnlCYXNlQ29udGVudEVuZEluZGV4ID09IGJv eGVzLnNpemUoKSAtMSkKKyAgICBpZiAoIWFubm90YXRpb25Cb3ggfHwgYW5ub3RhdGlvbkJveC0+ c3R5bGUoKS5ydWJ5UG9zaXRpb24oKSA9PSBSdWJ5UG9zaXRpb246OkludGVyQ2hhcmFjdGVyIHx8 IHJ1YnlCYXNlQ29udGVudEVuZEluZGV4ID09IGJveGVzLnNpemUoKSAtMSkKICAgICAgICAgcmV0 dXJuIHsgfTsKICAgICBhdXRvIG92ZXJoYW5nVmFsdWUgPSBoYWxmT2ZBRnVsbFdpZHRoQ2hhcmFj dGVyKCphbm5vdGF0aW9uQm94KTsKICAgICBhdXRvIHdvdWxkQW5ub3RhdGlvbk92ZXJsYXAgPSBb Jl0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0 LmgKaW5kZXggMDhkYzcwZmYwNjg5Li43MTM5OWM0OGZhOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRp bmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNDUsNyArNDUsNyBAQCBw dWJsaWM6CiAgICAgICAgIElubGluZUxheW91dFVuaXQgb3ZlciB7IDAuZiB9OwogICAgICAgICBJ bmxpbmVMYXlvdXRVbml0IHVuZGVyIHsgMC5mIH07CiAgICAgfTsKLSAgICBPdmVyVW5kZXIgYW5u b3RhdGlvbkV4dGVudChjb25zdCBCb3gmIHJ1YnlCYXNlTGF5b3V0Qm94KTsKKyAgICBPdmVyVW5k ZXIgYW5ub3RhdGlvblZlcnRpY2FsRXh0ZW50KGNvbnN0IEJveCYgcnVieUJhc2VMYXlvdXRCb3gp OwogICAgIElubGluZUxheW91dFBvaW50IGFubm90YXRpb25Qb3NpdGlvbihjb25zdCBCb3gmIHJ1 YnlCYXNlTGF5b3V0Qm94KTsKIAogICAgIElubGluZUxheW91dFVuaXQgb3ZlcmhhbmdGb3JBbm5v dGF0aW9uQmVmb3JlKGNvbnN0IEJveCYgcnVieUJhc2VMYXlvdXRCb3gsIHNpemVfdCBydWJ5QmFz ZUNvbnRlbnRTdGFydEluZGV4LCBjb25zdCBJbmxpbmVEaXNwbGF5OjpCb3hlcyYpOwo= 467841 2023-09-24 09:12:00 -0700 2023-09-24 14:34:31 -0700 [fast-cq]Patch bug-262003-20230924091159.patch text/plain 6427 zalan RnJvbSAxNDFkMzcwNzYzOWNkMDg0NDJkNTc5ODY5ZmM2ZmQ1OTJlMjI5MWY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMjQgU2VwIDIwMjMgMDk6MDk6MjQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBBZGQgaW50 ZXItY2hhcmFjdGVyIGFubm90YXRpb24gcGxhY2VtZW50IHN1cHBvcnQKIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjIwMDMKClJldmlld2VkIGJ5IEFudHRpIEtvaXZp c3RvLgoKIkVhY2ggcnVieSBhbm5vdGF0aW9uIGlzIHBsYWNlZCBpbW1lZGlhdGVseSB0byB0aGUg cmlnaHQgb2YgdGhlIHJlbGV2YW50IHJ1YnkgYmFzZSIKaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3Jn L2Nzcy1ydWJ5LyNpbnRlci1jaGFyYWN0ZXItbGF5b3V0CgoqIFNvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcDoKKFdl YkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OnNldExheW91dEJvdW5kc0ZvcklubGluZUJv eCBjb25zdCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpSdWJ5 Rm9ybWF0dGluZ0NvbnRleHQ6OmFubm90YXRpb25Qb3NpdGlvbik6CihXZWJDb3JlOjpMYXlvdXQ6 OlJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6YW5ub3RhdGlvblZlcnRpY2FsRXh0ZW50KToKKFdlYkNv cmU6OkxheW91dDo6UnVieUZvcm1hdHRpbmdDb250ZXh0OjpvdmVyaGFuZ0ZvckFubm90YXRpb25C ZWZvcmUpOgooV2ViQ29yZTo6TGF5b3V0OjpSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6Om92ZXJoYW5n Rm9yQW5ub3RhdGlvbkFmdGVyKToKKFdlYkNvcmU6OkxheW91dDo6UnVieUZvcm1hdHRpbmdDb250 ZXh0Ojphbm5vdGF0aW9uRXh0ZW50KTogRGVsZXRlZC4KKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oOgot LS0KIC4uLi9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwICAgICAgICAgICAgfCAgMiAr LQogLi4uL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgICB8IDE4ICsr KysrKysrKysrKystLS0tLQogLi4uL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5o ICAgICAgICB8ICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3Bw CmluZGV4IDFkNTNiMTE1NjlmZC4uZTdlZTk0ZDE4MWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCkBAIC0yMTYsNyArMjE2LDcgQEAgdm9pZCBMaW5l Qm94QnVpbGRlcjo6c2V0TGF5b3V0Qm91bmRzRm9ySW5saW5lQm94KElubGluZUxldmVsQm94JiBp bmxpbmVCb3gsIEZvbnQKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBpZiAoaW5s aW5lQm94LmxheW91dEJveCgpLmlzUnVieUJhc2UoKSkgewotICAgICAgICAgICAgYXV0byBbb3Zl ciwgdW5kZXJdID0gUnVieUZvcm1hdHRpbmdDb250ZXh0IHsgZm9ybWF0dGluZ0NvbnRleHQoKSB9 LmFubm90YXRpb25FeHRlbnQoaW5saW5lQm94LmxheW91dEJveCgpKTsKKyAgICAgICAgICAgIGF1 dG8gW292ZXIsIHVuZGVyXSA9IFJ1YnlGb3JtYXR0aW5nQ29udGV4dCB7IGZvcm1hdHRpbmdDb250 ZXh0KCkgfS5hbm5vdGF0aW9uVmVydGljYWxFeHRlbnQoaW5saW5lQm94LmxheW91dEJveCgpKTsK ICAgICAgICAgICAgIGFzY2VudCArPSBvdmVyOwogICAgICAgICAgICAgZGVzY2VudCArPSB1bmRl cjsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0 dGluZ0NvbnRleHQuY3BwCmluZGV4IDc4Nzg0MThhNWI2Yi4uMjE2ZjhmNjViYjA0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5 L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBA IC0xMDQsMTkgKzEwNCwyNyBAQCBJbmxpbmVMYXlvdXRQb2ludCBSdWJ5Rm9ybWF0dGluZ0NvbnRl eHQ6OmFubm90YXRpb25Qb3NpdGlvbihjb25zdCBCb3gmIHJ1YnlCYXNlTAogICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CisgICAgYXV0byBh bm5vdGF0aW9uUG9zaXRpb24gPSBhbm5vdGF0aW9uQm94LT5zdHlsZSgpLnJ1YnlQb3NpdGlvbigp OworICAgIGlmIChhbm5vdGF0aW9uUG9zaXRpb24gPT0gUnVieVBvc2l0aW9uOjpJbnRlckNoYXJh Y3RlcikgeworICAgICAgICBhdXRvIHJ1YnlCYXNlTWFyZ2luQm94ID0gQm94R2VvbWV0cnk6Om1h cmdpbkJveFJlY3QocGFyZW50Rm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChydWJ5 QmFzZUxheW91dEJveCkpOworICAgICAgICByZXR1cm4geyBydWJ5QmFzZU1hcmdpbkJveC5yaWdo dCgpLCB7IH0gfTsKKyAgICB9CiAgICAgYXV0byBhbm5vdGF0aW9uTWFyZ2luQm94SGVpZ2h0ID0g SW5saW5lTGF5b3V0VW5pdCB7IHBhcmVudEZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JC b3goKmFubm90YXRpb25Cb3gpLm1hcmdpbkJveEhlaWdodCgpIH07Ci0gICAgaWYgKGFubm90YXRp b25Cb3gtPnN0eWxlKCkucnVieVBvc2l0aW9uKCkgPT0gUnVieVBvc2l0aW9uOjpCZWZvcmUpCisg ICAgaWYgKGFubm90YXRpb25Qb3NpdGlvbiA9PSBSdWJ5UG9zaXRpb246OkJlZm9yZSkKICAgICAg ICAgcmV0dXJuIHsgeyB9LCAtYW5ub3RhdGlvbk1hcmdpbkJveEhlaWdodCB9OwogICAgIHJldHVy biB7IHsgfSwgcGFyZW50Rm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChydWJ5QmFz ZUxheW91dEJveCkubWFyZ2luQm94SGVpZ2h0KCkgfTsKIH0KIAotUnVieUZvcm1hdHRpbmdDb250 ZXh0OjpPdmVyVW5kZXIgUnVieUZvcm1hdHRpbmdDb250ZXh0Ojphbm5vdGF0aW9uRXh0ZW50KGNv bnN0IEJveCYgcnVieUJhc2VMYXlvdXRCb3gpCitSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6Ok92ZXJV bmRlciBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OmFubm90YXRpb25WZXJ0aWNhbEV4dGVudChjb25z dCBCb3gmIHJ1YnlCYXNlTGF5b3V0Qm94KQogewogICAgIGF1dG8qIGFubm90YXRpb25Cb3ggPSBy dWJ5QmFzZUxheW91dEJveC5hc3NvY2lhdGVkUnVieUFubm90YXRpb25Cb3goKTsKICAgICBpZiAo IWFubm90YXRpb25Cb3gpCiAgICAgICAgIHJldHVybiB7IH07CisgICAgYXV0byBydWJ5UG9zaXRp b24gPSBhbm5vdGF0aW9uQm94LT5zdHlsZSgpLnJ1YnlQb3NpdGlvbigpOworICAgIGlmIChydWJ5 UG9zaXRpb24gPT0gUnVieVBvc2l0aW9uOjpJbnRlckNoYXJhY3RlcikKKyAgICAgICAgcmV0dXJu IHsgfTsKICAgICBhdXRvIGFubm90YXRpb25Cb3hMb2dpY2FsSGVpZ2h0ID0gSW5saW5lTGF5b3V0 VW5pdCB7IHBhcmVudEZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKmFubm90YXRp b25Cb3gpLm1hcmdpbkJveEhlaWdodCgpIH07Ci0gICAgaWYgKGFubm90YXRpb25Cb3gtPnN0eWxl KCkucnVieVBvc2l0aW9uKCkgPT0gUnVieVBvc2l0aW9uOjpCZWZvcmUpCisgICAgaWYgKHJ1YnlQ b3NpdGlvbiA9PSBSdWJ5UG9zaXRpb246OkJlZm9yZSkKICAgICAgICAgcmV0dXJuIHsgYW5ub3Rh dGlvbkJveExvZ2ljYWxIZWlnaHQsIHsgfSB9OwogICAgIHJldHVybiB7IHsgfSwgYW5ub3RhdGlv bkJveExvZ2ljYWxIZWlnaHQgfTsKIH0KQEAgLTEzMSw3ICsxMzksNyBAQCBJbmxpbmVMYXlvdXRV bml0IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6b3ZlcmhhbmdGb3JBbm5vdGF0aW9uQmVmb3JlKGNv bnN0IEJveCYgcgogICAgIC8vIFtyb290IGlubGluZSBib3hdW3J1YnkgY29udGFpbmVyXVtydWJ5 IGJhc2VdW3J1YnkgYW5ub3RhdGlvbl0KICAgICBBU1NFUlQocnVieUJhc2VTdGFydEluZGV4ID49 IDIpOwogICAgIGF1dG8qIGFubm90YXRpb25Cb3ggPSBydWJ5QmFzZUxheW91dEJveC5hc3NvY2lh dGVkUnVieUFubm90YXRpb25Cb3goKTsKLSAgICBpZiAoIWFubm90YXRpb25Cb3ggfHwgcnVieUJh c2VTdGFydEluZGV4IDw9IDIpCisgICAgaWYgKCFhbm5vdGF0aW9uQm94IHx8IGFubm90YXRpb25C b3gtPnN0eWxlKCkucnVieVBvc2l0aW9uKCkgPT0gUnVieVBvc2l0aW9uOjpJbnRlckNoYXJhY3Rl ciB8fCBydWJ5QmFzZVN0YXJ0SW5kZXggPD0gMikKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICBh dXRvIG92ZXJoYW5nVmFsdWUgPSBoYWxmT2ZBRnVsbFdpZHRoQ2hhcmFjdGVyKCphbm5vdGF0aW9u Qm94KTsKICAgICBhdXRvIHdvdWxkQW5ub3RhdGlvbk92ZXJsYXAgPSBbJl0gewpAQCAtMTUxLDcg KzE1OSw3IEBAIElubGluZUxheW91dFVuaXQgUnVieUZvcm1hdHRpbmdDb250ZXh0OjpvdmVyaGFu Z0ZvckFubm90YXRpb25CZWZvcmUoY29uc3QgQm94JiByCiBJbmxpbmVMYXlvdXRVbml0IFJ1YnlG b3JtYXR0aW5nQ29udGV4dDo6b3ZlcmhhbmdGb3JBbm5vdGF0aW9uQWZ0ZXIoY29uc3QgQm94JiBy dWJ5QmFzZUxheW91dEJveCwgc2l6ZV90IHJ1YnlCYXNlQ29udGVudEVuZEluZGV4LCBjb25zdCBJ bmxpbmVEaXNwbGF5OjpCb3hlcyYgYm94ZXMpCiB7CiAgICAgYXV0byogYW5ub3RhdGlvbkJveCA9 IHJ1YnlCYXNlTGF5b3V0Qm94LmFzc29jaWF0ZWRSdWJ5QW5ub3RhdGlvbkJveCgpOwotICAgIGlm ICghYW5ub3RhdGlvbkJveCB8fCBydWJ5QmFzZUNvbnRlbnRFbmRJbmRleCA9PSBib3hlcy5zaXpl KCkgLSAxKQorICAgIGlmICghYW5ub3RhdGlvbkJveCB8fCBhbm5vdGF0aW9uQm94LT5zdHlsZSgp LnJ1YnlQb3NpdGlvbigpID09IFJ1YnlQb3NpdGlvbjo6SW50ZXJDaGFyYWN0ZXIgfHwgcnVieUJh c2VDb250ZW50RW5kSW5kZXggPT0gYm94ZXMuc2l6ZSgpIC0xKQogICAgICAgICByZXR1cm4geyB9 OwogICAgIGF1dG8gb3ZlcmhhbmdWYWx1ZSA9IGhhbGZPZkFGdWxsV2lkdGhDaGFyYWN0ZXIoKmFu bm90YXRpb25Cb3gpOwogICAgIGF1dG8gd291bGRBbm5vdGF0aW9uT3ZlcmxhcCA9IFsmXSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuaAppbmRl eCAwZjhkYjFkMmE0NTcuLmFhNGUwMTMyNjUzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRl eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC00MSw3ICs0MSw3IEBAIHB1YmxpYzoK ICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBvdmVyIHsgMC5mIH07CiAgICAgICAgIElubGluZUxh eW91dFVuaXQgdW5kZXIgeyAwLmYgfTsKICAgICB9OwotICAgIE92ZXJVbmRlciBhbm5vdGF0aW9u RXh0ZW50KGNvbnN0IEJveCYgcnVieUJhc2VMYXlvdXRCb3gpOworICAgIE92ZXJVbmRlciBhbm5v dGF0aW9uVmVydGljYWxFeHRlbnQoY29uc3QgQm94JiBydWJ5QmFzZUxheW91dEJveCk7CiAgICAg SW5saW5lTGF5b3V0UG9pbnQgYW5ub3RhdGlvblBvc2l0aW9uKGNvbnN0IEJveCYgcnVieUJhc2VM YXlvdXRCb3gpOwogCiAgICAgSW5saW5lTGF5b3V0VW5pdCBvdmVyaGFuZ0ZvckFubm90YXRpb25C ZWZvcmUoY29uc3QgQm94JiBydWJ5QmFzZUxheW91dEJveCwgc2l6ZV90IHJ1YnlCYXNlQ29udGVu dFN0YXJ0SW5kZXgsIGNvbnN0IElubGluZURpc3BsYXk6OkJveGVzJik7Cg==