192787 2018-12-17 16:36:41 -0800 [LFC][BFC][MarginCollapsing] Expand marginAfterCollapsesWithParentMarginAfter and marginBeforeCollapsesWithParentMarginBefore collapsing logic 2018-12-18 07:20:33 -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 1488665 0 zalan 2018-12-17 16:36:41 -0800 ssia 1488667 1 357499 zalan 2018-12-17 16:37:50 -0800 Created attachment 357499 Patch 1488871 2 zalan 2018-12-18 07:19:28 -0800 Committed r239330: <https://trac.webkit.org/changeset/239330> 1488872 3 webkit-bug-importer 2018-12-18 07:20:33 -0800 <rdar://problem/46809732> 357499 2018-12-17 16:37:50 -0800 2018-12-18 03:54:11 -0800 Patch Patch.txt text/plain 6639 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxZmZiNDc5NWFiMy4uMWJkZGJhZmNmNmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOC0xMi0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10gRXhwYW5kIG1hcmdpbkFmdGVy Q29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyIGFuZCBtYXJnaW5CZWZvcmVDb2xsYXBzZXNX aXRoUGFyZW50TWFyZ2luQmVmb3JlIGNvbGxhcHNpbmcgbG9naWMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mjc4NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6aGFz Q2xlYXJhbmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRo UGFyZW50TWFyZ2luQmVmb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5BZnRlckNvbGxh cHNlc1dpdGhTaWJsaW5nTWFyZ2luQmVmb3JlV2l0aENsZWFyYW5jZSk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xs YXBzZTo6bWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2luQmVmb3JlKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1h cmdpbkNvbGxhcHNlOjptYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlcik6 CisKIDIwMTgtMTItMTcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtCRkNdW01hcmdpbkNvbGxhcHNpbmddIFVuaWZ5IG1hcmdpbiBjb2xsYXBzZSBmdW5j dGlvbiBuYW1pbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggYjFlMDhiMjgzNDku LjRmODMwNTIxNmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtMTA1LDYgKzEw NSw4IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBzdGF0aWMgYm9vbCBtYXJnaW5CZWZvcmVDb2xs YXBzZXNXaXRoUGFyZW50TWFyZ2luQmVmb3JlKGNvbnN0IExheW91dFN0YXRlJiwgY29uc3QgQm94 Jik7CiAgICAgICAgICAgICBzdGF0aWMgYm9vbCBtYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUHJl dmlvdXNTaWJsaW5nKGNvbnN0IEJveCYpOwogICAgICAgICAgICAgc3RhdGljIGJvb2wgbWFyZ2lu QWZ0ZXJDb2xsYXBzZXNXaXRoTmV4dFNpYmxpbmcoY29uc3QgQm94Jik7CisgICAgICAgICAgICBz dGF0aWMgYm9vbCBtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhTaWJsaW5nTWFyZ2luQmVmb3JlV2l0 aENsZWFyYW5jZShjb25zdCBCb3gmKTsKKyAgICAgICAgICAgIHN0YXRpYyBib29sIG1hcmdpbkFm dGVyQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkJlZm9yZShjb25zdCBCb3gmKTsKICAgICAgICAg ICAgIHN0YXRpYyBib29sIG1hcmdpbnNDb2xsYXBzZVRocm91Z2goY29uc3QgQm94Jik7CiAgICAg ICAgIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCmluZGV4IGFjMDgwYjk4ZTYyLi4zOWYy ODY1MmU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCkBAIC02OSw2ICs2OSwxNCBAQCBz dGF0aWMgYm9vbCBoYXNQYWRkaW5nQWZ0ZXIoY29uc3QgQm94JiBsYXlvdXRCb3gpCiAgICAgcmV0 dXJuIGhhc1BhZGRpbmcobGF5b3V0Qm94LnN0eWxlKCkucGFkZGluZ0FmdGVyKCkpOwogfQogCitz dGF0aWMgYm9vbCBoYXNDbGVhcmFuY2UoY29uc3QgQm94JiBsYXlvdXRCb3gpCit7CisgICAgaWYg KCFsYXlvdXRCb3guaGFzRmxvYXRDbGVhcigpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg Ly8gRklYTUUKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHN0YXRpYyBib29sIGVzdGFibGlzaGVz QmxvY2tGb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAgICAvLyBX ZWJLaXQgdHJlYXRzIHRoZSBkb2N1bWVudCBlbGVtZW50IHJlbmRlcmVyIGFzIGEgYmxvY2sgZm9y bWF0dGluZyBjb250ZXh0IHJvb3QuIEl0IHByb2JhYmx5IG9ubHkgaW1wYWN0cyBtYXJnaW4gY29s bGFwc2luZywgc28gbGV0J3Mgbm90IGRvCkBAIC0xNzksNyArMTg3LDE2IEBAIGJvb2wgQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZvcmVD b2xsYXBzZXNXaXRoCiAKICAgICBBU1NFUlQobGF5b3V0Qm94LmlzQmxvY2tMZXZlbEJveCgpKTsK IAotICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpKQor ICAgIC8vIE1hcmdpbnMgYmV0d2VlbiBhIGZsb2F0ZWQgYm94IGFuZCBhbnkgb3RoZXIgYm94IGRv IG5vdCBjb2xsYXBzZS4KKyAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkp CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIE1hcmdpbnMgb2YgYWJzb2x1dGVseSBw b3NpdGlvbmVkIGJveGVzIGRvIG5vdCBjb2xsYXBzZS4KKyAgICBpZiAobGF5b3V0Qm94LmlzT3V0 T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBNYXJn aW5zIG9mIGlubGluZS1ibG9jayBib3hlcyBkbyBub3QgY29sbGFwc2UuCisgICAgaWYgKGxheW91 dEJveC5pc0lubGluZUJsb2NrQm94KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8v IE9ubHkgdGhlIGZpcnN0IGlubGZsb3cgY2hpbGQgY29sbGFwc2VzIHdpdGggcGFyZW50LgpAQCAt MTk3LDI1ICsyMTQsNDMgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGgKICAgICBpZiAoaGFzUGFk ZGluZ0JlZm9yZShwYXJlbnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICAvLyAuLi5h bmQgdGhlIGNoaWxkIGhhcyBubyBjbGVhcmFuY2UuCisgICAgaWYgKGhhc0NsZWFyYW5jZShsYXlv dXRCb3gpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoQmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6UXVpcmtzOjpzaG91bGRJZ25vcmVNYXJnaW5CZWZvcmUobGF5b3V0U3RhdGUsIGxh eW91dEJveCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiB0cnVlOwogfQog Citib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6 bWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoU2libGluZ01hcmdpbkJlZm9yZVdpdGhDbGVhcmFuY2Uo Y29uc3QgQm94JikKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgQmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5BZnRlckNvbGxhcHNl c1dpdGhQYXJlbnRNYXJnaW5CZWZvcmUoY29uc3QgQm94JikKK3sKKyAgICByZXR1cm4gZmFsc2U7 Cit9CisKIGJvb2wgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxh cHNlOjptYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlcihjb25zdCBCb3gm IGxheW91dEJveCkKIHsKLSAgICAvLyBsYXN0IGluZmxvdyBib3ggdG8gcGFyZW50LgotICAgIC8v IGh0dHBzOi8vd3d3LnczLm9yZy9UUi9DU1MyMS9ib3guaHRtbCNjb2xsYXBzaW5nLW1hcmdpbnMK ICAgICBpZiAobGF5b3V0Qm94LmlzQW5vbnltb3VzKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIEFTU0VSVChsYXlvdXRCb3guaXNCbG9ja0xldmVsQm94KCkpOwogCi0gICAgaWYgKGxh eW91dEJveC5pc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCisgICAgLy8gTWFyZ2lu cyBiZXR3ZWVuIGEgZmxvYXRlZCBib3ggYW5kIGFueSBvdGhlciBib3ggZG8gbm90IGNvbGxhcHNl LgorICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgaWYgKG1hcmdpbnNDb2xsYXBzZVRocm91Z2gobGF5b3V0Qm94KSkK KyAgICAvLyBNYXJnaW5zIG9mIGFic29sdXRlbHkgcG9zaXRpb25lZCBib3hlcyBkbyBub3QgY29s bGFwc2UuCisgICAgaWYgKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gTWFyZ2lucyBvZiBpbmxpbmUtYmxvY2sgYm94ZXMg ZG8gbm90IGNvbGxhcHNlLgorICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCbG9ja0JveCgpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBPbmx5IHRoZSBsYXN0IGlubGZsb3cgY2hp bGQgY29sbGFwc2VzIHdpdGggcGFyZW50LgpAQCAtMjIzLDE3ICsyNTgsMjkgQEAgYm9vbCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVy Q29sbGFwc2VzV2l0aFAKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgYXV0byYgcGFyZW50 ID0gKmxheW91dEJveC5wYXJlbnQoKTsKLSAgICAvLyBNYXJnaW5zIG9mIGVsZW1lbnRzIHRoYXQg ZXN0YWJsaXNoIG5ldyBibG9jayBmb3JtYXR0aW5nIGNvbnRleHRzIGRvIG5vdCBjb2xsYXBzZSB3 aXRoIHRoZWlyIGluLWZsb3cgY2hpbGRyZW4KKyAgICAvLyBNYXJnaW5zIG9mIGVsZW1lbnRzIHRo YXQgZXN0YWJsaXNoIG5ldyBibG9jayBmb3JtYXR0aW5nIGNvbnRleHRzIGRvIG5vdCBjb2xsYXBz ZSB3aXRoIHRoZWlyIGluLWZsb3cgY2hpbGRyZW4uCiAgICAgaWYgKGVzdGFibGlzaGVzQmxvY2tG b3JtYXR0aW5nQ29udGV4dChwYXJlbnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBp ZiAoaGFzQm9yZGVyQmVmb3JlKHBhcmVudCkpCisgICAgLy8gVGhlIGJvdHRvbSBtYXJnaW4gb2Yg YW4gaW4tZmxvdyBibG9jayBib3ggd2l0aCBhICdoZWlnaHQnIG9mICdhdXRvJyBjb2xsYXBzZXMg d2l0aCBpdHMgbGFzdCBpbi1mbG93IGJsb2NrLWxldmVsIGNoaWxkJ3MgYm90dG9tIG1hcmdpbiwg aWY6CisgICAgaWYgKCFwYXJlbnQuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCisgICAgLy8gdGhlIGJveCBoYXMgbm8gYm90dG9tIHBhZGRpbmcsIGFu ZAogICAgIGlmIChoYXNQYWRkaW5nQmVmb3JlKHBhcmVudCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAotICAgIGlmICghcGFyZW50LnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkpCisgICAgLy8g dGhlIGJveCBoYXMgbm8gYm90dG9tIGJvcmRlciwgYW5kCisgICAgaWYgKGhhc0JvcmRlckJlZm9y ZShwYXJlbnQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyB0aGUgY2hpbGQncyBi b3R0b20gbWFyZ2luIG5laXRoZXIgY29sbGFwc2VzIHdpdGggYSB0b3AgbWFyZ2luIHRoYXQgaGFz IGNsZWFyYW5jZS4uLgorICAgIGlmIChtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhTaWJsaW5nTWFy Z2luQmVmb3JlV2l0aENsZWFyYW5jZShsYXlvdXRCb3gpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKKyAgICAvLyBub3IgKGlmIHRoZSBib3gncyBtaW4taGVpZ2h0IGlzIG5vbi16ZXJvKSB3aXRo IHRoZSBib3gncyB0b3AgbWFyZ2luLgorICAgIGF1dG8gY29tcHV0ZWRNaW5IZWlnaHQgPSBwYXJl bnQuc3R5bGUoKS5sb2dpY2FsTWluSGVpZ2h0KCk7CisgICAgaWYgKCFjb21wdXRlZE1pbkhlaWdo dC5pc0F1dG8oKSAmJiBjb21wdXRlZE1pbkhlaWdodC52YWx1ZSgpICYmIG1hcmdpbkFmdGVyQ29s bGFwc2VzV2l0aFBhcmVudE1hcmdpbkJlZm9yZShsYXlvdXRCb3gpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1ZTsK