192791 2018-12-17 18:41:40 -0800 [LFC][BFC][MarginCollapsing] Expand marginAfterCollapsesWithNextSibling and marginBeforeCollapsesWithPreviousSibling collapsing logic 2018-12-18 07:24:48 -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 1488718 0 zalan 2018-12-17 18:41:40 -0800 ssia 1488723 1 357515 zalan 2018-12-17 18:52:58 -0800 Created attachment 357515 Patch 1488873 2 zalan 2018-12-18 07:23:55 -0800 Committed r239331: <https://trac.webkit.org/changeset/239331> 1488874 3 webkit-bug-importer 2018-12-18 07:24:48 -0800 <rdar://problem/46809791> 357515 2018-12-17 18:52:58 -0800 2018-12-18 03:53:40 -0800 Patch Patch.txt text/plain 3415 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYmRkYmFmY2Y2Yi4uYWU0NjhmMTA2ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxOC0xMi0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10gRXhwYW5kIG1hcmdpbkFmdGVy Q29sbGFwc2VzV2l0aE5leHRTaWJsaW5nIGFuZCBtYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUHJl dmlvdXNTaWJsaW5nIGNvbGxhcHNpbmcgbG9naWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mjc5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdp bkNvbGxhcHNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZvcmVDb2xsYXBzZXNX aXRoUHJldmlvdXNTaWJsaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5BZnRlckNvbGxh cHNlc1dpdGhOZXh0U2libGluZyk6CisKIDIwMTgtMTItMTcgIFphbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtCRkNdW01hcmdpbkNvbGxhcHNpbmddIEV4cGFu ZCBtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlciBhbmQgbWFyZ2luQmVm b3JlQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkJlZm9yZSBjb2xsYXBzaW5nIGxvZ2ljCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2lu Q29sbGFwc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a01hcmdpbkNvbGxhcHNlLmNwcAppbmRleCAzOWYyODY1MmU3ZC4uMjUxMTE5ZWVjYmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5D b2xsYXBzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja01hcmdpbkNvbGxhcHNlLmNwcApAQCAtMjkwLDMwICsyOTAsNDAgQEAgYm9vbCBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJlZm9yZUNv bGxhcHNlc1dpdGgKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94LmlzQmxvY2tMZXZlbEJveCgpKTsK IAotICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKKyAgICBpZiAoIWxh eW91dEJveC5wcmV2aW91c0luRmxvd1NpYmxpbmcoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog Ci0gICAgaWYgKCFsYXlvdXRCb3guaXNQb3NpdGlvbmVkKCkgfHwgbGF5b3V0Qm94LmlzSW5GbG93 UG9zaXRpb25lZCgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBhdXRvJiBwcmV2aW91c0lu Rmxvd1NpYmxpbmcgPSAqbGF5b3V0Qm94LnByZXZpb3VzSW5GbG93U2libGluZygpOworCisgICAg Ly8gTWFyZ2lucyBiZXR3ZWVuIGEgZmxvYXRlZCBib3ggYW5kIGFueSBvdGhlciBib3ggZG8gbm90 IGNvbGxhcHNlLgorICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSB8fCBw cmV2aW91c0luRmxvd1NpYmxpbmcuaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworCisgICAgLy8gTWFyZ2lucyBvZiBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgYm94 ZXMgZG8gbm90IGNvbGxhcHNlLgorICAgIGlmICgobGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRp b25lZCgpICYmICFsYXlvdXRCb3guc3R5bGUoKS50b3AoKS5pc0F1dG8oKSkKKyAgICAgICAgfHwg KHByZXZpb3VzSW5GbG93U2libGluZy5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiAhcHJldmlv dXNJbkZsb3dTaWJsaW5nLnN0eWxlKCkuYm90dG9tKCkuaXNBdXRvKCkpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICAvLyBNYXJnaW5zIG9mIGlubGluZS1ibG9jayBib3hlcyBkbyBub3Qg Y29sbGFwc2UuCisgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkgfHwgcHJldmlv dXNJbkZsb3dTaWJsaW5nLmlzSW5saW5lQmxvY2tCb3goKSkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworCisgICAgLy8gVGhlIGJvdHRvbSBtYXJnaW4gb2YgYW4gaW4tZmxvdyBibG9jay1sZXZlbCBl bGVtZW50IGFsd2F5cyBjb2xsYXBzZXMgd2l0aCB0aGUgdG9wIG1hcmdpbiBvZgorICAgIC8vIGl0 cyBuZXh0IGluLWZsb3cgYmxvY2stbGV2ZWwgc2libGluZywgdW5sZXNzIHRoYXQgc2libGluZyBo YXMgY2xlYXJhbmNlLgorICAgIGlmIChoYXNDbGVhcmFuY2UobGF5b3V0Qm94KSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOwogCi0gICAgLy8gT3V0IG9mIGZsb3cgcG9zaXRpb25lZC4KLSAgICBBU1NF UlQobGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKLSAgICByZXR1cm4gbGF5b3V0 Qm94LnN0eWxlKCkudG9wKCkuaXNBdXRvKCk7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIGJvb2wg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5B ZnRlckNvbGxhcHNlc1dpdGhOZXh0U2libGluZyhjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAg ICBBU1NFUlQobGF5b3V0Qm94LmlzQmxvY2tMZXZlbEJveCgpKTsKIAotICAgIGlmIChsYXlvdXRC b3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKKyAgICBpZiAoIWxheW91dEJveC5uZXh0SW5GbG93 U2libGluZygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIWxheW91dEJveC5p c1Bvc2l0aW9uZWQoKSB8fCBsYXlvdXRCb3guaXNJbkZsb3dQb3NpdGlvbmVkKCkpCi0gICAgICAg IHJldHVybiB0cnVlOwotCi0gICAgLy8gT3V0IG9mIGZsb3cgcG9zaXRpb25lZC4KLSAgICBBU1NF UlQobGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKLSAgICByZXR1cm4gbGF5b3V0 Qm94LnN0eWxlKCkuYm90dG9tKCkuaXNBdXRvKCk7CisgICAgcmV0dXJuIG1hcmdpbkJlZm9yZUNv bGxhcHNlc1dpdGhQcmV2aW91c1NpYmxpbmcoKmxheW91dEJveC5uZXh0SW5GbG93U2libGluZygp KTsKIH0KIAogYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29s bGFwc2U6Om1hcmdpbnNDb2xsYXBzZVRocm91Z2goY29uc3QgQm94JiBsYXlvdXRCb3gpCg==