187220 2018-06-30 08:45:11 -0700 [LFC] If the top and bottom margins of a box are adjoining, then it is possible for margins to collapse through it. 2018-06-30 11:07:18 -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 1438171 0 zalan 2018-06-30 08:45:11 -0700 ssia 1438172 1 344014 zalan 2018-06-30 08:46:52 -0700 Created attachment 344014 Patch 1438177 2 zalan 2018-06-30 11:06:32 -0700 Committed r233398: <https://trac.webkit.org/changeset/233398> 1438178 3 webkit-bug-importer 2018-06-30 11:07:18 -0700 <rdar://problem/41679718> 344014 2018-06-30 08:46:52 -0700 2018-06-30 10:22:24 -0700 Patch bug-187220-20180630084651.patch text/plain 5764 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQ4ZjQxMzkwNDdlMWI2 OGFjMjNlZDYyNGE3YzVlYWI3YmZiZDE0MC4uMzQ2YWVmOGI2NDg4N2I0OTZhMTEwZmU4MzA5ZTUz MDMzYjYwMmQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA2LTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSWYgdGhlIHRvcCBh bmQgYm90dG9tIG1hcmdpbnMgb2YgYSBib3ggYXJlIGFkam9pbmluZywgdGhlbiBpdCBpcyBwb3Nz aWJsZSBmb3IgbWFyZ2lucyB0byBjb2xsYXBzZSB0aHJvdWdoIGl0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MjIwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc01h cmdpbkJvdHRvbUNvbGxhcHNlZFRocm91Z2gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6Y29sbGFwc2VkTWFyZ2luVG9w RnJvbUZpcnN0Q2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luVG9wKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJv dHRvbSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 Ok1hcmdpbkNvbGxhcHNlOjppc01hcmdpbkJvdHRvbUNvbGxhcHNlZFdpdGhQYXJlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xs YXBzZTo6Y29sbGFwc2VkTWFyZ2luQm90dG9tRnJvbUxhc3RDaGlsZCk6CisKIDIwMTgtMDYtMjkg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBXaGVuIHRo ZSBmb3JtYXR0aW5nIHJvb3QgaXMgYWxzbyBhIGNvbnRhaW5pbmcgYmxvY2sgZm9yIG91dC1vZi1m bG93IGVsZW1lbnRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKaW5kZXggNTJkM2NhM2ViZGNk NzY4MjUyZjg4MTE2Yjk3YjRiMWZiNTg5ZGIzMS4uODcwYzRkNjg2ZThlNGU1ZDFiYjRlN2I0MjU4 ODU2ODc1YTlhM2UxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCkBAIC0xMTIsMTYgKzEx Miw0MCBAQCBzdGF0aWMgYm9vbCBpc01hcmdpblRvcENvbGxhcHNlZFdpdGhQYXJlbnQoY29uc3Qg TGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgYwogICAgIHJldHVybiB0cnVlOwogfQogCitz dGF0aWMgYm9vbCBpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFRocm91Z2goY29uc3QgTGF5b3V0Q29u dGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCit7CisgICAgLy8gSWYg dGhlIHRvcCBhbmQgYm90dG9tIG1hcmdpbnMgb2YgYSBib3ggYXJlIGFkam9pbmluZywgdGhlbiBp dCBpcyBwb3NzaWJsZSBmb3IgbWFyZ2lucyB0byBjb2xsYXBzZSB0aHJvdWdoIGl0LgorICAgIGF1 dG8mIGRpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxh eW91dEJveCk7CisKKyAgICBpZiAoZGlzcGxheUJveC5ib3JkZXJUb3AoKSB8fCBkaXNwbGF5Qm94 LmJvcmRlckJvdHRvbSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoZGlzcGxh eUJveC5wYWRkaW5nVG9wKCkgfHwgZGlzcGxheUJveC5wYWRkaW5nQm90dG9tKCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIGlmICghbGF5b3V0Qm94LnN0eWxlKCkuaGVpZ2h0KCkuaXNB dXRvKCkgfHwgIWxheW91dEJveC5zdHlsZSgpLm1pbkhlaWdodCgpLmlzQXV0bygpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWlzPENvbnRhaW5lcj4obGF5b3V0Qm94KSkKKyAg ICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBhdXRvJiBjb250YWluZXIgPSBkb3duY2FzdDxDb250 YWluZXI+KGxheW91dEJveCk7CisgICAgaWYgKGNvbnRhaW5lci5oYXNJbkZsb3dPckZsb2F0aW5n Q2hpbGQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIHRydWU7Cit9CisK IExheW91dFVuaXQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OmNvbGxh cHNlZE1hcmdpblRvcEZyb21GaXJzdENoaWxkKGNvbnN0IExheW91dENvbnRleHQmIGxheW91dENv bnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQogewogICAgIC8vIENoZWNrIGlmIHRoZSBmaXJz dCBjaGlsZCBjb2xsYXBzZXMgaXRzIG1hcmdpbiB0b3AuCiAgICAgaWYgKCFpczxDb250YWluZXI+ KGxheW91dEJveCkgfHwgIWRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94KS5oYXNJbkZsb3dD aGlsZCgpKQogICAgICAgICByZXR1cm4gMDsKIAorICAgIC8vIEZJWE1FOiBUYWtlIGNvbGxhcHNl ZCB0aHJvdWdoIG1hcmdpbiBpbnRvIGFjY291bnQuCiAgICAgYXV0byYgZmlyc3RJbkZsb3dDaGls ZCA9ICpkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuZmlyc3RJbkZsb3dDaGlsZCgpOwog ICAgIGlmICghaXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoUGFyZW50KGxheW91dENvbnRleHQsIGZp cnN0SW5GbG93Q2hpbGQpKQogICAgICAgICByZXR1cm4gMDsKLQogICAgIC8vIENvbGxlY3QgY29s bGFwc2VkIG1hcmdpbiB0b3AgcmVjdXJzaXZlbHkuCiAgICAgcmV0dXJuIG1hcmdpblZhbHVlKGNv bXB1dGVkTm9uQ29sbGFwc2VkTWFyZ2luVG9wKGxheW91dENvbnRleHQsIGZpcnN0SW5GbG93Q2hp bGQpLCBjb2xsYXBzZWRNYXJnaW5Ub3BGcm9tRmlyc3RDaGlsZChsYXlvdXRDb250ZXh0LCBmaXJz dEluRmxvd0NoaWxkKSk7CiB9CkBAIC0xNjUsOSArMTg5LDE0IEBAIExheW91dFVuaXQgQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpblRvcChjb25zdCBMYXlvdXRD b250ZXh0CiAgICAgaWYgKGlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFBhcmVudChsYXlvdXRDb250 ZXh0LCBsYXlvdXRCb3gpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIC8vIEZsb2F0cyBhbmQg b3V0IG9mIGZsb3cgcG9zaXRpb25lZCBib3hlcyBkbyBub3QgY29sbGFwc2UgdGhlaXIgbWFyZ2lu cy4KLSAgICBpZiAoIWlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFNpYmxpbmcobGF5b3V0Qm94KSkK LSAgICAgICAgcmV0dXJuIG5vbkNvbGxhcHNlZE1hcmdpblRvcChsYXlvdXRDb250ZXh0LCBsYXlv dXRCb3gpOworICAgIGlmICghaXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoU2libGluZyhsYXlvdXRC b3gpKSB7CisgICAgICAgIGlmICghaXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRUaHJvdWdoKGxheW91 dENvbnRleHQsIGxheW91dEJveCkpCisgICAgICAgICAgICByZXR1cm4gbm9uQ29sbGFwc2VkTWFy Z2luVG9wKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CisgICAgICAgIC8vIENvbXB1dGUgdGhl IGNvbGxhcHNlZCB0aHJvdWdoIHZhbHVlLgorICAgICAgICBhdXRvIG1hcmdpblRvcCA9IG5vbkNv bGxhcHNlZE1hcmdpblRvcChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOworICAgICAgICBhdXRv IG1hcmdpbkJvdHRvbSA9IG5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbShsYXlvdXRDb250ZXh0LCBs YXlvdXRCb3gpOyAKKyAgICAgICAgcmV0dXJuIG1hcmdpblZhbHVlKG1hcmdpblRvcCwgbWFyZ2lu Qm90dG9tKTsKKyAgICB9CiAKICAgICAvLyBUaGUgYm90dG9tIG1hcmdpbiBvZiBhbiBpbi1mbG93 IGJsb2NrLWxldmVsIGVsZW1lbnQgYWx3YXlzIGNvbGxhcHNlcyB3aXRoIHRoZSB0b3AgbWFyZ2lu IG9mIGl0cyBuZXh0IGluLWZsb3cgYmxvY2stbGV2ZWwgc2libGluZywKICAgICAvLyB1bmxlc3Mg dGhhdCBzaWJsaW5nIGhhcyBjbGVhcmFuY2UuCkBAIC0xODYsNyArMjE1LDEwIEBAIExheW91dFVu aXQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJvdHRvbShj b25zdCBMYXlvdXRDb250CiAgICAgICAgIHJldHVybiAwOwogCiAgICAgLy8gVE9ETzogdGFrZSBf aGFzQWRqb2luaW5nTWFyZ2luVG9wQW5kQm90dG9tKCkgaW50byBhY2NvdW50LgotICAgIGlmIChC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5Cb3R0b21Db2xs YXBzZWRXaXRoUGFyZW50KGxheW91dENvbnRleHQsIGxheW91dEJveCkpCisgICAgaWYgKGlzTWFy Z2luQm90dG9tQ29sbGFwc2VkV2l0aFBhcmVudChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpKQor ICAgICAgICByZXR1cm4gMDsKKworICAgIGlmIChpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFRocm91 Z2gobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAv LyBGbG9hdHMgYW5kIG91dCBvZiBmbG93IHBvc2l0aW9uZWQgYm94ZXMgZG8gbm90IGNvbGxhcHNl IHRoZWlyIG1hcmdpbnMuCkBAIC0yMTAsNiArMjQyLDkgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoUGFyZW50 KGMKICAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKGlzTWFyZ2luQm90dG9tQ29sbGFwc2Vk VGhyb3VnaChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKICAgICAvLyBXZSBuZXZlciBtYXJnaW4gY29sbGFwc2UgdGhlIGluaXRpYWwgY29udGFpbmlu ZyBibG9jay4KICAgICBBU1NFUlQobGF5b3V0Qm94LnBhcmVudCgpKTsKICAgICBhdXRvJiBwYXJl bnQgPSAqbGF5b3V0Qm94LnBhcmVudCgpOwpAQCAtMjQ4LDYgKzI4Myw3IEBAIExheW91dFVuaXQg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OmNvbGxhcHNlZE1hcmdpbkJv dHRvbUZyb21MYXN0CiAgICAgaWYgKCFpczxDb250YWluZXI+KGxheW91dEJveCkgfHwgIWRvd25j YXN0PENvbnRhaW5lcj4obGF5b3V0Qm94KS5oYXNJbkZsb3dDaGlsZCgpKQogICAgICAgICByZXR1 cm4gMDsKIAorICAgIC8vIEZJWE1FOiBDaGVjayBmb3IgY29sbGFwc2VkIHRocm91Z2ggbWFyZ2lu LgogICAgIGF1dG8mIGxhc3RJbkZsb3dDaGlsZCA9ICpkb3duY2FzdDxDb250YWluZXI+KGxheW91 dEJveCkubGFzdEluRmxvd0NoaWxkKCk7CiAgICAgaWYgKCFpc01hcmdpbkJvdHRvbUNvbGxhcHNl ZFdpdGhQYXJlbnQobGF5b3V0Q29udGV4dCwgbGFzdEluRmxvd0NoaWxkKSkKICAgICAgICAgcmV0 dXJuIDA7Cg==