192801 2018-12-17 21:40:42 -0800 [LFC][BFC][MarginCollapsing] Implement marginBeforeCollapsesWithParentMarginAfter 2018-12-18 07:31:42 -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 1488784 0 zalan 2018-12-17 21:40:42 -0800 ssia 1488786 1 357535 zalan 2018-12-17 21:42:01 -0800 Created attachment 357535 Patch 1488888 2 zalan 2018-12-18 07:30:33 -0800 Committed r239336: <https://trac.webkit.org/changeset/239336> 1488889 3 webkit-bug-importer 2018-12-18 07:31:42 -0800 <rdar://problem/46809922> 357535 2018-12-17 21:42:01 -0800 2018-12-18 03:58:37 -0800 Patch Patch.txt text/plain 4515 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2YzhiNTMzNzg3NS4uZjU0NTZhMTZhNTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOC0xMi0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10gSW1wbGVtZW50IG1hcmdpbkJl Zm9yZUNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyODAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhl aWdodEFuZE1hcmdpbik6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01h cmdpbkNvbGxhcHNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZvcmVDb2xsYXBz ZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIpOgorCiAyMDE4LTEyLTE3ICBaYWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bQkZDXVtNYXJnaW5Db2xsYXBzaW5nXSBJ bXBsZW1lbnQgbWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoU2libGluZ01hcmdpbkJlZm9yZVdpdGhD bGVhcmFuY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggYzMwODdhYjQ5NGIuLjBi YjE5NDU3ODI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtODksNyArODksNyBA QCBwcml2YXRlOgogICAgICAgICAgICAgc3RhdGljIExheW91dFVuaXQgbWFyZ2luQmVmb3JlKGNv bnN0IExheW91dFN0YXRlJiwgY29uc3QgQm94Jik7CiAgICAgICAgICAgICBzdGF0aWMgTGF5b3V0 VW5pdCBtYXJnaW5BZnRlcihjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOwogCi0gICAg ICAgICAgICBzdGF0aWMgYm9vbCBtYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2lu QWZ0ZXIoY29uc3QgQm94Jik7CisgICAgICAgICAgICBzdGF0aWMgYm9vbCBtYXJnaW5CZWZvcmVD b2xsYXBzZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIoY29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBC b3gmKTsKICAgICAgICAgICAgIHN0YXRpYyBib29sIG1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aFBh cmVudE1hcmdpbkFmdGVyKGNvbnN0IExheW91dFN0YXRlJiwgY29uc3QgQm94Jik7CiAKICAgICAg ICAgcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cAppbmRleCBkZmJkODM5YjIxZC4uMTFmYmVlYjE1OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9y bWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTkxLDcgKzkxLDcgQEAgSGVpZ2h0QW5kTWFy Z2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhl aWdodEFuZE1hcmcKIAogICAgICAgICAvLyAzLiB0aGUgYm90dG9tIGJvcmRlciBlZGdlIG9mIHRo ZSBsYXN0IGluLWZsb3cgY2hpbGQgd2hvc2UgdG9wIG1hcmdpbiBkb2Vzbid0IGNvbGxhcHNlIHdp dGggdGhlIGVsZW1lbnQncyBib3R0b20gbWFyZ2luCiAgICAgICAgIGF1dG8qIGluRmxvd0NoaWxk ID0gbGFzdEluRmxvd0NoaWxkOwotICAgICAgICB3aGlsZSAoaW5GbG93Q2hpbGQgJiYgTWFyZ2lu Q29sbGFwc2U6Om1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlcigqaW5G bG93Q2hpbGQpKQorICAgICAgICB3aGlsZSAoaW5GbG93Q2hpbGQgJiYgTWFyZ2luQ29sbGFwc2U6 Om1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlcihsYXlvdXRTdGF0ZSwg KmluRmxvd0NoaWxkKSkKICAgICAgICAgICAgIGluRmxvd0NoaWxkID0gaW5GbG93Q2hpbGQtPnBy ZXZpb3VzSW5GbG93U2libGluZygpOwogICAgICAgICBpZiAoaW5GbG93Q2hpbGQpIHsKICAgICAg ICAgICAgIGF1dG8mIGluRmxvd0Rpc3BsYXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9y TGF5b3V0Qm94KCppbkZsb3dDaGlsZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAppbmRleCA1 ODIyNTlhNjVmYS4uNTY3NzA4NzQ1MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcApAQCAt MTc0LDggKzE3NCwyMSBAQCBMYXlvdXRVbml0IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5OjpNYXJnaW5Db2xsYXBzZTo6Y29sbGFwc2VkTWFyZ2luQWZ0ZQogICAgIHJldHVybiBtYXJn aW5WYWx1ZShjb21wdXRlZE5vbkNvbGxhcHNlZE1hcmdpbkFmdGVyKGxheW91dFN0YXRlLCBsYXN0 SW5GbG93Q2hpbGQpLCBjb2xsYXBzZWRNYXJnaW5BZnRlckZyb21MYXN0Q2hpbGQobGF5b3V0U3Rh dGUsIGxhc3RJbkZsb3dDaGlsZCkpOwogfQogCi1ib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFBhcmVu dE1hcmdpbkFmdGVyKGNvbnN0IEJveCYpCitib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFBhcmVudE1h cmdpbkFmdGVyKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgQm94JiBsYXlv dXRCb3gpCiB7CisgICAgLy8gMS4gVGhpcyBpcyB0aGUgbGFzdCBpbi1mbG93IGNoaWxkIGFuZCBp dHMgbWFyZ2lucyBjb2xsYXBzZSB0aHJvdWdoIGFuZCB0aGUgbWFyZ2luIGFmdGVyIGNvbGxhcHNl cyB3aXRoIHBhcmVudCdzIG1hcmdpbiBhZnRlciBvcgorICAgIC8vIDIuIFRoaXMgYm94J3MgbWFy Z2luIGFmdGVyIGNvbGxhcHNlcyB3aXRoIHRoZSBuZXh0IHNpYmxpbmcncyBtYXJnaW4gYmVmb3Jl IGFuZCB0aGF0IHNpYmxpbmcgY29sbGFwc2VzIHRocm91Z2ggYW5kCisgICAgLy8gd2UgY2FuIGdl dCB0byB0aGUgbGFzdCBpbi1mbG93IGNoaWxkIGxpa2UgdGhhdC4KKyAgICBhdXRvKiBsYXN0SW5G bG93Q2hpbGQgPSBsYXlvdXRCb3gucGFyZW50KCktPmxhc3RJbkZsb3dDaGlsZCgpOworICAgIGZv ciAoYXV0byogY3VycmVudEJveCA9ICZsYXlvdXRCb3g7IGN1cnJlbnRCb3g7IGN1cnJlbnRCb3gg PSBjdXJyZW50Qm94LT5uZXh0SW5GbG93U2libGluZygpKSB7CisgICAgICAgIGlmICghbWFyZ2lu c0NvbGxhcHNlVGhyb3VnaChsYXlvdXRTdGF0ZSwgKmN1cnJlbnRCb3gpKQorICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoY3VycmVudEJveCA9PSBsYXN0SW5GbG93Q2hpbGQp CisgICAgICAgICAgICByZXR1cm4gbWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2lu QWZ0ZXIobGF5b3V0U3RhdGUsICpjdXJyZW50Qm94KTsgCisgICAgICAgIGlmICghbWFyZ2luQWZ0 ZXJDb2xsYXBzZXNXaXRoTmV4dFNpYmxpbmcoKmN1cnJlbnRCb3gpKQorICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4g ZmFsc2U7CiB9CiAK