211046 2020-04-26 08:10:43 -0700 [LFC][TFC] Compute and distribute extra vertical space for rows 2020-04-26 09:35:17 -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 1645778 0 zalan 2020-04-26 08:10:43 -0700 ssia 1645781 1 397619 zalan 2020-04-26 08:20:19 -0700 Created attachment 397619 Patch 1645787 2 ews-feeder 2020-04-26 09:34:29 -0700 Committed r260726: <https://trac.webkit.org/changeset/260726> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397619. 1645788 3 webkit-bug-importer 2020-04-26 09:35:17 -0700 <rdar://problem/62398435> 397619 2020-04-26 08:20:19 -0700 2020-04-26 09:34:29 -0700 Patch bug-211046-20200426082019.patch text/plain 4833 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzg0ZDM5M2EyYjc5ZmU3 MzE1M2M1YzEyMGE5NjdhMDJmYTBlZjIyZi4uMzY0MDY3NjcyOTBiZTM0NTcwYzQ5ZDUxYTdiZmVi ZGIxNWMxMWE3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA0LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBDb21wdXRl IGFuZCBkaXN0cmlidXRlIGV4dHJhIHZlcnRpY2FsIHNwYWNlIGZvciByb3dzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTEwNDYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSB0YWJsZSBjb21w dXRlZCBoZWlnaHQgaXMgYmlnZ2VyIHRoYW4gdGhlIHN1bSBvZiB0aGUgcm93IGhlaWd0cywgd2Ug bmVlZCB0byBkaXN0cmlidXRlIHRoZSBleHRyYSB2ZXJ0aWNhbAorICAgICAgICBzcGFjZSBhbW9u ZyB0aGUgbm9uLWZpeGVkIGhlaWdodCByb3dzLiBUaGUgZGlzdHJpYnV0aW9uIGlzIGJhc2VkIG9u IHRoZSBwcmVmZXJyZWQgaGVpZ2h0IG9mIHRob3NlIG5vbi1maXhlZCByb3dzLgorCisgICAgICAg ICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFu ZERpc3RyaWJ1dGVFeHRyYVZlcnRpY2FsU3BhY2UpOgorCiAyMDIwLTA0LTI1ICBaYWxhbiBCdWp0 YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bVEZDXSBBZGQgdmVydGljYWwt YWxpZ246IGJhc2VsaW5lIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmlu ZGV4IDU3MTUxNjk5MDJjNzQwMmUyYTcwMWQ4NzQ1ZDcwN2M2NDhjMmRkOTkuLmQ2YmRiMzUxYWU3 ZDQzOGJjNjNiMjc3MTgxOTc4ZDFhZGI4NDliMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250 ZXh0LmNwcApAQCAtNDkyLDE1ICs0OTIsMTkgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdXRlQW5kRGlzdHJpYnV0ZUV4dHJhSG9yaXpvbnRhbFNwYWNlKExheW91dFVuaXQKICAg ICBjb21wdXRlQ29sdW1uV2lkdGhzKENvbHVtbldpZHRoQmFsYW5jaW5nQmFzZTo6TWluaW11bVdp ZHRoLCBob3Jpem9udGFsU3BhY2VUb0Rpc3RyaWJ1dGUpOwogfQogCi12b2lkIFRhYmxlRm9ybWF0 dGluZ0NvbnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFWZXJ0aWNhbFNwYWNlKExheW91 dFVuaXQgYXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlLCBPcHRpb25hbDxMYXlvdXRVbml0PikKK3Zv aWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1dGVFeHRyYVZlcnRp Y2FsU3BhY2UoTGF5b3V0VW5pdCBhdmFpbGFibGVIb3Jpem9udGFsU3BhY2UsIE9wdGlvbmFsPExh eW91dFVuaXQ+IHZlcnRpY2FsQ29uc3RyYWludCkKIHsKICAgICBhdXRvJiBncmlkID0gZm9ybWF0 dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CiAgICAgYXV0byYgY29sdW1ucyA9IGdyaWQuY29sdW1u cygpLmxpc3QoKTsKICAgICBhdXRvJiByb3dzID0gZ3JpZC5yb3dzKCk7CiAKLSAgICBWZWN0b3I8 TGF5b3V0VW5pdD4gcm93c0hlaWdodDsKKyAgICBWZWN0b3I8ZmxvYXQ+IHJvd3NIZWlnaHQ7CiAg ICAgVmVjdG9yPElubGluZUxheW91dFVuaXQ+IHJvd3NCYXNlbGluZU9mZnNldDsKKyAgICBWZWN0 b3I8Ym9vbD4gaXNGaXhlZFJvd0xpc3Qocm93cy5zaXplKCksIHRydWUpOworICAgIGZsb2F0IHRh YmxlVXNlZEhlaWdodCA9IDA7CisgICAgc2l6ZV90IGZsZXhpYmxlUm93Q291bnQgPSAwOwogICAg IC8vIDEuIENvbGxlY3QgaW5pdGlhbCByb3cgaGVpZ2h0cy4KKyAgICBmbG9hdCBmbGV4aWJsZVNw YWNlID0gMDsKICAgICBmb3IgKHNpemVfdCByb3dJbmRleCA9IDA7IHJvd0luZGV4IDwgcm93cy5z aXplKCk7ICsrcm93SW5kZXgpIHsKICAgICAgICAgYXV0byBtYXhpbXVtQ29sdW1uQXNjZW50ID0g SW5saW5lTGF5b3V0VW5pdCB7IH07CiAgICAgICAgIGF1dG8gbWF4aW11bUNvbHVtbkRlc2NlbnQg PSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKQEAgLTUxOCwxNyArNTIyLDM5IEBAIHZvaWQgVGFibGVG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1dGVFeHRyYVZlcnRpY2FsU3BhY2Uo TGF5b3V0VW5pdCBhCiAgICAgICAgICAgICBtYXhpbXVtQ29sdW1uRGVzY2VudCA9IHN0ZDo6bWF4 KG1heGltdW1Db2x1bW5EZXNjZW50LCBnZW9tZXRyeUZvckJveChjZWxsQm94KS5oZWlnaHQoKSAt IGNlbGwuYmFzZWxpbmVPZmZzZXQoKSk7CiAgICAgICAgIH0KICAgICAgICAgLy8gPHRyIHN0eWxl PSJoZWlnaHQ6IDEwcHgiPiBpcyBjb25zaWRlcmVkIGFzIG1pbiBoZWlnaHQuCi0gICAgICAgIGF1 dG8gY29tcHV0ZWRSb3dIZWlnaHQgPSBnZW9tZXRyeSgpLmNvbXB1dGVkQ29udGVudEhlaWdodChy b3dzLmxpc3QoKVtyb3dJbmRleF0uYm94KCksIHsgfSkudmFsdWVPcihMYXlvdXRVbml0IHsgfSk7 Ci0gICAgICAgIHJvd3NIZWlnaHQuYXBwZW5kKHN0ZDo6bWF4KGNvbXB1dGVkUm93SGVpZ2h0LCBM YXlvdXRVbml0IHsgbWF4aW11bUNvbHVtbkFzY2VudCArIG1heGltdW1Db2x1bW5EZXNjZW50IH0p KTsKKyAgICAgICAgYXV0byBtYXhpbXVtUm93SGVpZ2h0ID0gbWF4aW11bUNvbHVtbkFzY2VudCAr IG1heGltdW1Db2x1bW5EZXNjZW50OworICAgICAgICBpZiAoYXV0byBjb21wdXRlZFJvd0hlaWdo dCA9IGdlb21ldHJ5KCkuY29tcHV0ZWRDb250ZW50SGVpZ2h0KHJvd3MubGlzdCgpW3Jvd0luZGV4 XS5ib3goKSwgeyB9KSkKKyAgICAgICAgICAgIG1heGltdW1Sb3dIZWlnaHQgPSBzdGQ6Om1heChj b21wdXRlZFJvd0hlaWdodC0+dG9GbG9hdCgpLCBtYXhpbXVtUm93SGVpZ2h0KTsKKyAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICBmbGV4aWJsZVNwYWNlICs9IG1heGltdW1Sb3dIZWlnaHQ7Cisg ICAgICAgICAgICArK2ZsZXhpYmxlUm93Q291bnQ7CisgICAgICAgICAgICBpc0ZpeGVkUm93TGlz dFtyb3dJbmRleF0gPSBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICB0YWJsZVVzZWRIZWlnaHQg Kz0gbWF4aW11bVJvd0hlaWdodDsKKyAgICAgICAgcm93c0hlaWdodC5hcHBlbmQobWF4aW11bVJv d0hlaWdodCk7CiAgICAgICAgIHJvd3NCYXNlbGluZU9mZnNldC5hcHBlbmQobWF4aW11bUNvbHVt bkFzY2VudCk7CiAgICAgfQogCisgICAgLy8gRGlzdHJpYnV0ZSBleHRyYSBzcGFjZSBpZiB0aGUg dGFibGUgaXMgc3VwcG9zZWQgdG8gYmUgdGFsbGVyIHRoYW4gdGhlIHN1bSBvZiB0aGUgcm93IGhl aWdodHMuCisgICAgYXV0byBtaW5pbXVtVGFibGVIZWlnaHQgPSB2ZXJ0aWNhbENvbnN0cmFpbnQ7 CisgICAgaWYgKCFtaW5pbXVtVGFibGVIZWlnaHQpCisgICAgICAgIG1pbmltdW1UYWJsZUhlaWdo dCA9IGdlb21ldHJ5KCkuZml4ZWRWYWx1ZShyb290KCkuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkp OworCisgICAgaWYgKG1pbmltdW1UYWJsZUhlaWdodCAmJiAqbWluaW11bVRhYmxlSGVpZ2h0ID4g dGFibGVVc2VkSGVpZ2h0KSB7CisgICAgICAgIGZsb2F0IHNwYWNlVG9EaXN0cmlidXRlID0gc3Rk OjptYXgoMC4wZiwgKm1pbmltdW1UYWJsZUhlaWdodCAtIHRhYmxlVXNlZEhlaWdodCAtICgocm93 cy5zaXplKCkgKyAxKSAqIGdyaWQudmVydGljYWxTcGFjaW5nKCkpKTsKKyAgICAgICAgZm9yIChz aXplX3Qgcm93SW5kZXggPSAwOyByb3dJbmRleCA8IHJvd3Muc2l6ZSgpOyArK3Jvd0luZGV4KSB7 CisgICAgICAgICAgICBpZiAoaXNGaXhlZFJvd0xpc3Rbcm93SW5kZXhdKQorICAgICAgICAgICAg ICAgIGNvbnRpbnVlOworICAgICAgICAgICAgcm93c0hlaWdodFtyb3dJbmRleF0gKz0gc3BhY2VU b0Rpc3RyaWJ1dGUgLyBmbGV4aWJsZVNwYWNlICogcm93c0hlaWdodFtyb3dJbmRleF07CisgICAg ICAgIH0KKyAgICB9CisKICAgICBhdXRvIHJvd0xvZ2ljYWxUb3AgPSBncmlkLnZlcnRpY2FsU3Bh Y2luZygpOwogICAgIGZvciAoc2l6ZV90IHJvd0luZGV4ID0gMDsgcm93SW5kZXggPCByb3dzLnNp emUoKTsgKytyb3dJbmRleCkgewogICAgICAgICBhdXRvJiByb3cgPSBncmlkLnJvd3MoKS5saXN0 KClbcm93SW5kZXhdOwogICAgICAgICBhdXRvIHJvd0hlaWdodCA9IHJvd3NIZWlnaHRbcm93SW5k ZXhdOwogCi0gICAgICAgIHJvdy5zZXRMb2dpY2FsSGVpZ2h0KHJvd0hlaWdodCk7CisgICAgICAg IHJvdy5zZXRMb2dpY2FsSGVpZ2h0KExheW91dFVuaXQgeyByb3dIZWlnaHQgfSk7CiAgICAgICAg IHJvdy5zZXRCYXNlbGluZU9mZnNldChyb3dzQmFzZWxpbmVPZmZzZXRbcm93SW5kZXhdKTsKICAg ICAgICAgcm93LnNldExvZ2ljYWxUb3Aocm93TG9naWNhbFRvcCk7CiAgICAgICAgIHJvd0xvZ2lj YWxUb3AgKz0gcm93SGVpZ2h0ICsgZ3JpZC52ZXJ0aWNhbFNwYWNpbmcoKTsK