212307 2020-05-23 17:07:49 -0700 [LFC][TFC] Take collapsed in-between row border into account when computing cell height 2020-05-24 08:24:12 -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 1655661 0 zalan 2020-05-23 17:07:49 -0700 ssia 1655662 1 400142 zalan 2020-05-23 17:09:54 -0700 Created attachment 400142 Patch 1655730 2 ews-feeder 2020-05-24 08:23:56 -0700 Committed r262106: <https://trac.webkit.org/changeset/262106> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400142. 1655731 3 webkit-bug-importer 2020-05-24 08:24:12 -0700 <rdar://problem/63579316> 400142 2020-05-23 17:09:54 -0700 2020-05-24 08:23:57 -0700 Patch bug-212307-20200523170953.patch text/plain 6227 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQyMmQ1YjJlZGE5NGY5 MGE0YWU5ZjYxN2JlOTU2N2MwZDI2ZTg3Mi4uN2RhNzk2MjY0NTk1YzIzMWE3ZDczOTJmYjE3NGEy MTJkNDg3MGU3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA1LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBUYWtlIGNv bGxhcHNlZCBpbi1iZXR3ZWVuIHJvdyBib3JkZXIgaW50byBhY2NvdW50IHdoZW4gY29tcHV0aW5n IGNlbGwgaGVpZ2h0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTIzMDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1jb2xs YXBzZWQtcm93LWJvcmRlcjIuaHRtbAorCisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGlu Zy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRDZWxsQm9y ZGVyIGNvbnN0KToKKwogMjAyMC0wNS0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdW1RGQ10gVGFrZSByb3cgYm9yZGVyIGludG8gYWNjb3VudCB3aGVu IGNvbXB1dGluZyBjb2xsYXBzZWQgYm9yZGVycy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5n Q29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBmZDBjMGIxMTI4NmRiZTdlMDVlOThkY2MxMmYzODE2 NGJmMzc4NGM1Li5hYjE1YzgzZTdmNTVkOTZjMDk2MTJiYWZlMmE5NDU0MmE1OTZhZWQ2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0 dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxl Zm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC01NCwyOSAr NTQsMzggQEAgRWRnZXMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVk Q2VsbEJvcmRlcihjb25zdCBUYWJsZUdyaWQ6OkNlbGwKIAogICAgIC8vIFdlIG1pZ2h0IHdhbnQg dG8gY2FjaGUgdGhlc2UgY29sbGFwc2VkIGJvcmRlcnMgb24gdGhlIGdyaWQuCiAgICAgYXV0byBj ZWxsUG9zaXRpb24gPSBjZWxsLnBvc2l0aW9uKCk7CisgICAgLy8gQ29sbGFwc2VkIGJvcmRlciBs ZWZ0IGZyb20gdGFibGUgYW5kIGFkamFjZW50IGNlbGxzLgogICAgIGlmICghY2VsbFBvc2l0aW9u LmNvbHVtbikKICAgICAgICAgYm9yZGVyLmhvcml6b250YWwubGVmdCA9IGNvbGxhcHNlZEJvcmRl ci0+aG9yaXpvbnRhbC5sZWZ0IC8gMjsKICAgICBlbHNlIHsKICAgICAgICAgYXV0byBhZGphY2Vu dEJvcmRlclJpZ2h0ID0gY29tcHV0ZWRCb3JkZXIobV9ncmlkLnNsb3QoeyBjZWxsUG9zaXRpb24u Y29sdW1uIC0gMSwgY2VsbFBvc2l0aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jpem9udGFs LnJpZ2h0OwogICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5sZWZ0ID0gc3RkOjptYXgoYm9yZGVy Lmhvcml6b250YWwubGVmdCwgYWRqYWNlbnRCb3JkZXJSaWdodCkgLyAyOwogICAgIH0KKyAgICAv LyBDb2xsYXBzZWQgYm9yZGVyIHJpZ2h0IGZyb20gdGFibGUgYW5kIGFkamFjZW50IGNlbGxzLgog ICAgIGlmIChjZWxsUG9zaXRpb24uY29sdW1uID09IG1fZ3JpZC5jb2x1bW5zKCkuc2l6ZSgpIC0g MSkKICAgICAgICAgYm9yZGVyLmhvcml6b250YWwucmlnaHQgPSBjb2xsYXBzZWRCb3JkZXItPmhv cml6b250YWwucmlnaHQgLyAyOwogICAgIGVsc2UgewogICAgICAgICBhdXRvIGFkamFjZW50Qm9y ZGVyTGVmdCA9IGNvbXB1dGVkQm9yZGVyKG1fZ3JpZC5zbG90KHsgY2VsbFBvc2l0aW9uLmNvbHVt biArIDEsIGNlbGxQb3NpdGlvbi5yb3cgfSktPmNlbGwoKS5ib3goKSkuaG9yaXpvbnRhbC5sZWZ0 OwogICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5yaWdodCA9IHN0ZDo6bWF4KGJvcmRlci5ob3Jp em9udGFsLnJpZ2h0LCBhZGphY2VudEJvcmRlckxlZnQpIC8gMjsKICAgICB9CisgICAgLy8gQ29s bGFwc2VkIGJvcmRlciB0b3AgZnJvbSB0YWJsZSwgcm93IGFuZCBhZGphY2VudCBjZWxscy4KKyAg ICBhdXRvJiByb3dzID0gbV9ncmlkLnJvd3MoKS5saXN0KCk7CiAgICAgaWYgKCFjZWxsUG9zaXRp b24ucm93KQogICAgICAgICBib3JkZXIudmVydGljYWwudG9wID0gY29sbGFwc2VkQm9yZGVyLT52 ZXJ0aWNhbC50b3AgLyAyOwogICAgIGVsc2UgewogICAgICAgICBhdXRvIGFkamFjZW50Qm9yZGVy Qm90dG9tID0gY29tcHV0ZWRCb3JkZXIobV9ncmlkLnNsb3QoeyBjZWxsUG9zaXRpb24uY29sdW1u LCBjZWxsUG9zaXRpb24ucm93IC0gMSB9KS0+Y2VsbCgpLmJveCgpKS52ZXJ0aWNhbC5ib3R0b207 Ci0gICAgICAgIGJvcmRlci52ZXJ0aWNhbC50b3AgPSBzdGQ6Om1heChib3JkZXIudmVydGljYWwu dG9wLCBhZGphY2VudEJvcmRlckJvdHRvbSkgLyAyOworICAgICAgICBhdXRvIGFkamFjZW50Um93 Qm90dG9tID0gY29tcHV0ZWRCb3JkZXIocm93c1tjZWxsUG9zaXRpb24ucm93IC0gMV0uYm94KCkp LnZlcnRpY2FsLmJvdHRvbTsKKyAgICAgICAgYXV0byBhZGphY2VudENvbGxhcHNlZEJvcmRlciA9 IHN0ZDo6bWF4KGFkamFjZW50Qm9yZGVyQm90dG9tLCBhZGphY2VudFJvd0JvdHRvbSk7CisgICAg ICAgIGJvcmRlci52ZXJ0aWNhbC50b3AgPSBzdGQ6Om1heChib3JkZXIudmVydGljYWwudG9wLCBh ZGphY2VudENvbGxhcHNlZEJvcmRlcikgLyAyOwogICAgIH0KKyAgICAvLyBDb2xsYXBzZWQgYm9y ZGVyIGJvdHRvbSBmcm9tIHRhYmxlLCByb3cgYW5kIGFkamFjZW50IGNlbGxzLgogICAgIGlmIChj ZWxsUG9zaXRpb24ucm93ID09IG1fZ3JpZC5yb3dzKCkuc2l6ZSgpIC0gMSkKICAgICAgICAgYm9y ZGVyLnZlcnRpY2FsLmJvdHRvbSA9IGNvbGxhcHNlZEJvcmRlci0+dmVydGljYWwuYm90dG9tIC8g MjsKICAgICBlbHNlIHsKICAgICAgICAgYXV0byBhZGphY2VudEJvcmRlclRvcCA9IGNvbXB1dGVk Qm9yZGVyKG1fZ3JpZC5zbG90KHsgY2VsbFBvc2l0aW9uLmNvbHVtbiwgY2VsbFBvc2l0aW9uLnJv dyArIDEgfSktPmNlbGwoKS5ib3goKSkudmVydGljYWwudG9wOwotICAgICAgICBib3JkZXIudmVy dGljYWwuYm90dG9tID0gc3RkOjptYXgoYm9yZGVyLnZlcnRpY2FsLmJvdHRvbSwgYWRqYWNlbnRC b3JkZXJUb3ApIC8gMjsKKyAgICAgICAgYXV0byBhZGphY2VudFJvd1RvcCA9IGNvbXB1dGVkQm9y ZGVyKHJvd3NbY2VsbFBvc2l0aW9uLnJvdyArIDFdLmJveCgpKS52ZXJ0aWNhbC50b3A7CisgICAg ICAgIGF1dG8gYWRqYWNlbnRDb2xsYXBzZWRCb3JkZXIgPSBzdGQ6Om1heChhZGphY2VudEJvcmRl clRvcCwgYWRqYWNlbnRSb3dUb3ApOworICAgICAgICBib3JkZXIudmVydGljYWwuYm90dG9tID0g c3RkOjptYXgoYm9yZGVyLnZlcnRpY2FsLmJvdHRvbSwgYWRqYWNlbnRDb2xsYXBzZWRCb3JkZXIp IC8gMjsKICAgICB9CiAgICAgcmV0dXJuIGJvcmRlcjsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiM2E2YjYwMDRiYzcx YTAyNGEwNjkzMDMwMWFiYTcyNTZjNjNmOTk0Li44YWRmNTNkMTdhOTFiZmY1Mzc1ZjhkOTYxZDQx NmM0ZjU0NDkzYjlmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDUtMjMgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIFRha2UgY29sbGFw c2VkIGluLWJldHdlZW4gcm93IGJvcmRlciBpbnRvIGFjY291bnQgd2hlbiBjb21wdXRpbmcgY2Vs bCBoZWlnaHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMjMwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUtY29sbGFwc2VkLXJv dy1ib3JkZXIyLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGF5b3V0Zm9y bWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLWNvbGxhcHNlZC1yb3ctYm9yZGVyMi5odG1sOiBB ZGRlZC4KKwogMjAyMC0wNS0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW1RGQ10gVGFrZSByb3cgYm9yZGVyIGludG8gYWNjb3VudCB3aGVuIGNvbXB1 dGluZyBjb2xsYXBzZWQgYm9yZGVycy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5 b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLWNvbGxhcHNlZC1yb3ctYm9yZGVyMi1l eHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90 YWJsZS1zaW1wbGUtY29sbGFwc2VkLXJvdy1ib3JkZXIyLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uMTE2ZTJhOTEzMDM5Njk4OWE2NmY2MjhmOGIyNmJiMmIzNGI5YTRlYQotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2lt cGxlLWNvbGxhcHNlZC1yb3ctYm9yZGVyMi1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTIgQEAK KzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkxheW91 dEZvcm1hdHRpbmdDb250ZXh0RW5hYmxlZD10cnVlIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdD b250ZXh0SW50ZWdyYXRpb25FbmFibGVkPWZhbHNlIF0gLS0+Cis8c3R5bGU+CitkaXYgeworICAg IGhlaWdodDogMjBweDsKKyAgICB3aWR0aDogMjBweDsKKyAgICBib3JkZXI6IDEwcHggc29saWQg Z3JlZW47CisgICAgbWFyZ2luLWJvdHRvbTogLTEwcHg7Cit9Cis8L3N0eWxlPgorPGRpdj48L2Rp dj4KKzxkaXY+PC9kaXY+Cis8ZGl2PjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUtY29sbGFwc2VkLXJvdy1ib3Jk ZXIyLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxl LXNpbXBsZS1jb2xsYXBzZWQtcm93LWJvcmRlcjIuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hYzVmNjA2NGNj OWUwNmQzNTI5MzQ5N2Q2ZmFiY2VhZDBmODcyNDk3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUtY29sbGFwc2Vk LXJvdy1ib3JkZXIyLmh0bWwKQEAgLTAsMCArMSwyMSBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0g d2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFi bGVkPXRydWUgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJs ZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK3RhYmxlIHsKKyAgYm9yZGVyLWNvbGxhcHNlOiBjb2xs YXBzZTsKK30KK3RkIHsKKyAgICB3aWR0aDogMTBweDsKKyAgICBoZWlnaHQ6IDIwcHg7CisgICAg cGFkZGluZzogMHB4OworfQorCit0ciB7CisgICAgYm9yZGVyOiAxMHB4IHNvbGlkIGdyZWVuOwor fQorPC9zdHlsZT4KKzx0YWJsZT4KKzx0cj48dGQ+PC90ZD48dGQ+PC90ZD48L3RyPgorPHRyPjx0 ZD48L3RkPjx0ZD48L3RkPjwvdHI+Cis8dHI+PHRkPjwvdGQ+PHRkPjwvdGQ+PC90cj4KKzwvdGJv ZHk+Cis8L3RhYmxlPgo=