192078 2018-11-28 08:58:38 -0800 [LFC][Quirk] Use non-collapsed vertical margin values when the container is stretched to the size of the ICB. 2018-11-28 09:18:45 -0800 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 1482441 0 zalan 2018-11-28 08:58:38 -0800 ssia 1482442 1 355877 zalan 2018-11-28 09:01:55 -0800 Created attachment 355877 Patch 1482443 2 355877 koivisto 2018-11-28 09:08:13 -0800 Comment on attachment 355877 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355877&action=review > Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp:67 > static HeightAndMargin stretchHeightToInitialContainingBlock(HeightAndMargin heightAndMargin, LayoutUnit initialContainingBlockHeight) > { > - auto verticalMargins = heightAndMargin.margin.top + heightAndMargin.margin.bottom; > + // This quirk happens when the body height is 0 which means its vertical margins collapse through (top and bottom margins are adjoining). > + // However now that we stretch the body they don't collapse through anymore, so we need to use the non-collapsed values instead. > + ASSERT(initialContainingBlockHeight); > + auto verticalMargins = heightAndMargin.height ? heightAndMargin.usedMarginValues() : heightAndMargin.margin; > + auto totalVerticalMargins = verticalMargins.top + verticalMargins.bottom; Could we factor all quirk mode code to a class or namespace or something that says "quirk"? 1482450 3 zalan 2018-11-28 09:17:35 -0800 Committed r238613: <https://trac.webkit.org/changeset/238613> 1482451 4 webkit-bug-importer 2018-11-28 09:18:45 -0800 <rdar://problem/46311589> 355877 2018-11-28 09:01:55 -0800 2018-11-28 09:02:37 -0800 Patch bug-192078-20181128090154.patch text/plain 5846 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWVlMzA4NTc4OTUwN2Vi MzE0ZjVkMTMzYjU4ZTY3NzQzYWQyM2JiYi4uZTRjMzE0NjdiZTY3MGM2N2RkOTZiMGExOGQzNGE4 ZmVlN2Y4MDI3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTExLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bUXVpcmtdIFVzZSBu b24tY29sbGFwc2VkIHZlcnRpY2FsIG1hcmdpbiB2YWx1ZXMgd2hlbiB0aGUgY29udGFpbmVyIGlz IHN0cmV0Y2hlZCB0byB0aGUgc2l6ZSBvZiB0aGUgSUNCLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyMDc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBxdWlyayBoYXBwZW5zIHdoZW4gdGhlIGJv ZHkgaGVpZ2h0IGlzIDAgd2hpY2ggbWVhbnMgaXRzIHZlcnRpY2FsIG1hcmdpbnMgY29sbGFwc2Ug dGhyb3VnaCAodG9wIGFuZCBib3R0b20gbWFyZ2lucyBhcmUgYWRqb2luaW5nKS4KKyAgICAgICAg SG93ZXZlciBub3cgdGhhdCB3ZSBzdHJldGNoIHRoZSBib2R5IHRoZXkgZG9uJ3QgY29sbGFwc2Ug dGhyb3VnaCBhbnltb3JlLCBzbyB3ZSBuZWVkIHRvIHVzZSB0aGUgbm9uLWNvbGxhcHNlZCB2YWx1 ZXMgaW5zdGVhZC4KKworICAgICAgICAqIGxheW91dC9MYXlvdXRVbml0cy5oOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpIZWlnaHRBbmRNYXJnaW46OnVzZWRNYXJnaW5WYWx1ZXMgY29uc3Qp OgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6c3RyZXRjaEhlaWdodFRv SW5pdGlhbENvbnRhaW5pbmdCbG9jayk6CisKIDIwMTgtMTEtMjggIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBBZGQgc3VwcG9ydCBmb3IgcXVpcmsgY29u dGFpbmVyJ3MgY29sbGFwc2luZyB0b3AgbWFyZ2luIGluIHF1aXJrcyBtb2RlLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvTGF5b3V0VW5pdHMuaAppbmRleCAyZDBkOGJlMjFmODMzMTVkMjQ5ZDQ4YmJiM2E0YzE5 ZTljYTI0NTI0Li5jZmU4M2Y1MmM2Nzg3NTk4ZDc4ZmJiM2MyZWRmN2M3ZjI1ZWRlYWYxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMuaApAQCAtMTA2LDYgKzEwNiw4IEBAIHN0cnVjdCBX aWR0aEFuZE1hcmdpbiB7CiB9OwogCiBzdHJ1Y3QgSGVpZ2h0QW5kTWFyZ2luIHsKKyAgICBWZXJ0 aWNhbEVkZ2VzIHVzZWRNYXJnaW5WYWx1ZXMoKSBjb25zdCB7IHJldHVybiBjb2xsYXBzZWRNYXJn aW4udmFsdWVfb3IobWFyZ2luKTsgfQorCiAgICAgTGF5b3V0VW5pdCBoZWlnaHQ7CiAgICAgVmVy dGljYWxFZGdlcyBtYXJnaW47CiAgICAgc3RkOjpvcHRpb25hbDxWZXJ0aWNhbEVkZ2VzPiBjb2xs YXBzZWRNYXJnaW47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5j cHAKaW5kZXggMmJjMzVjYjllOTY1MjRjZTA4NTk1NDM5OGE3NTVkOThiZGQ3MDQyNy4uMjU5Y2U5 M2NmZmQ2Y2JmMDljNTQyN2FjZmQ4MDc4MWYyMTFmMGUzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNjAsMTAgKzYwLDE0IEBAIHN0YXRpYyBi b29sIGlzU3RyZXRjaGVkVG9Jbml0aWFsQ29udGFpbmluZ0Jsb2NrKGNvbnN0IExheW91dFN0YXRl JiBsYXlvdXRTdGF0ZSwKIAogc3RhdGljIEhlaWdodEFuZE1hcmdpbiBzdHJldGNoSGVpZ2h0VG9J bml0aWFsQ29udGFpbmluZ0Jsb2NrKEhlaWdodEFuZE1hcmdpbiBoZWlnaHRBbmRNYXJnaW4sIExh eW91dFVuaXQgaW5pdGlhbENvbnRhaW5pbmdCbG9ja0hlaWdodCkKIHsKLSAgICBhdXRvIHZlcnRp Y2FsTWFyZ2lucyA9IGhlaWdodEFuZE1hcmdpbi5tYXJnaW4udG9wICsgaGVpZ2h0QW5kTWFyZ2lu Lm1hcmdpbi5ib3R0b207CisgICAgLy8gVGhpcyBxdWlyayBoYXBwZW5zIHdoZW4gdGhlIGJvZHkg aGVpZ2h0IGlzIDAgd2hpY2ggbWVhbnMgaXRzIHZlcnRpY2FsIG1hcmdpbnMgY29sbGFwc2UgdGhy b3VnaCAodG9wIGFuZCBib3R0b20gbWFyZ2lucyBhcmUgYWRqb2luaW5nKS4KKyAgICAvLyBIb3dl dmVyIG5vdyB0aGF0IHdlIHN0cmV0Y2ggdGhlIGJvZHkgdGhleSBkb24ndCBjb2xsYXBzZSB0aHJv dWdoIGFueW1vcmUsIHNvIHdlIG5lZWQgdG8gdXNlIHRoZSBub24tY29sbGFwc2VkIHZhbHVlcyBp bnN0ZWFkLgorICAgIEFTU0VSVChpbml0aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0KTsKKyAgICBh dXRvIHZlcnRpY2FsTWFyZ2lucyA9IGhlaWdodEFuZE1hcmdpbi5oZWlnaHQgPyBoZWlnaHRBbmRN YXJnaW4udXNlZE1hcmdpblZhbHVlcygpIDogaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbjsKKyAgICBh dXRvIHRvdGFsVmVydGljYWxNYXJnaW5zID0gdmVydGljYWxNYXJnaW5zLnRvcCArIHZlcnRpY2Fs TWFyZ2lucy5ib3R0b207CiAgICAgLy8gU3RyZXRjaCBidXQgbmV2ZXIgb3ZlcnN0cmV0Y2ggd2l0 aCB0aGUgbWFyZ2lucy4KLSAgICBpZiAoaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCArIHZlcnRpY2Fs TWFyZ2lucyA8IGluaXRpYWxDb250YWluaW5nQmxvY2tIZWlnaHQpCi0gICAgICAgIGhlaWdodEFu ZE1hcmdpbi5oZWlnaHQgPSBpbml0aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gdmVydGljYWxN YXJnaW5zOworICAgIGlmIChoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0ICsgdG90YWxWZXJ0aWNhbE1h cmdpbnMgPCBpbml0aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0KQorICAgICAgICBoZWlnaHRBbmRN YXJnaW4uaGVpZ2h0ID0gaW5pdGlhbENvbnRhaW5pbmdCbG9ja0hlaWdodCAtIHRvdGFsVmVydGlj YWxNYXJnaW5zOwogCiAgICAgcmV0dXJuIGhlaWdodEFuZE1hcmdpbjsKIH0KZGlmZiAtLWdpdCBh L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0OTM3NmNhODk2ODMxNWRj OGQ4ZTRkNzk3OWVjMWQwYmY4NGUwOGE2Li5mMzViMmNlOGIxZWYzMjQyM2UyMDFkMDQ3NDFiNTA1 OGM2MTU0NjRiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTgtMTEtMjggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KKworICAgICAgICBbTEZDXVtRdWlya10gVXNlIG5vbi1jb2xsYXBzZWQgdmVydGlj YWwgbWFyZ2luIHZhbHVlcyB3aGVuIHRoZSBjb250YWluZXIgaXMgc3RyZXRjaGVkIHRvIHRoZSBz aXplIG9mIHRoZSBJQ0IuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTIwNzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIExheW91dFJlbG9hZGVkL21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0OgorCiAy MDE4LTExLTI4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q10gQWRkIHN1cHBvcnQgZm9yIHF1aXJrIGNvbnRhaW5lcidzIGNvbGxhcHNpbmcgdG9wIG1hcmdp biBpbiBxdWlya3MgbW9kZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL21pc2Mv TEZDLXBhc3NpbmctdGVzdHMudHh0IGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvbWlzYy9MRkMtcGFz c2luZy10ZXN0cy50eHQKaW5kZXggODYxOTQzMGRkY2RjNGIzZjM0ZjcyMmY5NDYzNGMyMTMxY2Zj Mjg4OS4uODc1NjhhYjVmMGIyNmM4ZWUwNTZlNTJiYWZhMmRhZTAyMjYwOTcyNiAxMDA2NDQKLS0t IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvbWlzYy9MRkMtcGFzc2luZy10ZXN0cy50eHQKKysrIGIv VG9vbHMvTGF5b3V0UmVsb2FkZWQvbWlzYy9MRkMtcGFzc2luZy10ZXN0cy50eHQKQEAgLTk2LDMg Kzk2LDQzIEBAIGZhc3QvYmxvY2svYmFzaWMvMDA5Lmh0bWwKIGZhc3QvYmxvY2svYmFzaWMvMDEy Lmh0bWwKIGZhc3QvYmxvY2svbWFyZ2luLWNvbGxhcHNlLzAwMi5odG1sCiBmYXN0L2Jsb2NrL21h cmdpbi1jb2xsYXBzZS8wMDMuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMDQuaHRtbAor ZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMDUuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8w MDYuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMDcuaHRtbAorZmFzdC9ibG9jay9wb3Np dGlvbmluZy8wMDguaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMDkuaHRtbAorZmFzdC9i bG9jay9wb3NpdGlvbmluZy8wMTAuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMTEuaHRt bAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMTIuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmlu Zy8wMTMuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMTQuaHRtbAorZmFzdC9ibG9jay9w b3NpdGlvbmluZy8wMTUuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMTYuaHRtbAorZmFz dC9ibG9jay9wb3NpdGlvbmluZy8wMTcuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMTgu aHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMTkuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlv bmluZy8wMjAuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMjEuaHRtbAorZmFzdC9ibG9j ay9wb3NpdGlvbmluZy8wMjIuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMjMuaHRtbAor ZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMjQuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8w MjUuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMzIuaHRtbAorZmFzdC9ibG9jay9wb3Np dGlvbmluZy8wMzMuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMzQuaHRtbAorZmFzdC9i bG9jay9wb3NpdGlvbmluZy8wMzUuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMzYuaHRt bAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMzcuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmlu Zy8wMzguaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMzkuaHRtbAorZmFzdC9ibG9jay9w b3NpdGlvbmluZy8wNDAuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wNDEuaHRtbAorZmFz dC9ibG9jay9wb3NpdGlvbmluZy8wNDIuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wNDMu aHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wNDQuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlv bmluZy8wNDUuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wNDYuaHRtbAorZmFzdC9ibG9j ay9wb3NpdGlvbmluZy8wNDkuaHRtbAorZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wNTIuaHRtbAor ZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wNTQuaHRtbAo=