211275 2020-04-30 20:14:39 -0700 [LFC][TFC] Introduce struct RowHeight in TableFormattingContext::computeAndDistributeExtraVerticalSpace 2020-05-01 07:38:16 -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 1647735 0 zalan 2020-04-30 20:14:39 -0700 this is in preparation for space distribution across row spans 1647743 1 398153 zalan 2020-04-30 20:31:38 -0700 Created attachment 398153 Patch 1647842 2 ews-feeder 2020-05-01 07:37:30 -0700 Committed r260998: <https://trac.webkit.org/changeset/260998> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398153. 1647843 3 webkit-bug-importer 2020-05-01 07:38:16 -0700 <rdar://problem/62725266> 398153 2020-04-30 20:31:38 -0700 2020-05-01 07:37:31 -0700 Patch bug-211275-20200430203137.patch text/plain 5155 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY0ZWEwMDU4OWRjMmI1 ODZjZDIzZDNkYWFlMTRhMGQwOTlmOWU2YS4uMjM0ZDQ4ZjU5ZjM1YmQyMzUxZDBiMTFkNThjZGJl MWM4MWQ4MjYzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA0LTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBJbnRyb2R1 Y2Ugc3RydWN0IFJvd0hlaWdodCBpbiBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlQW5k RGlzdHJpYnV0ZUV4dHJhVmVydGljYWxTcGFjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgYXZhaWxhYmxl IHNwYWNlIGRpc3RyaWJ1dGlvbiBhY3Jvc3Mgcm93IHNwYW5zLgorCisgICAgICAgICogbGF5b3V0 L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1 dGVFeHRyYVZlcnRpY2FsU3BhY2UpOgorCiAyMDIwLTA0LTI5ICBaYWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bVEZDXSBBZGp1c3QgdGhlIGF2YWlsYWJsZSB2 ZXJ0aWNhbCBzcGFjZSB3aXRoIHRoZSByb3cgc3BhbiBmb3IgY2VsbCBsYXlvdXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5n Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxl Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGRlYWRkNTJmNTY1Nzk3OTg2YzYyNjdmMDIyMjVh MWIxMmUxMzRiMDEuLmY1ZjllOGRmZmM3NzEzNDVhYWEzYTRhNDQ4ODM2OGJmMTgxYjgxMjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3Jt YXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0 dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNTAyLDExICs1MDIsMTQgQEAgdm9p ZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlQW5kRGlzdHJpYnV0ZUV4dHJhVmVydGlj YWxTcGFjZShMYXlvdXRVbml0IGEKICAgICBhdXRvJiBjb2x1bW5zID0gZ3JpZC5jb2x1bW5zKCku bGlzdCgpOwogICAgIGF1dG8mIHJvd3MgPSBncmlkLnJvd3MoKTsKIAotICAgIFZlY3RvcjxmbG9h dD4gcm93c0hlaWdodDsKLSAgICBWZWN0b3I8SW5saW5lTGF5b3V0VW5pdD4gcm93c0Jhc2VsaW5l T2Zmc2V0OwotICAgIFZlY3Rvcjxib29sPiBpc0ZpeGVkUm93TGlzdChyb3dzLnNpemUoKSwgdHJ1 ZSk7CisgICAgc3RydWN0IFJvd0hlaWdodCB7CisgICAgICAgIGZsb2F0IHZhbHVlIHsgMCB9Owor ICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lT2Zmc2V0IHsgMCB9OworICAgICAgICBi b29sIGlzRml4ZWQgeyBmYWxzZSB9OworICAgIH07CisgICAgVmVjdG9yPFJvd0hlaWdodD4gcm93 SGVpZ2h0KHJvd3Muc2l6ZSgpKTsKKyAgICBWZWN0b3I8U2xvdFBvc2l0aW9uPiBzcGFubmluZ1Jv d1Bvc2l0aW9uTGlzdDsKICAgICBmbG9hdCB0YWJsZVVzZWRIZWlnaHQgPSAwOwotICAgIHNpemVf dCBmbGV4aWJsZVJvd0NvdW50ID0gMDsKICAgICAvLyAxLiBDb2xsZWN0IGluaXRpYWwgcm93IGhl aWdodHMuCiAgICAgZmxvYXQgZmxleGlibGVTcGFjZSA9IDA7CiAgICAgZm9yIChzaXplX3Qgcm93 SW5kZXggPSAwOyByb3dJbmRleCA8IHJvd3Muc2l6ZSgpOyArK3Jvd0luZGV4KSB7CkBAIC01MTQs NyArNTE3LDcgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlQW5kRGlzdHJp YnV0ZUV4dHJhVmVydGljYWxTcGFjZShMYXlvdXRVbml0IGEKICAgICAgICAgYXV0byBtYXhpbXVt Q29sdW1uRGVzY2VudCA9IElubGluZUxheW91dFVuaXQgeyB9OwogICAgICAgICBmb3IgKHNpemVf dCBjb2x1bW5JbmRleCA9IDA7IGNvbHVtbkluZGV4IDwgY29sdW1ucy5zaXplKCk7ICsrY29sdW1u SW5kZXgpIHsKICAgICAgICAgICAgIGF1dG8mIHNsb3QgPSAqZ3JpZC5zbG90KHsgY29sdW1uSW5k ZXgsIHJvd0luZGV4IH0pOwotICAgICAgICAgICAgaWYgKHNsb3QuaXNDb2x1bW5TcGFubmVkKCkp CisgICAgICAgICAgICBpZiAoc2xvdC5pc1Jvd1NwYW5uZWQoKSkKICAgICAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgICAgIGxheW91dENlbGwoc2xvdC5jZWxsKCksIGF2YWlsYWJsZUhv cml6b250YWxTcGFjZSk7CiAgICAgICAgICAgICAvLyBUaGUgbWluaW11bSBoZWlnaHQgb2YgYSBy b3cgKHdpdGhvdXQgc3Bhbm5pbmctcmVsYXRlZCBoZWlnaHQgZGlzdHJpYnV0aW9uKSBpcyBkZWZp bmVkIGFzIHRoZSBoZWlnaHQgb2YgYW4gaHlwb3RoZXRpY2FsCkBAIC01MjgsMTUgKzUzMSwxMiBA QCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFW ZXJ0aWNhbFNwYWNlKExheW91dFVuaXQgYQogICAgICAgICAvLyA8dHIgc3R5bGU9ImhlaWdodDog MTBweCI+IGlzIGNvbnNpZGVyZWQgYXMgbWluIGhlaWdodC4KICAgICAgICAgYXV0byBtYXhpbXVt Um93SGVpZ2h0ID0gbWF4aW11bUNvbHVtbkFzY2VudCArIG1heGltdW1Db2x1bW5EZXNjZW50Owog ICAgICAgICBpZiAoYXV0byBjb21wdXRlZFJvd0hlaWdodCA9IGdlb21ldHJ5KCkuY29tcHV0ZWRD b250ZW50SGVpZ2h0KHJvd3MubGlzdCgpW3Jvd0luZGV4XS5ib3goKSwgeyB9KSkKLSAgICAgICAg ICAgIG1heGltdW1Sb3dIZWlnaHQgPSBzdGQ6Om1heChjb21wdXRlZFJvd0hlaWdodC0+dG9GbG9h dCgpLCBtYXhpbXVtUm93SGVpZ2h0KTsKKyAgICAgICAgICAgIHJvd0hlaWdodFtyb3dJbmRleF0g PSB7IHN0ZDo6bWF4KGNvbXB1dGVkUm93SGVpZ2h0LT50b0Zsb2F0KCksIG1heGltdW1Sb3dIZWln aHQpLCBtYXhpbXVtQ29sdW1uQXNjZW50LCB0cnVlIH07CiAgICAgICAgIGVsc2UgewogICAgICAg ICAgICAgZmxleGlibGVTcGFjZSArPSBtYXhpbXVtUm93SGVpZ2h0OwotICAgICAgICAgICAgKytm bGV4aWJsZVJvd0NvdW50OwotICAgICAgICAgICAgaXNGaXhlZFJvd0xpc3Rbcm93SW5kZXhdID0g ZmFsc2U7CisgICAgICAgICAgICByb3dIZWlnaHRbcm93SW5kZXhdID0geyBtYXhpbXVtUm93SGVp Z2h0LCBtYXhpbXVtQ29sdW1uQXNjZW50LCBmYWxzZSB9OwogICAgICAgICB9CiAgICAgICAgIHRh YmxlVXNlZEhlaWdodCArPSBtYXhpbXVtUm93SGVpZ2h0OwotICAgICAgICByb3dzSGVpZ2h0LmFw cGVuZChtYXhpbXVtUm93SGVpZ2h0KTsKLSAgICAgICAgcm93c0Jhc2VsaW5lT2Zmc2V0LmFwcGVu ZChtYXhpbXVtQ29sdW1uQXNjZW50KTsKICAgICB9CiAKICAgICAvLyBEaXN0cmlidXRlIGV4dHJh IHNwYWNlIGlmIHRoZSB0YWJsZSBpcyBzdXBwb3NlZCB0byBiZSB0YWxsZXIgdGhhbiB0aGUgc3Vt IG9mIHRoZSByb3cgaGVpZ2h0cy4KQEAgLTU0NywyMSArNTQ3LDIxIEBAIHZvaWQgVGFibGVGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1dGVFeHRyYVZlcnRpY2FsU3BhY2UoTGF5 b3V0VW5pdCBhCiAgICAgaWYgKG1pbmltdW1UYWJsZUhlaWdodCAmJiAqbWluaW11bVRhYmxlSGVp Z2h0ID4gdGFibGVVc2VkSGVpZ2h0KSB7CiAgICAgICAgIGZsb2F0IHNwYWNlVG9EaXN0cmlidXRl ID0gc3RkOjptYXgoMC4wZiwgKm1pbmltdW1UYWJsZUhlaWdodCAtIHRhYmxlVXNlZEhlaWdodCAt ICgocm93cy5zaXplKCkgKyAxKSAqIGdyaWQudmVydGljYWxTcGFjaW5nKCkpKTsKICAgICAgICAg Zm9yIChzaXplX3Qgcm93SW5kZXggPSAwOyByb3dJbmRleCA8IHJvd3Muc2l6ZSgpOyArK3Jvd0lu ZGV4KSB7Ci0gICAgICAgICAgICBpZiAoaXNGaXhlZFJvd0xpc3Rbcm93SW5kZXhdKQorICAgICAg ICAgICAgaWYgKHJvd0hlaWdodFtyb3dJbmRleF0uaXNGaXhlZCkKICAgICAgICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgICAgIHJvd3NIZWlnaHRbcm93SW5kZXhdICs9IHNwYWNlVG9EaXN0 cmlidXRlIC8gZmxleGlibGVTcGFjZSAqIHJvd3NIZWlnaHRbcm93SW5kZXhdOworICAgICAgICAg ICAgcm93SGVpZ2h0W3Jvd0luZGV4XS52YWx1ZSArPSBzcGFjZVRvRGlzdHJpYnV0ZSAvIGZsZXhp YmxlU3BhY2UgKiByb3dIZWlnaHRbcm93SW5kZXhdLnZhbHVlOwogICAgICAgICB9CiAgICAgfQog CiAgICAgYXV0byByb3dMb2dpY2FsVG9wID0gZ3JpZC52ZXJ0aWNhbFNwYWNpbmcoKTsKICAgICBm b3IgKHNpemVfdCByb3dJbmRleCA9IDA7IHJvd0luZGV4IDwgcm93cy5zaXplKCk7ICsrcm93SW5k ZXgpIHsKICAgICAgICAgYXV0byYgcm93ID0gZ3JpZC5yb3dzKCkubGlzdCgpW3Jvd0luZGV4XTsK LSAgICAgICAgYXV0byByb3dIZWlnaHQgPSByb3dzSGVpZ2h0W3Jvd0luZGV4XTsKKyAgICAgICAg YXV0byByb3dVc2VkSGVpZ2h0ID0gTGF5b3V0VW5pdCB7IHJvd0hlaWdodFtyb3dJbmRleF0udmFs dWUgfTsKIAotICAgICAgICByb3cuc2V0TG9naWNhbEhlaWdodChMYXlvdXRVbml0IHsgcm93SGVp Z2h0IH0pOwotICAgICAgICByb3cuc2V0QmFzZWxpbmVPZmZzZXQocm93c0Jhc2VsaW5lT2Zmc2V0 W3Jvd0luZGV4XSk7CisgICAgICAgIHJvdy5zZXRMb2dpY2FsSGVpZ2h0KHJvd1VzZWRIZWlnaHQp OworICAgICAgICByb3cuc2V0QmFzZWxpbmVPZmZzZXQocm93SGVpZ2h0W3Jvd0luZGV4XS5iYXNl bGluZU9mZnNldCk7CiAgICAgICAgIHJvdy5zZXRMb2dpY2FsVG9wKHJvd0xvZ2ljYWxUb3ApOwot ICAgICAgICByb3dMb2dpY2FsVG9wICs9IHJvd0hlaWdodCArIGdyaWQudmVydGljYWxTcGFjaW5n KCk7CisgICAgICAgIHJvd0xvZ2ljYWxUb3AgKz0gcm93VXNlZEhlaWdodCArIGdyaWQudmVydGlj YWxTcGFjaW5nKCk7CiAgICAgfQogfQogCg==