262809 2023-10-06 14:02:53 -0700 [IFC][Ruby] Use the base inline box's end to push content off of ruby column 2023-10-07 05:38:14 -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 1983326 0 zalan 2023-10-06 14:02:53 -0700 ssia 1983339 1 468099 zalan 2023-10-06 14:50:46 -0700 Created attachment 468099 [fast-cq]Patch 1983440 2 ews-feeder 2023-10-07 05:37:12 -0700 Committed 269036@main (9709f5c78a15): <https://commits.webkit.org/269036@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468099. 1983441 3 webkit-bug-importer 2023-10-07 05:38:14 -0700 <rdar://problem/116619449> 468099 2023-10-06 14:50:46 -0700 2023-10-07 05:37:13 -0700 [fast-cq]Patch bug-262809-20231006145045.patch text/plain 10071 zalan RnJvbSAzMWM3MWQzNjk4Mjg4ZTJiN2U0MGViZGY0MGY3NDdjOWYwODc2NmY0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgNiBPY3QgMjAyMyAxNDozNjo0MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdW1J1 YnldIFVzZSB0aGUgYmFzZSBpbmxpbmUgYm94J3MgZW5kIHRvIHB1c2ggY29udGVudCBvZmYKIG9m IHJ1YnkgY29sdW1uIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjI4 MDkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKUnVucyBvbiB0aGUgbGluZSBhcmUgcGxh Y2VkIGFmdGVyIGVhY2ggb3RoZXIuIFNwYWNpbmcgYmV0d2VlbiBydW5zIGNhbiBiZSBmb3JtZWQg YnkKZWl0aGVyIGV4cGFuZGluZyBydW5zIG9yIGludHJvZHVjaW5nICJmYWtlIiBlbmQgbWFyZ2lu cyBpbi1iZXR3ZWVuLgpXaXRoICJydWJ5LWFsaWduOiBzcGFjZSBhcm91bmQiLCB0aGUgdHJhaWxp bmcgYmFzZSBydW4gbWF5IG5vdCBiZSBhZGphY2VudCB0byB0aGUgcnVuCl9hZnRlcl8gdGhlIGJh c2UgKGkuZS4gdmlzdWFsIGdhcCBiZXR3ZWVuIHRoZSBiYXNlIGFuZCB0aGUgbmVpZ2hib3Jpbmcg Y29udGVudCkKCkluc3RlYWQgb2YgZXhwYW5kaW5nIHRoZSB0cmFpbGluZyBjb250ZW50IHJ1biwg bGV0J3MgYWRkIHNwYWNpbmcgYXQgdGhlIGVuZCBzaWRlIG9mIHRoZSBiYXNlCmlubGluZSBib3gu IFRoaXMgaGVscHMgd2l0aCBvdmVybGFwIGNoZWNraW5nIHRvbyBhdCB0aGUgYW5ub3RhdGlvbiBv dmVyaGFuZ2luZyBwaGFzZSBhcwppbmZsYXRlZCBfY29udGVudF8gcnVucyBwcmV2ZW50IHVzIGZy b20gcHVsbGluZyBuZWlnaGJvcmluZyBjb250ZW50IGludG8gdGhlIHJ1YnkgY29sdW1uLgoKKiBT b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlG b3JtYXR0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OlJ1YnlGb3JtYXR0aW5nQ29u dGV4dDo6cGxhY2VSdWJ5Q29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6OlJ1YnlGb3JtYXR0aW5n Q29udGV4dDo6bGF5b3V0UnVieUJhc2VJbmxpbmVBeGlzKToKKFdlYkNvcmU6OkxheW91dDo6UnVi eUZvcm1hdHRpbmdDb250ZXh0OjphcHBseVJ1YnlBbGlnbik6CiogU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQu aDoKLS0tCiAuLi4vaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAgfCA0 MyArKysrKysrKysrKy0tLS0tLS0tCiAuLi4vaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250 ZXh0LmggICAgICAgfCAgOCArKystCiAyIGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyks IDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZv cm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAxYmEzOGUyMDMyZDUuLjg0YmNmODIwMjU5MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv cnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNw cApAQCAtODgsMTIgKzg4LDEzIEBAIHZvaWQgUnVieUZvcm1hdHRpbmdDb250ZXh0OjpwbGFjZVJ1 YnlDb250ZW50KFdURjo6UmFuZ2U8c2l6ZV90PiBjYW5kaWRhdGVSYW5nZSwKICAgICBhdXRvJiBm b3JtYXR0aW5nVXRpbHMgPSBwYXJlbnRGb3JtYXR0aW5nQ29udGV4dCgpLmZvcm1hdHRpbmdVdGls cygpOwogCiAgICAgYXV0byBpbmRleCA9IGNhbmRpZGF0ZVJhbmdlLmJlZ2luKCk7CisgICAgYXV0 byBsb2dpY2FsUmlnaHRTcGFjaW5nRm9yQmFzZSA9IElubGluZUxheW91dFVuaXQgeyB9OwogICAg IHdoaWxlIChpbmRleCA8IGNhbmRpZGF0ZVJhbmdlLmVuZCgpKSB7Ci0gICAgICAgIGF1dG8gYXBw ZW5kSW5saW5lTGV2ZWxJdGVtID0gWyZdKGF1dG8mIGlubGluZUJveEl0ZW0pIHsKKyAgICAgICAg YXV0byBhcHBlbmRJbmxpbmVMZXZlbEl0ZW0gPSBbJl0oYXV0byYgaW5saW5lQm94SXRlbSwgSW5s aW5lTGF5b3V0VW5pdCBleHRyYVNwYWNpbmdFbmQgPSB7IH0pIHsKICAgICAgICAgICAgIEFTU0VS VChpbmxpbmVCb3hJdGVtLmxheW91dEJveCgpLmlzUnVieSgpIHx8IGlubGluZUJveEl0ZW0ubGF5 b3V0Qm94KCkuaXNSdWJ5QmFzZSgpIHx8IGlubGluZUJveEl0ZW0ubGF5b3V0Qm94KCkuaXNSdWJ5 QW5ub3RhdGlvbkJveCgpKTsKIAogICAgICAgICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBmb3Jt YXR0aW5nVXRpbHMuaW5saW5lSXRlbVdpZHRoKGlubGluZUJveEl0ZW0sIGxpbmUuY29udGVudExv Z2ljYWxSaWdodCgpLCB7IH0pOwotICAgICAgICAgICAgbGluZS5hcHBlbmQoaW5saW5lQm94SXRl bSwgaW5saW5lQm94SXRlbS5zdHlsZSgpLCBsb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgbGlu ZS5hcHBlbmQoaW5saW5lQm94SXRlbSwgaW5saW5lQm94SXRlbS5zdHlsZSgpLCBsb2dpY2FsV2lk dGggKyBleHRyYVNwYWNpbmdFbmQpOwogICAgICAgICAgICAgKytpbmRleDsKICAgICAgICAgfTsK IApAQCAtMTA5LDkgKzExMCwxNSBAQCB2b2lkIFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6cGxhY2VS dWJ5Q29udGVudChXVEY6OlJhbmdlPHNpemVfdD4gY2FuZGlkYXRlUmFuZ2UsCiAgICAgICAgIGlm IChydWJ5TGF5b3V0Qm94LmlzUnVieUJhc2UoKSkgewogICAgICAgICAgICAgLy8gcnVieSBjb2x1 bW46IHJlcHJlc2VudGVkIGJ5IGEgc2luZ2xlIHJ1YnkgYmFzZSBhbmQgb25lIHJ1YnkgYW5ub3Rh dGlvbgogICAgICAgICAgICAgLy8gZnJvbSBlYWNoIGludGVybGluZWFyIGFubm90YXRpb24gbGV2 ZWwgaW4gaXRzIHJ1Ynkgc2VnbWVudC4KLSAgICAgICAgICAgIGFwcGVuZElubGluZUxldmVsSXRl bShydWJ5SXRlbSk7Ci0gICAgICAgICAgICBpZiAocnVieUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgp KQotICAgICAgICAgICAgICAgIGluZGV4ICs9IGxheW91dFJ1YnlCYXNlSW5saW5lQXhpcyhsaW5l LCBydWJ5TGF5b3V0Qm94LCBpbmRleCwgaW5saW5lSXRlbUxpc3QpOworICAgICAgICAgICAgaWYg KHJ1YnlJdGVtLmlzSW5saW5lQm94U3RhcnQoKSkgeworICAgICAgICAgICAgICAgIGFwcGVuZElu bGluZUxldmVsSXRlbShydWJ5SXRlbSk7CisgICAgICAgICAgICAgICAgYXV0byBiYXNlTGF5b3V0 UmVzdWx0ID0gbGF5b3V0UnVieUJhc2VJbmxpbmVBeGlzKGxpbmUsIHJ1YnlMYXlvdXRCb3gsIGlu ZGV4LCBpbmxpbmVJdGVtTGlzdCk7CisgICAgICAgICAgICAgICAgaW5kZXggKz0gYmFzZUxheW91 dFJlc3VsdC5jb21taXR0ZWRDb3VudDsKKyAgICAgICAgICAgICAgICBsb2dpY2FsUmlnaHRTcGFj aW5nRm9yQmFzZSA9IGJhc2VMYXlvdXRSZXN1bHQubG9naWNhbFJpZ2h0U3BhY2luZzsKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIEFTU0VSVChy dWJ5SXRlbS5pc0lubGluZUJveEVuZCgpKTsKKyAgICAgICAgICAgIGFwcGVuZElubGluZUxldmVs SXRlbShydWJ5SXRlbSwgbG9naWNhbFJpZ2h0U3BhY2luZ0ZvckJhc2UpOwogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHJ1YnlMYXlvdXRCb3guaXNSdWJ5QW5u b3RhdGlvbkJveCgpKSB7CkBAIC0xMjQsNyArMTMxLDcgQEAgdm9pZCBSdWJ5Rm9ybWF0dGluZ0Nv bnRleHQ6OnBsYWNlUnVieUNvbnRlbnQoV1RGOjpSYW5nZTxzaXplX3Q+IGNhbmRpZGF0ZVJhbmdl LAogICAgIH0KIH0KIAotc2l6ZV90IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0UnVieUJh c2VJbmxpbmVBeGlzKExpbmUmIGxpbmUsIGNvbnN0IEJveCYgcnVieUJhc2VMYXlvdXRCb3gsIHNp emVfdCBydWJ5QmFzZUNvbnRlbnRTdGFydEluZGV4LCBjb25zdCBJbmxpbmVJdGVtTGlzdCYgaW5s aW5lSXRlbUxpc3QpCitSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OkJhc2VMYXlvdXRSZXN1bHQgUnVi eUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRSdWJ5QmFzZUlubGluZUF4aXMoTGluZSYgbGluZSwg Y29uc3QgQm94JiBydWJ5QmFzZUxheW91dEJveCwgc2l6ZV90IHJ1YnlCYXNlQ29udGVudFN0YXJ0 SW5kZXgsIGNvbnN0IElubGluZUl0ZW1MaXN0JiBpbmxpbmVJdGVtTGlzdCkKIHsKICAgICAvLyBB cHBlbmQgcnVieSBiYXNlIGNvbnRlbnQgKGluY2x1ZGluZyBzdGFydC9lbmQgaW5saW5lIGJveCkg dG8gdGhlIGxpbmUgYW5kIGFwcGx5ICJydWJ5LWFsaWduOiBzcGFjZS1hcm91bmQiIG9uIHRoZSBy dWJ5IHN1YnJhbmdlLgogICAgIGF1dG8mIGZvcm1hdHRpbmdVdGlscyA9IHBhcmVudEZvcm1hdHRp bmdDb250ZXh0KCkuZm9ybWF0dGluZ1V0aWxzKCk7CkBAIC0xMzYsMTYgKzE0MywxNyBAQCBzaXpl X3QgUnVieUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRSdWJ5QmFzZUlubGluZUF4aXMoTGluZSYg bGluZSwgY29uc3QgQm94JiBydQogICAgICAgICBhdXRvJiBydWJ5QmFzZUlubGluZUl0ZW0gPSBp bmxpbmVJdGVtTGlzdFtpbmRleF07CiAgICAgICAgIGlmICgmcnVieUJhc2VJbmxpbmVJdGVtLmxh eW91dEJveCgpID09ICZydWJ5QmFzZUxheW91dEJveCkgewogICAgICAgICAgICAgYXV0byBiYXNl UnVuQ291bnQgPSBsaW5lLnJ1bnMoKS5zaXplKCkgLSBiYXNlUnVuU3RhcnQ7CisgICAgICAgICAg ICBhdXRvIGxvZ2ljYWxSaWdodFNwYWNpbmcgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKICAgICAg ICAgICAgIGlmIChiYXNlUnVuQ291bnQpCi0gICAgICAgICAgICAgICAgYXBwbHlSdWJ5QWxpZ24o bGluZSwgeyBiYXNlUnVuU3RhcnQsIGJhc2VSdW5TdGFydCArIGJhc2VSdW5Db3VudCB9LCBydWJ5 QmFzZUxheW91dEJveCwgYmFzZUNvbnRlbnRMb2dpY2FsV2lkdGgpOwotICAgICAgICAgICAgcmV0 dXJuIGluZGV4IC0gcnVieUJhc2VDb250ZW50U3RhcnRJbmRleDsKKyAgICAgICAgICAgICAgICBs b2dpY2FsUmlnaHRTcGFjaW5nID0gYXBwbHlSdWJ5QWxpZ24obGluZSwgeyBiYXNlUnVuU3RhcnQs IGJhc2VSdW5TdGFydCArIGJhc2VSdW5Db3VudCB9LCBydWJ5QmFzZUxheW91dEJveCwgYmFzZUNv bnRlbnRMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgcmV0dXJuIHsgaW5kZXggLSBydWJ5QmFz ZUNvbnRlbnRTdGFydEluZGV4LCBsb2dpY2FsUmlnaHRTcGFjaW5nIH07CiAgICAgICAgIH0KICAg ICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBmb3JtYXR0aW5nVXRpbHMuaW5saW5lSXRlbVdpZHRo KHJ1YnlCYXNlSW5saW5lSXRlbSwgbGluZUxvZ2ljYWxSaWdodCArIGJhc2VDb250ZW50TG9naWNh bFdpZHRoLCB7IH0pOwogICAgICAgICBsaW5lLmFwcGVuZChydWJ5QmFzZUlubGluZUl0ZW0sIHJ1 YnlCYXNlSW5saW5lSXRlbS5zdHlsZSgpLCBsb2dpY2FsV2lkdGgpOwogICAgICAgICBiYXNlQ29u dGVudExvZ2ljYWxXaWR0aCArPSBsb2dpY2FsV2lkdGg7CiAgICAgfQogICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwotICAgIHJldHVybiBpbmxpbmVJdGVtTGlzdC5zaXplKCkgLSBydWJ5QmFzZUNv bnRlbnRTdGFydEluZGV4OworICAgIHJldHVybiB7IGlubGluZUl0ZW1MaXN0LnNpemUoKSAtIHJ1 YnlCYXNlQ29udGVudFN0YXJ0SW5kZXgsIHsgfSB9OwogfQogCiBJbmxpbmVMYXlvdXRQb2ludCBS dWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OnBsYWNlQW5ub3RhdGlvbkJveChjb25zdCBCb3gmIHJ1YnlC YXNlTGF5b3V0Qm94KQpAQCAtMzAwLDE3ICszMDgsMTcgQEAgc3RkOjpvcHRpb25hbDxzaXplX3Q+ IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6bmV4dFdyYXBPcHBvcnR1bml0eShzaXplX3QgaW5saW5l SXQKICAgICByZXR1cm4gaW5saW5lSXRlbUluZGV4ICsgMTsKIH0KIAotdm9pZCBSdWJ5Rm9ybWF0 dGluZ0NvbnRleHQ6OmFwcGx5UnVieUFsaWduKExpbmUmIGxpbmUsIFdURjo6UmFuZ2U8c2l6ZV90 PiBiYXNlUnVuUmFuZ2UsIGNvbnN0IEJveCYgcnVieUJhc2VMYXlvdXRCb3gsIElubGluZUxheW91 dFVuaXQgYmFzZUNvbnRlbnRMb2dpY2FsV2lkdGgpCitJbmxpbmVMYXlvdXRVbml0IFJ1YnlGb3Jt YXR0aW5nQ29udGV4dDo6YXBwbHlSdWJ5QWxpZ24oTGluZSYgbGluZSwgV1RGOjpSYW5nZTxzaXpl X3Q+IGJhc2VSdW5SYW5nZSwgY29uc3QgQm94JiBydWJ5QmFzZUxheW91dEJveCwgSW5saW5lTGF5 b3V0VW5pdCBiYXNlQ29udGVudExvZ2ljYWxXaWR0aCkKIHsKICAgICAvLyBodHRwczovL2RyYWZ0 cy5jc3N3Zy5vcmcvY3NzLXJ1YnkvI2ludGVybGluZWFyLWlubGluZQogICAgIC8vIFdpdGhpbiBl YWNoIGJhc2UgYW5kIGFubm90YXRpb24gYm94LCBob3cgdGhlIGV4dHJhIHNwYWNlIGlzIGRpc3Ry aWJ1dGVkIHdoZW4gaXRzIGNvbnRlbnQgaXMgbmFycm93ZXIgdGhhbgogICAgIC8vIHRoZSBtZWFz dXJlIG9mIHRoZSBib3ggaXMgc3BlY2lmaWVkIGJ5IGl0cyBydWJ5LWFsaWduIHByb3BlcnR5Lgog ICAgIGF1dG8qIGFubm90YXRpb25Cb3ggPSBydWJ5QmFzZUxheW91dEJveC5hc3NvY2lhdGVkUnVi eUFubm90YXRpb25Cb3goKTsKICAgICBpZiAoIWFubm90YXRpb25Cb3gpCi0gICAgICAgIHJldHVy bjsKKyAgICAgICAgcmV0dXJuIHsgfTsKICAgICBhdXRvIGFubm90YXRpb25Cb3hMb2dpY2FsV2lk dGggPSBJbmxpbmVMYXlvdXRVbml0IHsgcGFyZW50Rm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRy eUZvckJveCgqYW5ub3RhdGlvbkJveCkubWFyZ2luQm94V2lkdGgoKSB9OwogICAgIGlmIChhbm5v dGF0aW9uQm94TG9naWNhbFdpZHRoIDw9IGJhc2VDb250ZW50TG9naWNhbFdpZHRoKQotICAgICAg ICByZXR1cm47CisgICAgICAgIHJldHVybiB7IH07CiAgICAgYXV0byBleHBhbnNpb24gPSBFeHBh bnNpb25JbmZvIHsgfTsKICAgICAvLyBydWJ5LWFsaWduOiBzcGFjZS1hcm91bmQKICAgICAvLyBB cyBmb3Igc3BhY2UtYmV0d2VlbiBleGNlcHQgdGhhdCB0aGVyZSBleGlzdHMgYW4gZXh0cmEganVz dGlmaWNhdGlvbiBvcHBvcnR1bml0aWVzIHdob3NlIHNwYWNlIGlzIGRpc3RyaWJ1dGVkIGhhbGYg YmVmb3JlIGFuZCBoYWxmIGFmdGVyIHRoZSBydWJ5IGNvbnRlbnQuCkBAIC0zMjEsMTMgKzMyOSwx MiBAQCB2b2lkIFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6YXBwbHlSdWJ5QWxpZ24oTGluZSYgbGlu ZSwgV1RGOjpSYW5nZTxzaXplX3Q+IGJhc2VSdQogICAgICAgICBsaW5lLmV4cGFuZEJ5KGJhc2VS dW5SYW5nZS5iZWdpbigpIC0gMSwgYmFzZUNvbnRlbnRPZmZzZXQpOwogICAgICAgICBleHRyYVNw YWNlIC09ICgyICogYmFzZUNvbnRlbnRPZmZzZXQpOwogICAgICAgICBsaW5lLmFwcGx5RXhwYW5z aW9uT25SYW5nZShiYXNlUnVuUmFuZ2UsIGV4cGFuc2lvbiwgZXh0cmFTcGFjZSk7Ci0gICAgICAg IGxpbmUuZXhwYW5kQnkoYmFzZVJ1blJhbmdlLmVuZCgpIC0gMSwgYmFzZUNvbnRlbnRPZmZzZXQp OwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGF1dG8gY2VudGVyT2Zmc2V0ID0gKGFubm90YXRpb25C b3hMb2dpY2FsV2lkdGggLSBiYXNlQ29udGVudExvZ2ljYWxXaWR0aCkgLyAyOwotICAgICAgICAv LyBNb3ZlIHRoZSBmaXJzdCBhbmQgZXhhbmQgdGhlIGxhc3QgcnVuIChtb3N0IGNhc2VzIHRoZXJl J3Mgb25seSBvbmUgcnVuIGhlcmUgdGhvdWdoLikKLSAgICAgICAgbGluZS5tb3ZlUnVuc0J5KGJh c2VSdW5SYW5nZS5iZWdpbigpLCBjZW50ZXJPZmZzZXQpOwotICAgICAgICBsaW5lLmV4cGFuZEJ5 KGJhc2VSdW5SYW5nZS5lbmQoKSAtIDEsIGNlbnRlck9mZnNldCk7CisgICAgICAgIHJldHVybiBi YXNlQ29udGVudE9mZnNldDsKICAgICB9CisgICAgYXV0byBjZW50ZXJPZmZzZXQgPSAoYW5ub3Rh dGlvbkJveExvZ2ljYWxXaWR0aCAtIGJhc2VDb250ZW50TG9naWNhbFdpZHRoKSAvIDI7CisgICAg Ly8gTW92ZSB0aGUgZmlyc3QgYW5kIGV4YW5kIHRoZSBsYXN0IHJ1biAobW9zdCBjYXNlcyB0aGVy ZSdzIG9ubHkgb25lIHJ1biBoZXJlIHRob3VnaC4pCisgICAgbGluZS5tb3ZlUnVuc0J5KGJhc2VS dW5SYW5nZS5iZWdpbigpLCBjZW50ZXJPZmZzZXQpOworICAgIHJldHVybiBjZW50ZXJPZmZzZXQ7 CiB9CiAKIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gUnVieUZvcm1hdHRpbmdDb250ZXh0Ojphbm5vdGF0 aW9uT3ZlcmxhcENoZWNrKGNvbnN0IElubGluZURpc3BsYXk6OkJveCYgYWRqYWNlbnREaXNwbGF5 Qm94LCBjb25zdCBJbmxpbmVMYXlvdXRSZWN0JiBvdmVyaGFuZ2luZ1JlY3QpIGNvbnN0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9y dWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBl NDc1NWFhODY2ZjYuLjQ5ODVmMzZjZWI3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9y dWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01NSw4ICs1NSwxMiBAQCBwdWJsaWM6CiAg ICAgc3RhdGljIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiBuZXh0V3JhcE9wcG9ydHVuaXR5KHNpemVf dCBpbmxpbmVJdGVtSW5kZXgsIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiBwcmV2aW91c0lubGluZUl0 ZW1JbmRleCwgY29uc3QgSW5saW5lSXRlbVJhbmdlJiwgY29uc3QgSW5saW5lSXRlbUxpc3QmKTsK IAogcHJpdmF0ZToKLSAgICBzaXplX3QgbGF5b3V0UnVieUJhc2VJbmxpbmVBeGlzKExpbmUmLCBj b25zdCBCb3gmIHJ1YnlCYXNlTGF5b3V0Qm94LCBzaXplX3QgcnVieUJhc2VDb250ZW50U3RhcnQs IGNvbnN0IElubGluZUl0ZW1MaXN0Jik7Ci0gICAgdm9pZCBhcHBseVJ1YnlBbGlnbihMaW5lJiwg V1RGOjpSYW5nZTxzaXplX3Q+IGJhc2VSdW5SYW5nZSwgY29uc3QgQm94JiBydWJ5QmFzZUxheW91 dEJveCwgSW5saW5lTGF5b3V0VW5pdCBiYXNlQ29udGVudExvZ2ljYWxXaWR0aCk7CisgICAgc3Ry dWN0IEJhc2VMYXlvdXRSZXN1bHQgeworICAgICAgICBzaXplX3QgY29tbWl0dGVkQ291bnQgeyAw IH07CisgICAgICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFJpZ2h0U3BhY2luZyB7IDAuZiB9 OworICAgIH07CisgICAgQmFzZUxheW91dFJlc3VsdCBsYXlvdXRSdWJ5QmFzZUlubGluZUF4aXMo TGluZSYsIGNvbnN0IEJveCYgcnVieUJhc2VMYXlvdXRCb3gsIHNpemVfdCBydWJ5QmFzZUNvbnRl bnRTdGFydCwgY29uc3QgSW5saW5lSXRlbUxpc3QmKTsKKyAgICBJbmxpbmVMYXlvdXRVbml0IGFw cGx5UnVieUFsaWduKExpbmUmLCBXVEY6OlJhbmdlPHNpemVfdD4gYmFzZVJ1blJhbmdlLCBjb25z dCBCb3gmIHJ1YnlCYXNlTGF5b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0IGJhc2VDb250ZW50TG9n aWNhbFdpZHRoKTsKICAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IGFubm90YXRpb25PdmVybGFwQ2hl Y2soY29uc3QgSW5saW5lRGlzcGxheTo6Qm94JiwgY29uc3QgSW5saW5lTGF5b3V0UmVjdCYgb3Zl cmhhbmdpbmdSZWN0KSBjb25zdDsKICAgICB2b2lkIHBsYWNlUnVieUNvbnRlbnQoV1RGOjpSYW5n ZTxzaXplX3Q+IGNhbmRpZGF0ZVJhbmdlLCBjb25zdCBJbmxpbmVJdGVtTGlzdCYsIExpbmUmKTsK ICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYVdpZHRoRm9yUnVieVJhbmdlKFdURjo6UmFuZ2U8 c2l6ZV90PiBjYW5kaWRhdGVSYW5nZSwgY29uc3QgSW5saW5lSXRlbUxpc3QmLCBJbmxpbmVMYXlv dXRVbml0IGxpbmVDb250ZW50TG9naWNhbFJpZ2h0KSBjb25zdDsK