241056 2022-05-27 20:20:22 -0700 [LFC][FFC] Introduce FlexFormattingContext::computeLogicalHeightForFlexItems 2022-05-28 09:32:13 -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 1872506 0 zalan 2022-05-27 20:20:22 -0700 ssia 1872507 1 459824 zalan 2022-05-27 20:23:41 -0700 Created attachment 459824 [fast-cq]Patch 1872552 2 ews-feeder 2022-05-28 09:31:28 -0700 Committed r295001 (251099@main): <https://commits.webkit.org/251099@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459824. 1872553 3 webkit-bug-importer 2022-05-28 09:32:13 -0700 <rdar://problem/94075655> 459824 2022-05-27 20:23:41 -0700 2022-05-28 09:31:29 -0700 [fast-cq]Patch bug-241056-20220527202340.patch text/plain 7154 zalan RnJvbSBjMjliMDYwMzk1NTU2NDZhYmNjNjBjMTI3MTIwYTI0YjgzNDY4OWM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBG cmksIDI3IE1heSAyMDIyIDIwOjIyOjA3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bRkZD XSBJbnRyb2R1Y2UKIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHRG b3JGbGV4SXRlbXMKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDEw NTYKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBpcyBqdXN0IGEgdmVyeSBiYXNp YyAibGV0J3Mgc3RyZXRjaCB0aGUgZmxleCBpdGVtcyBpbiB0aGUgY3Jvc3MgYXhpcyBkaXJlY3Rp b24iIGNoYW5nZS4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9m bGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OmF2YWlsYWJs ZUxvZ2ljYWxWZXJ0aWNhbFNwYWNlKToKKFdlYkNvcmU6OkxheW91dDo6YXZhaWxhYmxlTG9naWNh bEhvcml6b250YWxTcGFjZSk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhGb3JtYXR0aW5nQ29udGV4 dDo6c2V0RmxleEl0ZW1zR2VvbWV0cnkpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVMb2dpY2FsV2lkdGhGb3JGbGV4SXRlbXMpOgooV2ViQ29yZTo6TGF5 b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0 ZW1zKToKKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZs b3dDb250ZW50Rm9ySW50ZWdyYXRpb24pOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaDoKLS0tCiAuLi4vZmxleC9G bGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwICAgICAgICAgICAgfCA0NiArKysrKysrKysrKysrKysr Ky0tCiAuLi4vZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaCAgICAgICAgICAgICAgfCAgMSAr CiAyIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0Zs ZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA5MWY2YTkxNjgw YzUuLjI5MjcwOWI4YTQ0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29u dGV4dC5jcHAKQEAgLTExOSw2ICsxMTksMjAgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yRmxleEl0ZW1zKCkKICAgICB9CiB9 CiAKK3N0YXRpYyBpbmxpbmUgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBhdmFpbGFibGVMb2dp Y2FsVmVydGljYWxTcGFjZShjb25zdCBDb250YWluZXJCb3gmIHJvb3QsIGNvbnN0IENvbnN0cmFp bnRzRm9yRmxleENvbnRlbnQmIGZsZXhDb25zdHJhaW50cykKK3sKKyAgICBhdXRvIGZsZXhEaXJl Y3Rpb24gPSByb290LnN0eWxlKCkuZmxleERpcmVjdGlvbigpOworICAgIGF1dG8gZmxleERpcmVj dGlvbklzSW5saW5lQXhpcyA9IGZsZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93IHx8 IGZsZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93UmV2ZXJzZTsKKyAgICByZXR1cm4g eyBmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzID8gZmxleENvbnN0cmFpbnRzLmF2YWlsYWJsZVZl cnRpY2FsU3BhY2UoKSA6IHN0ZDo6bWFrZV9vcHRpb25hbChmbGV4Q29uc3RyYWludHMuaG9yaXpv bnRhbCgpLmxvZ2ljYWxXaWR0aCkgfTsKK30KKworc3RhdGljIGlubGluZSBzdGQ6Om9wdGlvbmFs PExheW91dFVuaXQ+IGF2YWlsYWJsZUxvZ2ljYWxIb3Jpem9udGFsU3BhY2UoY29uc3QgQ29udGFp bmVyQm94JiByb290LCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JiBmbGV4Q29uc3Ry YWludHMpCit7CisgICAgYXV0byBmbGV4RGlyZWN0aW9uID0gcm9vdC5zdHlsZSgpLmZsZXhEaXJl Y3Rpb24oKTsKKyAgICBhdXRvIGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPSBmbGV4RGlyZWN0 aW9uID09IEZsZXhEaXJlY3Rpb246OlJvdyB8fCBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rp b246OlJvd1JldmVyc2U7CisgICAgcmV0dXJuIHsgZmxleERpcmVjdGlvbklzSW5saW5lQXhpcyA/ IHN0ZDo6bWFrZV9vcHRpb25hbChmbGV4Q29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxX aWR0aCkgOiBmbGV4Q29uc3RyYWludHMuYXZhaWxhYmxlVmVydGljYWxTcGFjZSgpIH07Cit9CisK IEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6TG9naWNhbEZsZXhJdGVtcyBGbGV4Rm9ybWF0dGluZ0Nv bnRleHQ6OmNvbnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxTcGFjZSgpCiB7CiAgICAgYXV0byYgZm9y bWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7CkBAIC0xOTcsMTAgKzIxMSwx MyBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6c2V0RmxleEl0ZW1zR2VvbWV0cnkoY29u c3QgTG9naWNhbEZsZXhJdGVtcyYgbG9naWNhbAogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IH0KICAgICAgICAgZmxleEl0ZW1HZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b3BMZWZ0KTsK LSAgICAgICAgaWYgKGRpcmVjdGlvbiA9PSBGbGV4RGlyZWN0aW9uOjpSb3cgfHwgZGlyZWN0aW9u ID09IEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2UpCisgICAgICAgIGlmIChkaXJlY3Rpb24gPT0g RmxleERpcmVjdGlvbjo6Um93IHx8IGRpcmVjdGlvbiA9PSBGbGV4RGlyZWN0aW9uOjpSb3dSZXZl cnNlKSB7CiAgICAgICAgICAgICBmbGV4SXRlbUdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0aChs b2dpY2FsRmxleEl0ZW0ucmVjdC53aWR0aCgpIC0gZmxleEl0ZW1HZW9tZXRyeS5ob3Jpem9udGFs TWFyZ2luQm9yZGVyQW5kUGFkZGluZygpKTsKLSAgICAgICAgZWxzZQorICAgICAgICAgICAgZmxl eEl0ZW1HZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGxvZ2ljYWxGbGV4SXRlbS5yZWN0Lmhl aWdodCgpIC0gZmxleEl0ZW1HZW9tZXRyeS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmco KSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBmbGV4SXRlbUdlb21ldHJ5LnNldENv bnRlbnRCb3hXaWR0aChsb2dpY2FsRmxleEl0ZW0ucmVjdC5oZWlnaHQoKSAtIGZsZXhJdGVtR2Vv bWV0cnkuaG9yaXpvbnRhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSk7CiAgICAgICAgICAgICBm bGV4SXRlbUdlb21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQobG9naWNhbEZsZXhJdGVtLnJlY3Qu d2lkdGgoKSAtIGZsZXhJdGVtR2VvbWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5n KCkpOworICAgICAgICB9CiAgICAgfQogfQogCkBAIC0zNDIsOSArMzU5LDcgQEAgdm9pZCBGbGV4 Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTdHJldGNoaW5nRmxleEl0 ZW1zKExvZ2ljYWxGbGUKIAogdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVMb2dp Y2FsV2lkdGhGb3JGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgbG9naWNhbEZsZXhJdGVtTGlz dCwgY29uc3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYgZmxleENvbnN0cmFpbnRzKQogewot ICAgIGF1dG8gZmxleERpcmVjdGlvbiA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsK LSAgICBhdXRvIGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPSBmbGV4RGlyZWN0aW9uID09IEZs ZXhEaXJlY3Rpb246OlJvdyB8fCBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvd1Jl dmVyc2U7Ci0gICAgYXV0byBhdmFpbGFibGVTcGFjZSA9IHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5p dD4geyBmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzID8gc3RkOjptYWtlX29wdGlvbmFsKGZsZXhD b25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFdpZHRoKSA6IGZsZXhDb25zdHJhaW50cy5h dmFpbGFibGVWZXJ0aWNhbFNwYWNlKCkgfTsKKyAgICBhdXRvIGF2YWlsYWJsZVNwYWNlID0gYXZh aWxhYmxlTG9naWNhbEhvcml6b250YWxTcGFjZShyb290KCksIGZsZXhDb25zdHJhaW50cyk7CiAg ICAgYXV0byBjb250ZW50TG9naWNhbFdpZHRoID0gWyZdIHsKICAgICAgICAgYXV0byBsb2dpY2Fs V2lkdGggPSBMYXlvdXRVbml0IHsgfTsKICAgICAgICAgZm9yIChhdXRvJiBsb2dpY2FsRmxleEl0 ZW0gOiBsb2dpY2FsRmxleEl0ZW1MaXN0KQpAQCAtMzYwLDYgKzM3NSwyNiBAQCB2b2lkIEZsZXhG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvckZsZXhJdGVtcyhMb2dpY2Fs RmxleEl0ZW1zJiBsbwogICAgICAgICBjb21wdXRlTG9naWNhbFdpZHRoRm9yU2hyaW5raW5nRmxl eEl0ZW1zKGxvZ2ljYWxGbGV4SXRlbUxpc3QsICphdmFpbGFibGVTcGFjZSk7CiB9CiAKK3ZvaWQg RmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlTG9naWNhbEhlaWdodEZvckZsZXhJdGVtcyhM b2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0LCBjb25zdCBDb25zdHJhaW50c0Zv ckZsZXhDb250ZW50JiBmbGV4Q29uc3RyYWludHMpCit7CisgICAgYXV0byBhdmFpbGFibGVTcGFj ZSA9IGF2YWlsYWJsZUxvZ2ljYWxWZXJ0aWNhbFNwYWNlKHJvb3QoKSwgZmxleENvbnN0cmFpbnRz KTsKKyAgICBhdXRvIGFsaWduSXRlbXMgPSByb290KCkuc3R5bGUoKS5hbGlnbkl0ZW1zKCk7Cisg ICAgZm9yIChhdXRvJiBsb2dpY2FsRmxleEl0ZW0gOiBsb2dpY2FsRmxleEl0ZW1MaXN0KSB7Cisg ICAgICAgIGF1dG8mIGhlaWdodCA9IGxvZ2ljYWxGbGV4SXRlbS5sYXlvdXRCb3gtPnN0eWxlKCku aGVpZ2h0KCk7CisgICAgICAgIGlmICghaGVpZ2h0LmlzQXV0bygpKQorICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgIHN3aXRjaCAoYWxpZ25JdGVtcy5wb3NpdGlvbigpKSB7CisgICAgICAg IGNhc2UgSXRlbVBvc2l0aW9uOjpOb3JtYWw6CisgICAgICAgIGNhc2UgSXRlbVBvc2l0aW9uOjpT dHJldGNoOgorICAgICAgICAgICAgbG9naWNhbEZsZXhJdGVtLnJlY3Quc2V0SGVpZ2h0KCphdmFp bGFibGVTcGFjZSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAg ICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgfQorICAgIH0KK30KKwogdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91 dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0Nv bnRlbnQmIGNvbnN0cmFpbnRzKQogewogICAgIGF1dG8gbG9naWNhbEZsZXhJdGVtTGlzdCA9IGNv bnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxTcGFjZSgpOwpAQCAtMzY5LDYgKzQwNCw3IEBAIHZvaWQg RmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24o Y29uc3QgQ29uc3RyYWludHNGCiAgICAgYXV0byBsb2dpY2FsVG9wID0gTGF5b3V0VW5pdCB7IH07 CiAKICAgICBjb21wdXRlTG9naWNhbFdpZHRoRm9yRmxleEl0ZW1zKGxvZ2ljYWxGbGV4SXRlbUxp c3QsIGZsZXhDb25zdHJhaW50cyk7CisgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4SXRl bXMobG9naWNhbEZsZXhJdGVtTGlzdCwgZmxleENvbnN0cmFpbnRzKTsKIAogICAgIGZvciAoYXV0 byYgbG9naWNhbEZsZXhJdGVtIDogbG9naWNhbEZsZXhJdGVtTGlzdCkgewogICAgICAgICBsb2dp Y2FsRmxleEl0ZW0ucmVjdC5zZXRUb3BMZWZ0KHsgbG9naWNhbExlZnQsIGxvZ2ljYWxUb3AgfSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Zs ZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggZTYwYzZkYTlm Mjc4Li4zNzYzZmEyYmRhN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250 ZXh0LmgKQEAgLTY4LDYgKzY4LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVMb2dpY2Fs V2lkdGhGb3JGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0IENvbnN0cmFpbnRzRm9y RmxleENvbnRlbnQmKTsKICAgICB2b2lkIGNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTdHJldGNoaW5n RmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmLCBMYXlvdXRVbml0IGF2YWlsYWJsZVNwYWNlKTsK ICAgICB2b2lkIGNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTaHJpbmtpbmdGbGV4SXRlbXMoTG9naWNh bEZsZXhJdGVtcyYsIExheW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpOworICAgIHZvaWQgY29tcHV0 ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0IENvbnN0 cmFpbnRzRm9yRmxleENvbnRlbnQmKTsKIAogICAgIGNvbnN0IEZsZXhGb3JtYXR0aW5nU3RhdGUm IGZvcm1hdHRpbmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PEZsZXhGb3JtYXR0aW5n U3RhdGU+KEZvcm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KICAgICBGbGV4 Rm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUoKSB7IHJldHVybiBkb3duY2FzdDxGbGV4 Rm9ybWF0dGluZ1N0YXRlPihGb3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0dGluZ1N0YXRlKCkpOyB9 Ci0tIAoyLjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo=