241057 2022-05-27 21:52:08 -0700 [LFC][FFC] Transition flex-grow computation to flex-basis based 2022-05-28 11:19:51 -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 1872517 0 zalan 2022-05-27 21:52:08 -0700 ssia 1872518 1 459825 zalan 2022-05-27 21:56:13 -0700 Created attachment 459825 [fast-cq]Patch 1872519 2 459825 koivisto 2022-05-27 22:07:02 -0700 Comment on attachment 459825 [fast-cq]Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459825&action=review > Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp:299 > + struct StrechingFlexItem { very similar to ShrinkingFlexItem 1872547 3 zalan 2022-05-28 07:54:02 -0700 (In reply to Antti Koivisto from comment #2) > Comment on attachment 459825 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=459825&action=review > > > Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp:299 > > + struct StrechingFlexItem { > > very similar to ShrinkingFlexItem Yeah, they may converge soon. 1872550 4 ews-feeder 2022-05-28 09:19:03 -0700 Committed r295000 (251098@main): <https://commits.webkit.org/251098@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459825. 1872551 5 webkit-bug-importer 2022-05-28 09:20:14 -0700 <rdar://problem/94075540> 459825 2022-05-27 21:56:13 -0700 2022-05-28 11:19:51 -0700 [fast-cq]Patch bug-241057-20220527215612.patch text/plain 7115 zalan RnJvbSBkYjJhNzhmOGE5NWQ0NTlkN2Y4MWI3NDAxMzFlZDczZjM2NGViNGFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBG cmksIDI3IE1heSAyMDIyIDIxOjUyOjI3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bRkZD XSBUcmFuc2l0aW9uIGZsZXgtZ3JvdyBjb21wdXRhdGlvbiB0byBmbGV4LWJhc2lzCiBiYXNlZCBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxMDU3CgpSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KCjEuIEludHJvZHVjZSBTdHJlY2hpbmdGbGV4SXRlbSB0byBjYWNo ZSBncm93dGggcmVsYXRlZCB2YWx1ZXMKMi4gVXNlIGZsZXgtYmFzaXMgYXMgdGhlIGJhc2UgZm9y IHRoZSBmbGV4IGdyb3cgY29tcHV0YXRpb24KMy4gQ29tcHV0ZSB0aGUgZmluYWwgbG9naWNhbCB3 aWR0aCB2YWx1ZXMKKFRoaXMgaXMgdmVyeSBzaW1pbGFyIHRvIGhvdyB3ZSBjb21wdXRlICJzaHJp bmsgdmFsdWVzIi4pCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv ZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTaHJpbmtpbmdGbGV4SXRlbXMp OgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVMb2dpY2Fs V2lkdGhGb3JTdHJldGNoaW5nRmxleEl0ZW1zKToKLS0tCiAuLi4vZmxleC9GbGV4Rm9ybWF0dGlu Z0NvbnRleHQuY3BwICAgICAgICAgICAgfCA3NSArKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgMzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0 aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAyOTI3MDliOGE0NGMuLmU4YzQ4 MzI1NmUyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAK QEAgLTI0MSw4ICsyNDEsNyBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxv Z2ljYWxXaWR0aEZvclNocmlua2luZ0ZsZXhJdGVtcyhMb2dpY2FsRmxleAogICAgIGF1dG8gY29t cHV0ZVRvdGFsU2hyaW5rQW5kT3ZlcmZsb3dpbmdTcGFjZSA9IFsmXSB7CiAgICAgICAgIC8vIENv bGxlY3QgZmxleCBpdGVtcyB3aXRoIG5vbi16ZXJvIGZsZXgtc2hyaW5rIHZhbHVlLiBmbGV4LXNo cmluazogMCBmbGV4IGl0ZW1zCiAgICAgICAgIC8vIGRvbid0IHBhcnRpY2lwYXRlIGluIGNvbnRl bnQgZmxleGluZy4KLSAgICAgICAgZm9yIChzaXplX3QgaW5kZXggPSAwOyBpbmRleCA8IGxvZ2lj YWxGbGV4SXRlbUxpc3Quc2l6ZSgpOyArK2luZGV4KSB7Ci0gICAgICAgICAgICBhdXRvJiBmbGV4 SXRlbSA9IGxvZ2ljYWxGbGV4SXRlbUxpc3RbaW5kZXhdOworICAgICAgICBmb3IgKGF1dG8mIGZs ZXhJdGVtIDogbG9naWNhbEZsZXhJdGVtTGlzdCkgewogICAgICAgICAgICAgYXV0byYgc3R5bGUg PSBmbGV4SXRlbS5sYXlvdXRCb3gtPnN0eWxlKCk7CiAgICAgICAgICAgICBhdXRvIGJhc2VTaXpl ID0gc3R5bGUuZmxleEJhc2lzKCkuaXNGaXhlZCgpID8gTGF5b3V0VW5pdCB7IHN0eWxlLmZsZXhC YXNpcygpLnZhbHVlKCkgfSA6IGZsZXhJdGVtLnJlY3Qud2lkdGgoKTsKICAgICAgICAgICAgIGlm IChhdXRvIHNocmlua1ZhbHVlID0gc3R5bGUuZmxleFNocmluaygpKSB7CkBAIC0yOTQsNjQgKzI5 Myw2OCBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZv clN0cmV0Y2hpbmdGbGV4SXRlbXMoTG9naWNhbEZsZQogewogICAgIGF1dG8mIGZvcm1hdHRpbmdT dGF0ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgpOwogCisgICAgYXV0byB0b3RhbEZsZXhpYmxl U3BhY2UgPSBMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIHRvdGFsR3Jvd3RoID0gMC5mOwogICAg IGF1dG8gZmxleEdyb3dCYXNlID0gMC5mOwotICAgIFZlY3RvcjxzaXplX3Q+IHN0cmV0Y2hpbmdJ dGVtczsKKyAgICBzdHJ1Y3QgU3RyZWNoaW5nRmxleEl0ZW0geworICAgICAgICBmbG9hdCBmbGV4 R3JvdyB7IDAgfTsKKyAgICAgICAgTGF5b3V0VW5pdCBtaW5pbXVtU2l6ZTsKKyAgICAgICAgTGF5 b3V0VW5pdCBmbGV4QmFzaXM7CisgICAgICAgIExvZ2ljYWxGbGV4SXRlbSYgZmxleEl0ZW07Cisg ICAgICAgIGJvb2wgaXNGcm96ZW4geyBmYWxzZSB9OworICAgIH07CisgICAgVmVjdG9yPFN0cmVj aGluZ0ZsZXhJdGVtPiBzdHJldGNoaW5nSXRlbXM7CiAKICAgICBhdXRvIGNvbXB1dGVUb3RhbEdy b3d0aEFuZEZsZXhpYmxlU3BhY2UgPSBbJl0gewogICAgICAgICAvLyBDb2xsZWN0IGZsZXggaXRl bXMgd2l0aCBub24temVybyBmbGV4LWdyb3cgdmFsdWUuIGZsZXgtZ3JvdzogMCAoaW5pdGlhbCkg ZmxleCBpdGVtcwogICAgICAgICAvLyBkb24ndCBwYXJ0aWNpcGF0ZSBpbiBhdmFpbGFibGUgc3Bh Y2UgZGlzdHJpYnV0aW9uLgotICAgICAgICBmb3IgKHNpemVfdCBpbmRleCA9IDA7IGluZGV4IDwg bG9naWNhbEZsZXhJdGVtTGlzdC5zaXplKCk7ICsraW5kZXgpIHsKLSAgICAgICAgICAgIGF1dG8m IGxvZ2ljYWxGbGV4SXRlbSA9IGxvZ2ljYWxGbGV4SXRlbUxpc3RbaW5kZXhdOwotICAgICAgICAg ICAgaWYgKGF1dG8gZmxleEdyb3cgPSBsb2dpY2FsRmxleEl0ZW0ubGF5b3V0Qm94LT5zdHlsZSgp LmZsZXhHcm93KCkpIHsKLSAgICAgICAgICAgICAgICBzdHJldGNoaW5nSXRlbXMuYXBwZW5kKGlu ZGV4KTsKKyAgICAgICAgZm9yIChhdXRvJiBmbGV4SXRlbSA6IGxvZ2ljYWxGbGV4SXRlbUxpc3Qp IHsKKyAgICAgICAgICAgIGF1dG8mIHN0eWxlID0gZmxleEl0ZW0ubGF5b3V0Qm94LT5zdHlsZSgp OworICAgICAgICAgICAgYXV0byBiYXNlU2l6ZSA9IHN0eWxlLmZsZXhCYXNpcygpLmlzRml4ZWQo KSA/IExheW91dFVuaXQgeyBzdHlsZS5mbGV4QmFzaXMoKS52YWx1ZSgpIH0gOiBmbGV4SXRlbS5y ZWN0LndpZHRoKCk7CisgICAgICAgICAgICBpZiAoYXV0byBncm93VmFsdWUgPSBzdHlsZS5mbGV4 R3JvdygpKSB7CisgICAgICAgICAgICAgICAgYXV0byBmbGV4R3JvdyA9IGdyb3dWYWx1ZSAqIGJh c2VTaXplOworICAgICAgICAgICAgICAgIHN0cmV0Y2hpbmdJdGVtcy5hcHBlbmQoeyBmbGV4R3Jv dywgZm9ybWF0dGluZ1N0YXRlLmludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JCb3goKmZsZXhJ dGVtLmxheW91dEJveCktPm1pbmltdW0sIGJhc2VTaXplLCBmbGV4SXRlbSwgeyB9IH0pOwogICAg ICAgICAgICAgICAgIHRvdGFsR3Jvd3RoICs9IGZsZXhHcm93OworICAgICAgICAgICAgICAgIHRv dGFsRmxleGlibGVTcGFjZSArPSBiYXNlU2l6ZTsKICAgICAgICAgICAgIH0gZWxzZQotICAgICAg ICAgICAgICAgIGF2YWlsYWJsZVNwYWNlIC09IGxvZ2ljYWxGbGV4SXRlbS5yZWN0LndpZHRoKCk7 CisgICAgICAgICAgICAgICAgYXZhaWxhYmxlU3BhY2UgLT0gYmFzZVNpemU7CiAgICAgICAgIH0K ICAgICAgICAgaWYgKHRvdGFsR3Jvd3RoKQotICAgICAgICAgICAgZmxleEdyb3dCYXNlID0gYXZh aWxhYmxlU3BhY2UgLyB0b3RhbEdyb3d0aDsKKyAgICAgICAgICAgIGZsZXhHcm93QmFzZSA9IChh dmFpbGFibGVTcGFjZSAtIHRvdGFsRmxleGlibGVTcGFjZSkgLyB0b3RhbEdyb3d0aDsKICAgICB9 OwogICAgIGNvbXB1dGVUb3RhbEdyb3d0aEFuZEZsZXhpYmxlU3BhY2UoKTsKICAgICBpZiAoIXRv dGFsR3Jvd3RoKQogICAgICAgICByZXR1cm47CiAKLSAgICBhdXRvIHRvdGFsTG9naWNhbFdpZHRo ID0gWyZdIHsKKyAgICBhdXRvIGFkanVzdEdyb3d0aEJhc2UgPSBbJl0gewogICAgICAgICAvLyBU aGlzIGlzIHdoZXJlIHdlIGNvbXB1dGUgaG93IG11Y2ggc3BhY2UgdGhlIGZsZXhpbmcgYm94ZXMg dGFrZSB1cCBpZiB3ZSBqdXN0CiAgICAgICAgIC8vIGxldCB0aGVtIGZsZXggYnkgdGhlaXIgZmxl eC1ncm93IHZhbHVlLiBOb3RlIHRoYXQgd2UgY2FuJ3Qgc2l6ZSB0aGVtIGJlbG93IHRoZWlyIG1p bmltdW0gY29udGVudCB3aWR0aC4KICAgICAgICAgLy8gU3VjaCBmbGV4IGl0ZW1zIGFyZSByZW1v dmVkIGZyb20gdGhlIGZpbmFsIG92ZXJmbG93IGRpc3RyaWJ1dGlvbi4KICAgICAgICAgYXV0byBh Y2N1bXVsYXRlZFdpZHRoID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgICAgIGZvciAoYXV0byBmbGV4 SXRlbUluZGV4IDogc3RyZXRjaGluZ0l0ZW1zKSB7Ci0gICAgICAgICAgICBhdXRvJiBmbGV4SXRl bSA9IGxvZ2ljYWxGbGV4SXRlbUxpc3RbZmxleEl0ZW1JbmRleF07Ci0KLSAgICAgICAgICAgIGF1 dG8gZmxleEdyb3cgPSBmbGV4SXRlbS5sYXlvdXRCb3gtPnN0eWxlKCkuZmxleEdyb3coKTsKLSAg ICAgICAgICAgIGF1dG8gZmxleGVkU2l6ZSA9IGZsZXhHcm93ICogZmxleEdyb3dCYXNlOwotICAg ICAgICAgICAgYXV0byBtaW5pbXVtU2l6ZSA9IGZvcm1hdHRpbmdTdGF0ZS5pbnRyaW5zaWNXaWR0 aENvbnN0cmFpbnRzRm9yQm94KCpmbGV4SXRlbS5sYXlvdXRCb3gpLT5taW5pbXVtOwotICAgICAg ICAgICAgaWYgKG1pbmltdW1TaXplID49IGZsZXhlZFNpemUpIHsKLSAgICAgICAgICAgICAgICBh Y2N1bXVsYXRlZFdpZHRoICs9IG1pbmltdW1TaXplOwotICAgICAgICAgICAgICAgIHRvdGFsR3Jv d3RoIC09IGZsZXhHcm93OwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgYWNj dW11bGF0ZWRXaWR0aCArPSBmbGV4ZWRTaXplOworICAgICAgICB3aGlsZSAodHJ1ZSkgeworICAg ICAgICAgICAgYXV0byBkaWRGcmVlemUgPSBmYWxzZTsKKyAgICAgICAgICAgIGZvciAoYXV0byYg c3RyZXRjaGluZ0ZsZXggOiBzdHJldGNoaW5nSXRlbXMpIHsKKyAgICAgICAgICAgICAgICBhdXRv IGZsZXhlZFNpemUgPSBzdHJldGNoaW5nRmxleC5mbGV4QmFzaXMgKyBzdHJldGNoaW5nRmxleC5m bGV4R3JvdyAqIGZsZXhHcm93QmFzZTsKKyAgICAgICAgICAgICAgICBpZiAoc3RyZXRjaGluZ0Zs ZXgubWluaW11bVNpemUgPj0gZmxleGVkU2l6ZSkgeworICAgICAgICAgICAgICAgICAgICBzdHJl dGNoaW5nRmxleC5pc0Zyb3plbiA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIGRpZEZyZWV6 ZSA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIHRvdGFsR3Jvd3RoIC09IHN0cmV0Y2hpbmdG bGV4LmZsZXhHcm93OworICAgICAgICAgICAgICAgICAgICB0b3RhbEZsZXhpYmxlU3BhY2UgLT0g c3RyZXRjaGluZ0ZsZXguZmxleEJhc2lzOworICAgICAgICAgICAgICAgICAgICBhdmFpbGFibGVT cGFjZSAtPSBzdHJldGNoaW5nRmxleC5taW5pbXVtU2l6ZTsKKyAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoIWRpZEZyZWV6ZSkKKyAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgIGZsZXhHcm93QmFzZSA9IHRvdGFsR3Jvd3RoID8gKHRvdGFs RmxleGlibGVTcGFjZSAtIGF2YWlsYWJsZVNwYWNlKSAvIHRvdGFsR3Jvd3RoIDogMC5mOwogICAg ICAgICB9Ci0gICAgICAgIHJldHVybiBhY2N1bXVsYXRlZFdpZHRoOwogICAgIH07Ci0gICAgYXV0 byBvdmVyZmxvd1dpZHRoID0gdG90YWxMb2dpY2FsV2lkdGgoKSAtIGF2YWlsYWJsZVNwYWNlOwot ICAgIEFTU0VSVChvdmVyZmxvd1dpZHRoID49IDApOworICAgIGFkanVzdEdyb3d0aEJhc2UoKTsK IAogICAgIGF1dG8gY29tcHV0ZUxvZ2ljYWxXaWR0aCA9IFsmXSB7CiAgICAgICAgIC8vIEFkanVz dCB0aGUgdG90YWwgZ3JvdyB3aWR0aCBieSB0aGUgb3ZlcmZsb3cgdmFsdWUgKHNocmluaykgZXhj ZXB0IHdoZW4gbWluIGNvbnRlbnQgd2l0aCBkaXNhZ3JlZXMuCi0gICAgICAgIGZvciAoYXV0byBm bGV4SXRlbUluZGV4IDogc3RyZXRjaGluZ0l0ZW1zKSB7Ci0gICAgICAgICAgICBhdXRvJiBmbGV4 SXRlbSA9IGxvZ2ljYWxGbGV4SXRlbUxpc3RbZmxleEl0ZW1JbmRleF07Ci0KLSAgICAgICAgICAg IGF1dG8gZmxleEdyb3cgPSBmbGV4SXRlbS5sYXlvdXRCb3gtPnN0eWxlKCkuZmxleEdyb3coKTsK LSAgICAgICAgICAgIGF1dG8gZmxleGVkU2l6ZSA9IGZsZXhHcm93ICogZmxleEdyb3dCYXNlOwot ICAgICAgICAgICAgYXV0byBtaW5pbXVtU2l6ZSA9IGZvcm1hdHRpbmdTdGF0ZS5pbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzRm9yQm94KCpmbGV4SXRlbS5sYXlvdXRCb3gpLT5taW5pbXVtOwotICAg ICAgICAgICAgaWYgKG1pbmltdW1TaXplID49IGZsZXhlZFNpemUpCi0gICAgICAgICAgICAgICAg ZmxleEl0ZW0ucmVjdC5zZXRXaWR0aChtaW5pbXVtU2l6ZSk7Ci0gICAgICAgICAgICBlbHNlIHsK LSAgICAgICAgICAgICAgICBhdXRvIGRpc3RyaWJ1dGVkT3ZlcmZsb3cgPSBvdmVyZmxvd1dpZHRo IC8gdG90YWxHcm93dGggKiBmbGV4R3JvdzsKLSAgICAgICAgICAgICAgICBmbGV4SXRlbS5yZWN0 LnNldFdpZHRoKHN0ZDo6bWF4KG1pbmltdW1TaXplLCBMYXlvdXRVbml0IHsgZmxleGVkU2l6ZSAt IGRpc3RyaWJ1dGVkT3ZlcmZsb3cgfSkpOwotICAgICAgICAgICAgfQorICAgICAgICBmb3IgKGF1 dG8mIHN0cmV0Y2hpbmdGbGV4IDogc3RyZXRjaGluZ0l0ZW1zKSB7CisgICAgICAgICAgICBhdXRv IGZsZXhlZFNpemUgPSBMYXlvdXRVbml0IHsgc3RyZXRjaGluZ0ZsZXguZmxleEJhc2lzICsgKHN0 cmV0Y2hpbmdGbGV4LmZsZXhHcm93ICogZmxleEdyb3dCYXNlKSB9OworICAgICAgICAgICAgc3Ry ZXRjaGluZ0ZsZXguZmxleEl0ZW0ucmVjdC5zZXRXaWR0aChzdGQ6Om1heChzdHJldGNoaW5nRmxl eC5taW5pbXVtU2l6ZSwgZmxleGVkU2l6ZSkpOwogICAgICAgICB9CiAgICAgfTsKICAgICBjb21w dXRlTG9naWNhbFdpZHRoKCk7Ci0tIAoyLjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo=