278826 2024-08-28 17:05:06 -0700 [css-line-clamp] Rename RenderLayoutState's line clamp to legacyLineClamp 2024-10-29 18:05:26 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 206748 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 2056121 0 zalan 2024-08-28 17:05:06 -0700 ssia 2056122 1 472338 zalan 2024-08-28 17:06:58 -0700 Created attachment 472338 [fast-cq]Patch 2056459 2 ews-feeder 2024-08-29 20:59:46 -0700 Committed 282948@main (604ca3542b1a): <https://commits.webkit.org/282948@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 472338. 2056460 3 webkit-bug-importer 2024-08-29 21:00:16 -0700 <rdar://problem/134989862> 472338 2024-08-28 17:06:58 -0700 2024-08-29 20:59:47 -0700 [fast-cq]Patch bug-278826-20240828170657.patch text/plain 12748 zalan RnJvbSAwZjMzMGI2Y2QxNjQxMWU2MzZhZDBmYWE1OGE3NzI5MDcxNjZhYTIwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMjggQXVnIDIwMjQgMTc6MDU6MTUgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY3NzLWxp bmUtY2xhbXBdIFJlbmFtZSBSZW5kZXJMYXlvdXRTdGF0ZSdzIGxpbmUgY2xhbXAgdG8KIGxlZ2Fj eUxpbmVDbGFtcCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc4ODI2 CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9y IGFkZGluZyAobW9kZXJuKUxpbmVDbGFtcCB0byBSZW5kZXJMYXlvdXRTdGF0ZS4KCiogU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVM YXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmxpbmVDbGFtcCk6CiogU291 cmNlL1dlYkNvcmUvcGFnZS9Mb2NhbEZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgooV2ViQ29y ZTo6TG9jYWxGcmFtZVZpZXdMYXlvdXRDb250ZXh0OjpwdXNoTGF5b3V0U3RhdGUpOgooV2ViQ29y ZTo6TG9jYWxGcmFtZVZpZXdMYXlvdXRDb250ZXh0Ojpwb3BMYXlvdXRTdGF0ZSk6CiogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CihXZWJDb3JlOjpSZW5kZXJC bG9ja0Zsb3c6OmxheW91dEJsb2NrKToKKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6bGF5b3V0 TW9kZXJuTGluZXMpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVk RmxleGlibGVCb3guY3BwOgooV2ViQ29yZTo6UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94Ojph cHBseU1vZGVybkxpbmVDbGFtcCk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eW91dFN0YXRlLmNwcDoKKFdlYkNvcmU6OlJlbmRlckxheW91dFN0YXRlOjpSZW5kZXJMYXlvdXRT dGF0ZSk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheW91dFN0YXRlLmg6CihX ZWJDb3JlOjpSZW5kZXJMYXlvdXRTdGF0ZTo6c2V0TGVnYWN5TGluZUNsYW1wKToKKFdlYkNvcmU6 OlJlbmRlckxheW91dFN0YXRlOjpsZWdhY3lMaW5lQ2xhbXAgY29uc3QpOgooV2ViQ29yZTo6UmVu ZGVyTGF5b3V0U3RhdGU6OnNldExpbmVDbGFtcCk6IERlbGV0ZWQuCihXZWJDb3JlOjpSZW5kZXJM YXlvdXRTdGF0ZTo6bGluZUNsYW1wIGNvbnN0KTogRGVsZXRlZC4KLS0tCiAuLi4vaW5saW5lL0xh eW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgICAgfCAgMiArLQogLi4uL3BhZ2UvTG9jYWxG cmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcCAgICAgIHwgMTAgKysrKystLS0tLQogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgIHwgMjAgKysrKysrKysrLS0tLS0t LS0tLQogLi4uL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwIHwgIDgg KysrKy0tLS0KIC4uLi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXlvdXRTdGF0ZS5jcHAgICB8 ICA0ICsrLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXlvdXRTdGF0ZS5oICB8 IDEwICsrKysrLS0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMjcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3Bw CmluZGV4IDYwNTJiNGQ1ZGYwMi4uYzEwZGRhODM0MDQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91 dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlv dXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC0zMDQsNyArMzA0LDcgQEAgc3RkOjpwYWly PExheW91dFVuaXQsIExheW91dFVuaXQ+IExpbmVMYXlvdXQ6OmNvbXB1dGVJbnRyaW5zaWNXaWR0 aENvbnN0cmFpbnRzKCkKIHN0YXRpYyBpbmxpbmUgc3RkOjpvcHRpb25hbDxMYXlvdXQ6OkJsb2Nr TGF5b3V0U3RhdGU6OkxpbmVDbGFtcD4gbGluZUNsYW1wKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYg cm9vdFJlbmRlcmVyKQogewogICAgIGF1dG8mIGxheW91dFN0YXRlID0gKnJvb3RSZW5kZXJlci52 aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4dCgpLmxheW91dFN0YXRlKCk7Ci0gICAgaWYg KGF1dG8gbGluZUNsYW1wID0gbGF5b3V0U3RhdGUubGluZUNsYW1wKCkpCisgICAgaWYgKGF1dG8g bGluZUNsYW1wID0gbGF5b3V0U3RhdGUubGVnYWN5TGluZUNsYW1wKCkpCiAgICAgICAgIHJldHVy biBMYXlvdXQ6OkJsb2NrTGF5b3V0U3RhdGU6OkxpbmVDbGFtcCB7IGxpbmVDbGFtcC0+bWF4aW11 bUxpbmVDb3VudCwgbGluZUNsYW1wLT5jdXJyZW50TGluZUNvdW50IH07CiAgICAgcmV0dXJuIHsg fTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYWxGcmFtZVZpZXdMYXlv dXRDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYWxGcmFtZVZpZXdMYXlvdXRD b250ZXh0LmNwcAppbmRleCAyYzRkY2Q5MTllYmIuLjhiOWY3ZWZmZDc1YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9Mb2NhbEZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYWxGcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcApAQCAt NjA0LDcgKzYwNCw3IEBAIGJvb2wgTG9jYWxGcmFtZVZpZXdMYXlvdXRDb250ZXh0OjpwdXNoTGF5 b3V0U3RhdGUoUmVuZGVyQm94JiByZW5kZXJlciwgY29uc3QgTGF5CiAgICAgICAgICAgICAsIG9m ZnNldAogICAgICAgICAgICAgLCBwYWdlSGVpZ2h0CiAgICAgICAgICAgICAsIHBhZ2VIZWlnaHRD aGFuZ2VkCi0gICAgICAgICAgICAsIGxheW91dFN0YXRlID8gbGF5b3V0U3RhdGUtPmxpbmVDbGFt cCgpIDogc3RkOjpudWxsb3B0CisgICAgICAgICAgICAsIGxheW91dFN0YXRlID8gbGF5b3V0U3Rh dGUtPmxlZ2FjeUxpbmVDbGFtcCgpIDogc3RkOjpudWxsb3B0CiAgICAgICAgICAgICAsIGxheW91 dFN0YXRlID8gbGF5b3V0U3RhdGUtPnRleHRCb3hUcmltKCkgOiBSZW5kZXJMYXlvdXRTdGF0ZTo6 VGV4dEJveFRyaW0oKSkpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CkBAIC02MTYsMTUg KzYxNiwxNSBAQCB2b2lkIExvY2FsRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6cG9wTGF5b3V0U3Rh dGUoKQogICAgIGlmICghbGF5b3V0U3RhdGUoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYXV0 byBjdXJyZW50TGluZUNsYW1wID0gbGF5b3V0U3RhdGUoKS0+bGluZUNsYW1wKCk7CisgICAgYXV0 byBjdXJyZW50TGluZUNsYW1wID0gbGF5b3V0U3RhdGUoKS0+bGVnYWN5TGluZUNsYW1wKCk7CiAK ICAgICBtX2xheW91dFN0YXRlU3RhY2sucmVtb3ZlTGFzdCgpOwogCiAgICAgaWYgKGN1cnJlbnRM aW5lQ2xhbXApIHsKICAgICAgICAgLy8gUHJvcGFnYXRlcyB0aGUgY3VycmVudCBsaW5lIGNsYW1w IHN0YXRlIHRvIHRoZSBwYXJlbnQuCi0gICAgICAgIGlmIChhdXRvKiBsYXlvdXRTdGF0ZSA9IHRo aXMtPmxheW91dFN0YXRlKCk7IGxheW91dFN0YXRlICYmIGxheW91dFN0YXRlLT5saW5lQ2xhbXAo KSkgewotICAgICAgICAgICAgQVNTRVJUKGxheW91dFN0YXRlLT5saW5lQ2xhbXAoKS0+bWF4aW11 bUxpbmVDb3VudCA9PSBjdXJyZW50TGluZUNsYW1wLT5tYXhpbXVtTGluZUNvdW50KTsKLSAgICAg ICAgICAgIGxheW91dFN0YXRlLT5zZXRMaW5lQ2xhbXAoY3VycmVudExpbmVDbGFtcCk7CisgICAg ICAgIGlmIChhdXRvKiBsYXlvdXRTdGF0ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7IGxheW91dFN0 YXRlICYmIGxheW91dFN0YXRlLT5sZWdhY3lMaW5lQ2xhbXAoKSkgeworICAgICAgICAgICAgQVNT RVJUKGxheW91dFN0YXRlLT5sZWdhY3lMaW5lQ2xhbXAoKS0+bWF4aW11bUxpbmVDb3VudCA9PSBj dXJyZW50TGluZUNsYW1wLT5tYXhpbXVtTGluZUNvdW50KTsKKyAgICAgICAgICAgIGxheW91dFN0 YXRlLT5zZXRMZWdhY3lMaW5lQ2xhbXAoY3VycmVudExpbmVDbGFtcCk7CiAgICAgICAgIH0KICAg ICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmlu ZGV4IGJmODYzNDlkMjZlZC4uNzA5YzI3OWYzZDU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtNDQzLDcgKzQ0Myw3IEBAIHZvaWQgUmVuZGVy QmxvY2tGbG93OjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQg cGFnZUxvZ2ljYWxICiAgICAgaWYgKHJlY29tcHV0ZUxvZ2ljYWxXaWR0aEFuZENvbHVtbldpZHRo KCkpCiAgICAgICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0cnVlOwogCi0gICAgaWYgKGF1dG8qIGxh eW91dFN0YXRlID0gdmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKS5sYXlvdXRTdGF0 ZSgpOyBsYXlvdXRTdGF0ZSAmJiBsYXlvdXRTdGF0ZS0+bGluZUNsYW1wKCkpCisgICAgaWYgKGF1 dG8qIGxheW91dFN0YXRlID0gdmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKS5sYXlv dXRTdGF0ZSgpOyBsYXlvdXRTdGF0ZSAmJiBsYXlvdXRTdGF0ZS0+bGVnYWN5TGluZUNsYW1wKCkp CiAgICAgICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0cnVlOwogCiAgICAgcmVidWlsZEZsb2F0aW5n T2JqZWN0U2V0RnJvbUludHJ1ZGluZ0Zsb2F0cygpOwpAQCAtMzk0NSwzMCArMzk0NSwzMCBAQCB2 b2lkIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0TW9kZXJuTGluZXMoYm9vbCByZWxheW91dENoaWxk cmVuLCBMYXlvdXRVbml0JiByZXBhaQogCiAgICAgc2V0TG9naWNhbEhlaWdodChuZXdCb3JkZXJC b3hCb3R0b20pOwogICAgIGF1dG8gdXBkYXRlTGluZUNsYW1wU3RhdGVBbmRMb2dpY2FsSGVpZ2h0 SWZBcHBsaWNhYmxlID0gWyZdIHsKLSAgICAgICAgYXV0byBsaW5lQ2xhbXAgPSBsYXlvdXRTdGF0 ZS5saW5lQ2xhbXAoKTsKLSAgICAgICAgaWYgKCFsaW5lQ2xhbXAgfHwgaXNGbG9hdGluZ09yT3V0 T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAgICBhdXRvIGxlZ2FjeUxpbmVDbGFtcCA9IGxheW91 dFN0YXRlLmxlZ2FjeUxpbmVDbGFtcCgpOworICAgICAgICBpZiAoIWxlZ2FjeUxpbmVDbGFtcCB8 fCBpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIGxpbmVDbGFtcC0+Y3VycmVudExpbmVDb3VudCArPSBsYXlvdXRGb3JtYXR0aW5n Q29udGV4dExpbmVMYXlvdXQubGluZUNvdW50KCk7Ci0gICAgICAgIGlmIChsaW5lQ2xhbXAtPmNs YW1wZWRSZW5kZXJlcikgeworICAgICAgICBsZWdhY3lMaW5lQ2xhbXAtPmN1cnJlbnRMaW5lQ291 bnQgKz0gbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmxpbmVDb3VudCgpOworICAg ICAgICBpZiAobGVnYWN5TGluZUNsYW1wLT5jbGFtcGVkUmVuZGVyZXIpIHsKICAgICAgICAgICAg IC8vIFdlJ3ZlIGFscmVhZHkgY2xhbXBlZCB0aGlzIGZsZXggY29udGFpbmVyIGF0IGEgcHJldmlv dXMgZmxleCBpdGVtLgotICAgICAgICAgICAgbGF5b3V0U3RhdGUuc2V0TGluZUNsYW1wKCpsaW5l Q2xhbXApOworICAgICAgICAgICAgbGF5b3V0U3RhdGUuc2V0TGVnYWN5TGluZUNsYW1wKCpsZWdh Y3lMaW5lQ2xhbXApOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGF1 dG8gY2xhbXBlZENvbnRlbnRIZWlnaHQgPSBbJl0oKSAtPiBzdGQ6Om9wdGlvbmFsPExheW91dFVu aXQ+IHsKICAgICAgICAgICAgIGlmIChhdXRvIGNsYW1wZWRIZWlnaHQgPSBsYXlvdXRGb3JtYXR0 aW5nQ29udGV4dExpbmVMYXlvdXQuY2xhbXBlZENvbnRlbnRMb2dpY2FsSGVpZ2h0KCkpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIGNsYW1wZWRIZWlnaHQ7Ci0gICAgICAgICAgICBpZiAobGluZUNs YW1wLT5jdXJyZW50TGluZUNvdW50ID09IGxpbmVDbGFtcC0+bWF4aW11bUxpbmVDb3VudCkgewor ICAgICAgICAgICAgaWYgKGxlZ2FjeUxpbmVDbGFtcC0+Y3VycmVudExpbmVDb3VudCA9PSBsZWdh Y3lMaW5lQ2xhbXAtPm1heGltdW1MaW5lQ291bnQpIHsKICAgICAgICAgICAgICAgICAvLyBFdmVu IGlmIHdlIGRpZCBub3QgdHJ1bmNhdGUgdGhlIGNvbnRlbnQsIHRoaXMgbWlnaHQgYmUgb3VyIGNs YW1waW5nIHBvc2l0aW9uLgogICAgICAgICAgICAgICAgIHJldHVybiBjb21wdXRlQ29udGVudEhl aWdodCgpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAg fTsKICAgICAgICAgaWYgKGF1dG8gbG9naWNhbEhlaWdodCA9IGNsYW1wZWRDb250ZW50SGVpZ2h0 KCkpIHsKLSAgICAgICAgICAgIGxpbmVDbGFtcC0+Y2xhbXBlZENvbnRlbnRMb2dpY2FsSGVpZ2h0 ID0gbG9naWNhbEhlaWdodDsKLSAgICAgICAgICAgIGxpbmVDbGFtcC0+Y2xhbXBlZFJlbmRlcmVy ID0gdGhpczsKKyAgICAgICAgICAgIGxlZ2FjeUxpbmVDbGFtcC0+Y2xhbXBlZENvbnRlbnRMb2dp Y2FsSGVpZ2h0ID0gbG9naWNhbEhlaWdodDsKKyAgICAgICAgICAgIGxlZ2FjeUxpbmVDbGFtcC0+ Y2xhbXBlZFJlbmRlcmVyID0gdGhpczsKICAgICAgICAgICAgIHNldExvZ2ljYWxIZWlnaHQoYm9y ZGVyQW5kUGFkZGluZ0JlZm9yZSgpICsgKmxvZ2ljYWxIZWlnaHQgKyBib3JkZXJBbmRQYWRkaW5n QWZ0ZXIoKSArIHNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSk7CiAgICAgICAgIH0KLSAgICAgICAg bGF5b3V0U3RhdGUuc2V0TGluZUNsYW1wKCpsaW5lQ2xhbXApOworICAgICAgICBsYXlvdXRTdGF0 ZS5zZXRMZWdhY3lMaW5lQ2xhbXAoKmxlZ2FjeUxpbmVDbGFtcCk7CiAgICAgfTsKICAgICB1cGRh dGVMaW5lQ2xhbXBTdGF0ZUFuZExvZ2ljYWxIZWlnaHRJZkFwcGxpY2FibGUoKTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJs ZUJveC5jcHAKaW5kZXggYTViMDdlMjEyOTc5Li41MDYwNmFjZDM1YTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3gu Y3BwCkBAIC05ODksOSArOTg5LDkgQEAgc3RkOjpvcHRpb25hbDxSZW5kZXJEZXByZWNhdGVkRmxl eGlibGVCb3g6OkNsYW1wZWRDb250ZW50PiBSZW5kZXJEZXByZWNhdGVkRmxleGkKICAgICAgICAg cmV0dXJuIHsgfTsKIAogICAgIGF1dG8mIGxheW91dFN0YXRlID0gKnZpZXcoKS5mcmFtZVZpZXco KS5sYXlvdXRDb250ZXh0KCkubGF5b3V0U3RhdGUoKTsKLSAgICBhdXRvIGFuY2VzdG9yTGluZUNs YW1wID0gbGF5b3V0U3RhdGUubGluZUNsYW1wKCk7CisgICAgYXV0byBhbmNlc3RvckxpbmVDbGFt cCA9IGxheW91dFN0YXRlLmxlZ2FjeUxpbmVDbGFtcCgpOwogICAgIGF1dG8gcmVzdG9yZUFuY2Vz dG9yTGluZUNsYW1wID0gbWFrZVNjb3BlRXhpdChbJl0gewotICAgICAgICBsYXlvdXRTdGF0ZS5z ZXRMaW5lQ2xhbXAoYW5jZXN0b3JMaW5lQ2xhbXApOworICAgICAgICBsYXlvdXRTdGF0ZS5zZXRM ZWdhY3lMaW5lQ2xhbXAoYW5jZXN0b3JMaW5lQ2xhbXApOwogICAgIH0pOwogCiAgICAgYXV0byBs aW5lQ291bnRGb3JMaW5lQ2xhbXAgPSBbJl0oKSAtPiBzaXplX3QgewpAQCAtMTAxMyw3ICsxMDEz LDcgQEAgc3RkOjpvcHRpb25hbDxSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OkNsYW1wZWRD b250ZW50PiBSZW5kZXJEZXByZWNhdGVkRmxleGkKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4PHNp emVfdD4oMSwgKG51bWJlck9mTGluZXMgKyAxKSAqIGxpbmVDbGFtcC52YWx1ZSgpIC8gMTAwLmYp OwogICAgIH07CiAKLSAgICBsYXlvdXRTdGF0ZS5zZXRMaW5lQ2xhbXAoUmVuZGVyTGF5b3V0U3Rh dGU6OkxpbmVDbGFtcCB7IGxpbmVDb3VudEZvckxpbmVDbGFtcCgpLCB7IH0sIHsgfSwgeyB9IH0p OworICAgIGxheW91dFN0YXRlLnNldExlZ2FjeUxpbmVDbGFtcChSZW5kZXJMYXlvdXRTdGF0ZTo6 TGVnYWN5TGluZUNsYW1wIHsgbGluZUNvdW50Rm9yTGluZUNsYW1wKCksIHsgfSwgeyB9LCB7IH0g fSk7CiAgICAgZm9yIChhdXRvKiBjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7IGNoaWxkOyBjaGls ZCA9IGl0ZXJhdG9yLm5leHQoKSkgewogICAgICAgICBpZiAoY2hpbGREb2VzTm90QWZmZWN0V2lk dGhPckZsZXhpbmcoY2hpbGQpKQogICAgICAgICAgICAgY29udGludWU7CkBAIC0xMDIxLDcgKzEw MjEsNyBAQCBzdGQ6Om9wdGlvbmFsPFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6Q2xhbXBl ZENvbnRlbnQ+IFJlbmRlckRlcHJlY2F0ZWRGbGV4aQogICAgICAgICBjaGlsZC0+bGF5b3V0SWZO ZWVkZWQoKTsKICAgICB9CiAKLSAgICBhdXRvIGxpbmVDbGFtcCA9ICpsYXlvdXRTdGF0ZS5saW5l Q2xhbXAoKTsKKyAgICBhdXRvIGxpbmVDbGFtcCA9ICpsYXlvdXRTdGF0ZS5sZWdhY3lMaW5lQ2xh bXAoKTsKICAgICBpZiAoIWxpbmVDbGFtcC5jbGFtcGVkQ29udGVudExvZ2ljYWxIZWlnaHQpIHsK ICAgICAgICAgLy8gV2UndmUgbWFuYWdlZCB0byBydW4gbGluZSBjbGFtcGluZyBidXQgaXQgY2Ft ZSBiYWNrIHdpdGggbm8gY2xhbXBlZCBjb250ZW50IChpLmUuIHRoZXJlIGFyZSBmZXdlciBsaW5l cyB0aGFuIHRoZSBsaW5lLWNsYW1wIGxpbWl0KS4KICAgICAgICAgcmV0dXJuIFJlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveDo6Q2xhbXBlZENvbnRlbnQgeyB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheW91dFN0YXRlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXlvdXRTdGF0ZS5jcHAKaW5kZXggYjUwYjRjZmQ4YzUxLi5kMGI5 NWQwOTA3MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXlv dXRTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheW91dFN0 YXRlLmNwcApAQCAtNjYsNyArNjYsNyBAQCBSZW5kZXJMYXlvdXRTdGF0ZTo6UmVuZGVyTGF5b3V0 U3RhdGUoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIpCiAgICAgfQogfQogCi1SZW5kZXJMYXlvdXRT dGF0ZTo6UmVuZGVyTGF5b3V0U3RhdGUoY29uc3QgTG9jYWxGcmFtZVZpZXdMYXlvdXRDb250ZXh0 OjpMYXlvdXRTdGF0ZVN0YWNrJiBsYXlvdXRTdGF0ZVN0YWNrLCBSZW5kZXJCb3gmIHJlbmRlcmVy LCBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXQsIExheW91dFVuaXQgcGFnZUxvZ2ljYWxIZWlnaHQs IGJvb2wgcGFnZUxvZ2ljYWxIZWlnaHRDaGFuZ2VkLCBzdGQ6Om9wdGlvbmFsPExpbmVDbGFtcD4g bGluZUNsYW1wLCBzdGQ6Om9wdGlvbmFsPFRleHRCb3hUcmltPiB0ZXh0Qm94VHJpbSkKK1JlbmRl ckxheW91dFN0YXRlOjpSZW5kZXJMYXlvdXRTdGF0ZShjb25zdCBMb2NhbEZyYW1lVmlld0xheW91 dENvbnRleHQ6OkxheW91dFN0YXRlU3RhY2smIGxheW91dFN0YXRlU3RhY2ssIFJlbmRlckJveCYg cmVuZGVyZXIsIGNvbnN0IExheW91dFNpemUmIG9mZnNldCwgTGF5b3V0VW5pdCBwYWdlTG9naWNh bEhlaWdodCwgYm9vbCBwYWdlTG9naWNhbEhlaWdodENoYW5nZWQsIHN0ZDo6b3B0aW9uYWw8TGVn YWN5TGluZUNsYW1wPiBsZWdhY3lMaW5lQ2xhbXAsIHN0ZDo6b3B0aW9uYWw8VGV4dEJveFRyaW0+ IHRleHRCb3hUcmltKQogICAgIDogbV9jbGlwcGVkKGZhbHNlKQogICAgICwgbV9pc1BhZ2luYXRl ZChmYWxzZSkKICAgICAsIG1fcGFnZUxvZ2ljYWxIZWlnaHRDaGFuZ2VkKGZhbHNlKQpAQCAtNzUs NyArNzUsNyBAQCBSZW5kZXJMYXlvdXRTdGF0ZTo6UmVuZGVyTGF5b3V0U3RhdGUoY29uc3QgTG9j YWxGcmFtZVZpZXdMYXlvdXRDb250ZXh0OjpMYXlvdXRTdAogICAgICwgbV9sYXlvdXREZWx0YVlT YXR1cmF0ZWQoZmFsc2UpCiAjZW5kaWYKICAgICAsIG1fYmxvY2tTdGFydFRyaW1taW5nKFZlY3Rv cjxib29sPigwKSkKLSAgICAsIG1fbGluZUNsYW1wKGxpbmVDbGFtcCkKKyAgICAsIG1fbGVnYWN5 TGluZUNsYW1wKGxlZ2FjeUxpbmVDbGFtcCkKICAgICAsIG1fdGV4dEJveFRyaW0odGV4dEJveFRy aW0pCiAjaWYgQVNTRVJUX0VOQUJMRUQKICAgICAsIG1fcmVuZGVyZXIoJnJlbmRlcmVyKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheW91dFN0YXRlLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5b3V0U3RhdGUuaAppbmRleCBhMzNhM2I3 Yzg3YWMuLjY1ZjVlNjg4N2JiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheW91dFN0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheW91dFN0YXRlLmgKQEAgLTQ5LDcgKzQ5LDcgQEAgcHVibGljOgogICAgICAgICBUZXh0RWRn ZSBwcm9wYWdhdGVkVGV4dEJveEVkZ2UgeyB9OwogICAgICAgICBTaW5nbGVUaHJlYWRXZWFrUHRy PGNvbnN0IFJlbmRlckJsb2NrRmxvdz4gbGFzdEZvcm1hdHRlZExpbmVSb290OwogICAgIH07Ci0g ICAgc3RydWN0IExpbmVDbGFtcCB7CisgICAgc3RydWN0IExlZ2FjeUxpbmVDbGFtcCB7CiAgICAg ICAgIHNpemVfdCBtYXhpbXVtTGluZUNvdW50IHsgMCB9OwogICAgICAgICBzaXplX3QgY3VycmVu dExpbmVDb3VudCB7IDAgfTsKICAgICAgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBjbGFt cGVkQ29udGVudExvZ2ljYWxIZWlnaHQ7CkBAIC02Nyw3ICs2Nyw3IEBAIHB1YmxpYzoKICAgICAg ICAgLCBtX2Jsb2NrU3RhcnRUcmltbWluZyhWZWN0b3I8Ym9vbD4oMCkpCiAgICAgewogICAgIH0K LSAgICBSZW5kZXJMYXlvdXRTdGF0ZShjb25zdCBMb2NhbEZyYW1lVmlld0xheW91dENvbnRleHQ6 OkxheW91dFN0YXRlU3RhY2smLCBSZW5kZXJCb3gmLCBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXQs IExheW91dFVuaXQgcGFnZUhlaWdodCwgYm9vbCBwYWdlSGVpZ2h0Q2hhbmdlZCwgc3RkOjpvcHRp b25hbDxMaW5lQ2xhbXA+LCBzdGQ6Om9wdGlvbmFsPFRleHRCb3hUcmltPik7CisgICAgUmVuZGVy TGF5b3V0U3RhdGUoY29uc3QgTG9jYWxGcmFtZVZpZXdMYXlvdXRDb250ZXh0OjpMYXlvdXRTdGF0 ZVN0YWNrJiwgUmVuZGVyQm94JiwgY29uc3QgTGF5b3V0U2l6ZSYgb2Zmc2V0LCBMYXlvdXRVbml0 IHBhZ2VIZWlnaHQsIGJvb2wgcGFnZUhlaWdodENoYW5nZWQsIHN0ZDo6b3B0aW9uYWw8TGVnYWN5 TGluZUNsYW1wPiwgc3RkOjpvcHRpb25hbDxUZXh0Qm94VHJpbT4pOwogICAgIGV4cGxpY2l0IFJl bmRlckxheW91dFN0YXRlKFJlbmRlckVsZW1lbnQmKTsKIAogICAgIGJvb2wgaXNQYWdpbmF0ZWQo KSBjb25zdCB7IHJldHVybiBtX2lzUGFnaW5hdGVkOyB9CkBAIC0xMDIsOCArMTAyLDggQEAgcHVi bGljOgogICAgIGJvb2wgbGF5b3V0RGVsdGFNYXRjaGVzKExheW91dFNpemUpIGNvbnN0OwogI2Vu ZGlmCiAKLSAgICB2b2lkIHNldExpbmVDbGFtcChzdGQ6Om9wdGlvbmFsPExpbmVDbGFtcD4gbGlu ZUNsYW1wKSB7IG1fbGluZUNsYW1wID0gbGluZUNsYW1wOyB9Ci0gICAgc3RkOjpvcHRpb25hbDxM aW5lQ2xhbXA+IGxpbmVDbGFtcCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUNsYW1wOyB9CisgICAg dm9pZCBzZXRMZWdhY3lMaW5lQ2xhbXAoc3RkOjpvcHRpb25hbDxMZWdhY3lMaW5lQ2xhbXA+IGxl Z2FjeUxpbmVDbGFtcCkgeyBtX2xlZ2FjeUxpbmVDbGFtcCA9IGxlZ2FjeUxpbmVDbGFtcDsgfQor ICAgIHN0ZDo6b3B0aW9uYWw8TGVnYWN5TGluZUNsYW1wPiBsZWdhY3lMaW5lQ2xhbXAoKSBjb25z dCB7IHJldHVybiBtX2xlZ2FjeUxpbmVDbGFtcDsgfQogCiAgICAgc3RkOjpvcHRpb25hbDxUZXh0 Qm94VHJpbT4gdGV4dEJveFRyaW0oKSB7IHJldHVybiBtX3RleHRCb3hUcmltOyB9CiAgICAgdm9p ZCBzZXRUZXh0Qm94VHJpbShzdGQ6Om9wdGlvbmFsPFRleHRCb3hUcmltPiB0ZXh0Qm94VHJpbSkg eyBtX3RleHRCb3hUcmltID0gdGV4dEJveFRyaW07IH0KQEAgLTE2MSw3ICsxNjEsNyBAQCBwcml2 YXRlOgogICAgIExheW91dFNpemUgbV9wYWdlT2Zmc2V0OwogICAgIExheW91dFNpemUgbV9saW5l R3JpZE9mZnNldDsKICAgICBMYXlvdXRTaXplIG1fbGluZUdyaWRQYWdpbmF0aW9uT3JpZ2luOwot ICAgIHN0ZDo6b3B0aW9uYWw8TGluZUNsYW1wPiBtX2xpbmVDbGFtcDsKKyAgICBzdGQ6Om9wdGlv bmFsPExlZ2FjeUxpbmVDbGFtcD4gbV9sZWdhY3lMaW5lQ2xhbXA7CiAgICAgc3RkOjpvcHRpb25h bDxUZXh0Qm94VHJpbT4gbV90ZXh0Qm94VHJpbTsKICNpZiBBU1NFUlRfRU5BQkxFRAogICAgIFJl bmRlckVsZW1lbnQqIG1fcmVuZGVyZXIgeyBudWxscHRyIH07Cg==