279310 2024-09-07 20:03:16 -0700 [Cleanup] There's only one type of -webkit-line-clamp left (modern) 2024-09-08 14:27:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 279110 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 2058421 0 zalan 2024-09-07 20:03:16 -0700 ssia 2058422 1 472489 zalan 2024-09-07 20:08:21 -0700 Created attachment 472489 [fast-cq]Patch 2058497 2 ews-feeder 2024-09-08 14:26:10 -0700 Committed 283319@main (1aec6508802b): <https://commits.webkit.org/283319@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 472489. 2058498 3 webkit-bug-importer 2024-09-08 14:27:13 -0700 <rdar://problem/135515341> 472489 2024-09-07 20:08:21 -0700 2024-09-08 14:26:11 -0700 [fast-cq]Patch bug-279310-20240907200820.patch text/plain 7369 zalan RnJvbSA0Y2FjZGYzYjM0YzQ4ZTJjN2FlNDIwZDRiZjllNGNjMzQ5N2RkYmQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgNyBTZXAgMjAyNCAyMDowMzoyMiAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtDbGVhbnVw XSBUaGVyZSdzIG9ubHkgb25lIHR5cGUgb2YgLXdlYmtpdC1saW5lLWNsYW1wIGxlZnQKIChtb2Rl cm4pIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzkzMTAKClJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKTW92ZSA6Om1vZGVybkxpbmVDbGFtcCB0byBhcHBseUxp bmVDbGFtcC4KCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4 aWJsZUJveC5jcHA6CihXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5 TGluZUNsYW1wKToKKFdlYkNvcmU6OlJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlN b2Rlcm5MaW5lQ2xhbXApOiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJEZXByZWNhdGVkRmxleGlibGVCb3guaDoKLS0tCiAuLi4vcmVuZGVyaW5nL1JlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveC5jcHAgfCA2NyArKysrKysrLS0tLS0tLS0tLS0tCiAuLi4vcmVuZGVy aW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5oICAgfCAgMyArLQogMiBmaWxlcyBjaGFu Z2VkLCAyNCBpbnNlcnRpb25zKCspLCA0NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCmlu ZGV4IDBiMzAxM2JjYjc5ZS4uYmFkOGYyZjY2ZjY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcApAQCAtNzEx LDcgKzcxMSw3IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0 aWNhbEJveChib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgLy8gV2UgY29uZmluZSB0aGUgbGlu ZSBjbGFtcCB1Z2xpbmVzcyB0byB2ZXJ0aWNhbCBmbGV4aWJsZSBib3hlcyAodGh1cyBrZWVwaW5n IGl0IG91dCBvZgogICAgIC8vIG1haW5zdHJlYW0gYmxvY2sgbGF5b3V0KTsgdGhpcyBpcyBub3Qg cmVhbGx5IHBhcnQgb2YgdGhlIFhVTCBib3ggbW9kZWwuCiAgICAgYm9vbCBoYXZlTGluZUNsYW1w ID0gIXN0eWxlKCkubGluZUNsYW1wKCkuaXNOb25lKCk7Ci0gICAgYXV0byBjbGFtcGVkQ29udGVu dCA9IHN0ZDo6b3B0aW9uYWw8Q2xhbXBlZENvbnRlbnQ+IHsgfTsKKyAgICBhdXRvIGNsYW1wZWRD b250ZW50ID0gQ2xhbXBlZENvbnRlbnQgeyB9OwogICAgIGlmIChoYXZlTGluZUNsYW1wKQogICAg ICAgICBjbGFtcGVkQ29udGVudCA9IGFwcGx5TGluZUNsYW1wKGl0ZXJhdG9yLCByZWxheW91dENo aWxkcmVuKTsKIApAQCAtOTMzLDkgKzkzMyw5IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhp YmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJveChib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgLy8g YSBoZWlnaHQgY2hhbmdlLCB3ZSByZXZlcnQgb3VyIGhlaWdodCBiYWNrIHRvIHRoZSBpbnRyaW5z aWMgaGVpZ2h0IGJlZm9yZSByZXR1cm5pbmcuCiAgICAgaWYgKGhlaWdodFNwZWNpZmllZCkKICAg ICAgICAgc2V0SGVpZ2h0KG9sZEhlaWdodCk7Ci0gICAgZWxzZSBpZiAoY2xhbXBlZENvbnRlbnQg JiYgY2xhbXBlZENvbnRlbnQtPnJlbmRlcmVyKSB7CisgICAgZWxzZSBpZiAoaGF2ZUxpbmVDbGFt cCAmJiBjbGFtcGVkQ29udGVudC5yZW5kZXJlcikgewogICAgICAgICBhdXRvIGNvbnRlbnRPZmZz ZXQgPSBbJl0gewotICAgICAgICAgICAgYXV0byogY2xhbXBlZFJlbmRlcmVyID0gY2xhbXBlZENv bnRlbnQtPnJlbmRlcmVyLmdldCgpOworICAgICAgICAgICAgYXV0byogY2xhbXBlZFJlbmRlcmVy ID0gY2xhbXBlZENvbnRlbnQucmVuZGVyZXIuZ2V0KCk7CiAgICAgICAgICAgICBhdXRvIGNvbnRl bnRMb2dpY2FsVG9wID0gY2xhbXBlZFJlbmRlcmVyLT5sb2dpY2FsVG9wKCkgKyBjbGFtcGVkUmVu ZGVyZXItPmNvbnRlbnRCb3hMb2NhdGlvbigpLnkoKTsKICAgICAgICAgICAgIGZvciAoYXV0byog YW5jZXN0b3IgPSBjbGFtcGVkUmVuZGVyZXItPmNvbnRhaW5pbmdCbG9jaygpOyBhbmNlc3Rvcjsg YW5jZXN0b3IgPSBhbmNlc3Rvci0+Y29udGFpbmluZ0Jsb2NrKCkpIHsKICAgICAgICAgICAgICAg ICBpZiAoYW5jZXN0b3IgPT0gdGhpcykKQEAgLTk0NSw3ICs5NDUsNyBAQCB2b2lkIFJlbmRlckRl cHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0VmVydGljYWxCb3goYm9vbCByZWxheW91dENoaWxk cmVuKQogICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICByZXR1 cm4gY29udGVudEJveExvY2F0aW9uKCkueSgpOwogICAgICAgICB9OwotICAgICAgICBzZXRIZWln aHQoY29udGVudE9mZnNldCgpICsgY2xhbXBlZENvbnRlbnQtPmNvbnRlbnRIZWlnaHQgKyBib3Jk ZXJCb3R0b20oKSArIHBhZGRpbmdCb3R0b20oKSk7CisgICAgICAgIHNldEhlaWdodChjb250ZW50 T2Zmc2V0KCkgKyBjbGFtcGVkQ29udGVudC5jb250ZW50SGVpZ2h0ICsgYm9yZGVyQm90dG9tKCkg KyBwYWRkaW5nQm90dG9tKCkpOwogICAgIH0KIH0KIApAQCAtOTYzLDIzICs5NjMsMjUgQEAgc3Rh dGljIHNpemVfdCBsaW5lQ291bnRGb3IoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3cp CiAgICAgcmV0dXJuIGNvdW50OwogfQogCi1zdGQ6Om9wdGlvbmFsPFJlbmRlckRlcHJlY2F0ZWRG bGV4aWJsZUJveDo6Q2xhbXBlZENvbnRlbnQ+IFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6 YXBwbHlNb2Rlcm5MaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvcikKK1JlbmRlckRl cHJlY2F0ZWRGbGV4aWJsZUJveDo6Q2xhbXBlZENvbnRlbnQgUmVuZGVyRGVwcmVjYXRlZEZsZXhp YmxlQm94OjphcHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0b3ImIGl0ZXJhdG9yLCBib29sIHJl bGF5b3V0Q2hpbGRyZW4pCiB7Ci0gICAgYXV0byogZmlyc3RCbG9ja0Zsb3dXaXRoSW5saW5lQ2hp bGRyZW4gPSBbJl0gKCkgLT4gUmVuZGVyQmxvY2tGbG93KiB7Ci0gICAgICAgIGZvciAoYXV0byYg ZGVzY2VuZGFudCA6IGRlc2NlbmRhbnRzT2ZUeXBlPFJlbmRlckJsb2NrRmxvdz4oKnRoaXMpKSB7 Ci0gICAgICAgICAgICBpZiAoZGVzY2VuZGFudC5maXJzdEluRmxvd0NoaWxkKCkgJiYgZGVzY2Vu ZGFudC5jaGlsZHJlbklubGluZSgpKQotICAgICAgICAgICAgICAgIHJldHVybiAmZGVzY2VuZGFu dDsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICB9KCk7Ci0gICAgaWYg KCFmaXJzdEJsb2NrRmxvd1dpdGhJbmxpbmVDaGlsZHJlbikKLSAgICAgICAgcmV0dXJuIHsgfTsK KyAgICBhdXRvIGluaXRpYWxpemUgPSBbJl0geworICAgICAgICBmb3IgKFJlbmRlckJveCogY2hp bGQgPSBpdGVyYXRvci5maXJzdCgpOyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCkpIHsK KyAgICAgICAgICAgIGlmIChjaGlsZERvZXNOb3RBZmZlY3RXaWR0aE9yRmxleGluZyhjaGlsZCkp CisgICAgICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAvLyBJZiB0aGUgZmlyc3QgYmxvY2sg d2l0aCBpbmxpbmUgY29udGVudCBzdXBwb3J0cyBtb2Rlcm4gbGluZSBsYXlvdXQsIGFsbCBzaWJs aW5ncyAoYW5kIGRlc2NlbmRhbnRzKSBkbyBhcyB3ZWxsLgotICAgIC8vIHNlZSBMYXlvdXRJbnRl Z3JhdGlvbkNvdmVyYWdlOjpjYW5Vc2VGb3JTdHlsZS4KLSAgICBmaXJzdEJsb2NrRmxvd1dpdGhJ bmxpbmVDaGlsZHJlbi0+Y29tcHV0ZUFuZFNldExpbmVMYXlvdXRQYXRoKCk7Ci0gICAgaWYgKGZp cnN0QmxvY2tGbG93V2l0aElubGluZUNoaWxkcmVuLT5saW5lTGF5b3V0UGF0aCgpICE9IFJlbmRl ckJsb2NrRmxvdzo6SW5saW5lUGF0aCkKLSAgICAgICAgcmV0dXJuIHsgfTsKKyAgICAgICAgICAg IGNoaWxkLT5jbGVhck92ZXJyaWRpbmdDb250ZW50U2l6ZSgpOworICAgICAgICAgICAgaWYgKHJl bGF5b3V0Q2hpbGRyZW4gfHwgKGNoaWxkLT5pc1JlcGxhY2VkT3JJbmxpbmVCbG9jaygpICYmIChj aGlsZC0+c3R5bGUoKS53aWR0aCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpIHx8IGNoaWxkLT5z dHlsZSgpLmhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKSkKKyAgICAgICAgICAgICAg ICB8fCAoY2hpbGQtPnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgJiYgaXM8UmVuZGVyQmxvY2tG bG93PigqY2hpbGQpKSkgeworICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRDaGlsZE5lZWRzTGF5 b3V0KE1hcmtPbmx5VGhpcyk7CisKKyAgICAgICAgICAgICAgICAvLyBEaXJ0eSBhbGwgdGhlIHBv c2l0aW9uZWQgb2JqZWN0cy4KKyAgICAgICAgICAgICAgICBpZiAoQ2hlY2tlZFB0ciBibG9ja0Zs b3cgPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PigqY2hpbGQpKQorICAgICAgICAg ICAgICAgICAgICBibG9ja0Zsb3ctPm1hcmtQb3NpdGlvbmVkT2JqZWN0c0ZvckxheW91dCgpOwor ICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfTsKKyAgICBpbml0aWFsaXplKCk7CiAKICAg ICBhdXRvJiBsYXlvdXRTdGF0ZSA9ICp2aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4dCgp LmxheW91dFN0YXRlKCk7CiAgICAgYXV0byBhbmNlc3RvckxpbmVDbGFtcCA9IGxheW91dFN0YXRl LmxlZ2FjeUxpbmVDbGFtcCgpOwpAQCAtMTAxNywzMiArMTAxOSw5IEBAIHN0ZDo6b3B0aW9uYWw8 UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpDbGFtcGVkQ29udGVudD4gUmVuZGVyRGVwcmVj YXRlZEZsZXhpCiAgICAgYXV0byBsaW5lQ2xhbXAgPSAqbGF5b3V0U3RhdGUubGVnYWN5TGluZUNs YW1wKCk7CiAgICAgaWYgKCFsaW5lQ2xhbXAuY2xhbXBlZENvbnRlbnRMb2dpY2FsSGVpZ2h0KSB7 CiAgICAgICAgIC8vIFdlJ3ZlIG1hbmFnZWQgdG8gcnVuIGxpbmUgY2xhbXBpbmcgYnV0IGl0IGNh bWUgYmFjayB3aXRoIG5vIGNsYW1wZWQgY29udGVudCAoaS5lLiB0aGVyZSBhcmUgZmV3ZXIgbGlu ZXMgdGhhbiB0aGUgbGluZS1jbGFtcCBsaW1pdCkuCi0gICAgICAgIHJldHVybiBSZW5kZXJEZXBy ZWNhdGVkRmxleGlibGVCb3g6OkNsYW1wZWRDb250ZW50IHsgfTsKLSAgICB9Ci0gICAgcmV0dXJu IFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6Q2xhbXBlZENvbnRlbnQgeyAqbGluZUNsYW1w LmNsYW1wZWRDb250ZW50TG9naWNhbEhlaWdodCwgbGluZUNsYW1wLmNsYW1wZWRSZW5kZXJlciB9 OwotfQotCi1zdGQ6Om9wdGlvbmFsPFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6Q2xhbXBl ZENvbnRlbnQ+IFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXAoRmxl eEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbCByZWxheW91dENoaWxkcmVuKQotewotICAgIGZv ciAoUmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7IGNoaWxkOyBjaGlsZCA9IGl0 ZXJhdG9yLm5leHQoKSkgewotICAgICAgICBpZiAoY2hpbGREb2VzTm90QWZmZWN0V2lkdGhPckZs ZXhpbmcoY2hpbGQpKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgY2hpbGQtPmNs ZWFyT3ZlcnJpZGluZ0NvbnRlbnRTaXplKCk7Ci0gICAgICAgIGlmIChyZWxheW91dENoaWxkcmVu IHx8IChjaGlsZC0+aXNSZXBsYWNlZE9ySW5saW5lQmxvY2soKSAmJiAoY2hpbGQtPnN0eWxlKCku d2lkdGgoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSB8fCBjaGlsZC0+c3R5bGUoKS5oZWlnaHQo KS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSkpCi0gICAgICAgICAgICB8fCAoY2hpbGQtPnN0eWxl KCkuaGVpZ2h0KCkuaXNBdXRvKCkgJiYgaXM8UmVuZGVyQmxvY2tGbG93PigqY2hpbGQpKSkgewot ICAgICAgICAgICAgY2hpbGQtPnNldENoaWxkTmVlZHNMYXlvdXQoTWFya09ubHlUaGlzKTsKLQot ICAgICAgICAgICAgLy8gRGlydHkgYWxsIHRoZSBwb3NpdGlvbmVkIG9iamVjdHMuCi0gICAgICAg ICAgICBpZiAoQ2hlY2tlZFB0ciBibG9ja0Zsb3cgPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVyQmxv Y2tGbG93PigqY2hpbGQpKQotICAgICAgICAgICAgICAgIGJsb2NrRmxvdy0+bWFya1Bvc2l0aW9u ZWRPYmplY3RzRm9yTGF5b3V0KCk7Ci0gICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHsgfTsKICAg ICB9Ci0KLSAgICBpZiAoYXV0byBjbGFtcGVkQ29udGVudCA9IGFwcGx5TW9kZXJuTGluZUNsYW1w KGl0ZXJhdG9yKSkKLSAgICAgICAgcmV0dXJuIGNsYW1wZWRDb250ZW50OwotCi0gICAgcmV0dXJu IHsgfTsKKyAgICByZXR1cm4geyAqbGluZUNsYW1wLmNsYW1wZWRDb250ZW50TG9naWNhbEhlaWdo dCwgbGluZUNsYW1wLmNsYW1wZWRSZW5kZXJlciB9OwogfQogCiB2b2lkIFJlbmRlckRlcHJlY2F0 ZWRGbGV4aWJsZUJveDo6Y2xlYXJMaW5lQ2xhbXAoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5oCmluZGV4IDRmMTlkMjQ2 YTBiZi4uYTM5MDUwNzRhYzkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5oCkBAIC02NSw4ICs2NSw3IEBAIHByaXZh dGU6CiAgICAgICAgIExheW91dFVuaXQgY29udGVudEhlaWdodDsKICAgICAgICAgU2luZ2xlVGhy ZWFkV2Vha1B0cjxjb25zdCBSZW5kZXJCbG9ja0Zsb3c+IHJlbmRlcmVyOwogICAgIH07Ci0gICAg c3RkOjpvcHRpb25hbDxDbGFtcGVkQ29udGVudD4gYXBwbHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJh dG9yJiwgYm9vbCByZWxheW91dENoaWxkcmVuKTsKLSAgICBzdGQ6Om9wdGlvbmFsPENsYW1wZWRD b250ZW50PiBhcHBseU1vZGVybkxpbmVDbGFtcChGbGV4Qm94SXRlcmF0b3ImKTsKKyAgICBDbGFt cGVkQ29udGVudCBhcHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0b3ImLCBib29sIHJlbGF5b3V0 Q2hpbGRyZW4pOwogICAgIHZvaWQgY2xlYXJMaW5lQ2xhbXAoKTsKIAogICAgIGJvb2wgbV9zdHJl dGNoaW5nQ2hpbGRyZW47Cg==