192798 2018-12-17 21:03:28 -0800 [LFC][BFC][MarginCollapsing] Implement marginAfterCollapsesWithParentMarginBefore 2018-12-18 07:28:25 -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 1488762 0 zalan 2018-12-17 21:03:28 -0800 ssia 1488763 1 357529 zalan 2018-12-17 21:05:03 -0800 Created attachment 357529 Patch 1488881 2 zalan 2018-12-18 07:27:22 -0800 Committed r239334: <https://trac.webkit.org/changeset/239334> 1488883 3 webkit-bug-importer 2018-12-18 07:28:25 -0800 <rdar://problem/46809864> 357529 2018-12-17 21:05:03 -0800 2018-12-18 03:57:47 -0800 Patch Patch.txt text/plain 7164 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlODJiYjI4MzkzYy4uNzZjZWUxMTI2MjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxOC0xMi0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10gSW1wbGVtZW50IG1hcmdpbkFm dGVyQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkJlZm9yZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNzk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhl aWdodEFuZE1hcmdpbik6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01h cmdpbkNvbGxhcHNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjpjb2xsYXBzZWRNYXJnaW5BZnRl ckZyb21MYXN0Q2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVyQ29sbGFwc2Vz V2l0aFBhcmVudE1hcmdpbkJlZm9yZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0ZXJD b2xsYXBzZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6Om1hcmdp bkFmdGVyKToKKwogMjAxOC0xMi0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10gRXhwYW5kIG1hcmdpbnNDb2xs YXBzZVRocm91Z2ggY29sbGFwc2luZyBsb2dpYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaApp bmRleCAxMDY3YzRiOWNhMy4uOWQyNGMxMDNiMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5oCkBAIC05MCw3ICs5MCw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBzdGF0aWMgTGF5b3V0 VW5pdCBtYXJnaW5BZnRlcihjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOwogCiAgICAg ICAgICAgICBzdGF0aWMgYm9vbCBtYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2lu QWZ0ZXIoY29uc3QgQm94Jik7Ci0gICAgICAgICAgICBzdGF0aWMgYm9vbCBtYXJnaW5BZnRlckNv bGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlcihjb25zdCBCb3gmKTsKKyAgICAgICAgICAgIHN0 YXRpYyBib29sIG1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyKGNvbnN0 IExheW91dFN0YXRlJiwgY29uc3QgQm94Jik7CiAKICAgICAgICAgcHJpdmF0ZToKICAgICAgICAg ICAgIHN0YXRpYyBMYXlvdXRVbml0IGNvbGxhcHNlZE1hcmdpbkFmdGVyRnJvbUxhc3RDaGlsZChj b25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOwpAQCAtMTA2LDcgKzEwNiw3IEBAIHByaXZh dGU6CiAgICAgICAgICAgICBzdGF0aWMgYm9vbCBtYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUHJl dmlvdXNTaWJsaW5nKGNvbnN0IEJveCYpOwogICAgICAgICAgICAgc3RhdGljIGJvb2wgbWFyZ2lu QWZ0ZXJDb2xsYXBzZXNXaXRoTmV4dFNpYmxpbmcoY29uc3QgQm94Jik7CiAgICAgICAgICAgICBz dGF0aWMgYm9vbCBtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhTaWJsaW5nTWFyZ2luQmVmb3JlV2l0 aENsZWFyYW5jZShjb25zdCBCb3gmKTsKLSAgICAgICAgICAgIHN0YXRpYyBib29sIG1hcmdpbkFm dGVyQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkJlZm9yZShjb25zdCBCb3gmKTsKKyAgICAgICAg ICAgIHN0YXRpYyBib29sIG1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkJlZm9y ZShjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOwogICAgICAgICAgICAgc3RhdGljIGJv b2wgbWFyZ2luc0NvbGxhcHNlVGhyb3VnaChjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYp OwogICAgICAgICB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKaW5kZXggZDUxNThhMDk2NGEuLmRmYmQ4MzliMjFkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC04NCw3ICs4NCw3IEBAIEhlaWdodEFu ZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFj ZWRIZWlnaHRBbmRNYXJnCiAgICAgICAgIC8vIDIuIHRoZSBib3R0b20gZWRnZSBvZiB0aGUgYm90 dG9tIChwb3NzaWJseSBjb2xsYXBzZWQpIG1hcmdpbiBvZiBpdHMgbGFzdCBpbi1mbG93IGNoaWxk LCBpZiB0aGUgY2hpbGQncyBib3R0b20gbWFyZ2luLi4uCiAgICAgICAgIGF1dG8qIGxhc3RJbkZs b3dDaGlsZCA9IGRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94KS5sYXN0SW5GbG93Q2hpbGQo KTsKICAgICAgICAgQVNTRVJUKGxhc3RJbkZsb3dDaGlsZCk7Ci0gICAgICAgIGlmICghTWFyZ2lu Q29sbGFwc2U6Om1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyKCpsYXN0 SW5GbG93Q2hpbGQpKSB7CisgICAgICAgIGlmICghTWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVy Q29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyKGxheW91dFN0YXRlLCAqbGFzdEluRmxvd0No aWxkKSkgewogICAgICAgICAgICAgYXV0byYgbGFzdEluRmxvd0Rpc3BsYXlCb3ggPSBsYXlvdXRT dGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpsYXN0SW5GbG93Q2hpbGQpOwogICAgICAgICAg ICAgcmV0dXJuIHsgbGFzdEluRmxvd0Rpc3BsYXlCb3guYm90dG9tKCkgKyBsYXN0SW5GbG93RGlz cGxheUJveC5tYXJnaW5BZnRlcigpIC0gYm9yZGVyQW5kUGFkZGluZ1RvcCwgeyBub25Db2xsYXBz ZWRNYXJnaW4sIGNvbGxhcHNlZE1hcmdpbiB9IH07CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29s bGFwc2UuY3BwCmluZGV4IDYxOWQyYTJmMjk5Li4yOWNiNGM4ODAyOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2lu Q29sbGFwc2UuY3BwCkBAIC0xNjcsNyArMTY3LDcgQEAgTGF5b3V0VW5pdCBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6OmNvbGxhcHNlZE1hcmdpbkFmdGUK IAogICAgIC8vIEZJWE1FOiBDaGVjayBmb3IgY29sbGFwc2VkIHRocm91Z2ggbWFyZ2luLgogICAg IGF1dG8mIGxhc3RJbkZsb3dDaGlsZCA9ICpkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCku bGFzdEluRmxvd0NoaWxkKCk7Ci0gICAgaWYgKCFtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJl bnRNYXJnaW5BZnRlcihsYXN0SW5GbG93Q2hpbGQpKQorICAgIGlmICghbWFyZ2luQWZ0ZXJDb2xs YXBzZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIobGF5b3V0U3RhdGUsIGxhc3RJbkZsb3dDaGlsZCkp CiAgICAgICAgIHJldHVybiAwOwogCiAgICAgLy8gQ29sbGVjdCBjb2xsYXBzZWQgbWFyZ2luIGJv dHRvbSByZWN1cnNpdmVseS4KQEAgLTIzMCwxMiArMjMwLDI1IEBAIGJvb2wgQmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5BZnRlckNvbGxhcHNl c1dpdGhTCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoUGFy ZW50TWFyZ2luQmVmb3JlKGNvbnN0IEJveCYpCitib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50 TWFyZ2luQmVmb3JlKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgQm94JiBs YXlvdXRCb3gpCiB7CisgICAgLy8gMS4gVGhpcyBpcyB0aGUgZmlyc3QgaW4tZmxvdyBjaGlsZCBh bmQgaXRzIG1hcmdpbnMgY29sbGFwc2UgdGhyb3VnaCBhbmQgdGhlIG1hcmdpbiBiZWZvcmUgY29s bGFwc2VzIHdpdGggcGFyZW50J3MgbWFyZ2luIGJlZm9yZSBvcgorICAgIC8vIDIuIFRoaXMgYm94 J3MgbWFyZ2luIGJlZm9yZSBjb2xsYXBzZXMgd2l0aCB0aGUgcHJldmlvdXMgc2libGluZydzIG1h cmdpbiBhZnRlciBhbmQgdGhhdCBzaWJsaW5nIGNvbGxhcHNlcyB0aHJvdWdoIGFuZAorICAgIC8v IHdlIGNhbiBnZXQgdG8gdGhlIGZpcnN0IGluLWZsb3cgY2hpbGQgbGlrZSB0aGF0LgorICAgIGF1 dG8qIGZpcnN0SW5GbG93Q2hpbGQgPSBsYXlvdXRCb3gucGFyZW50KCktPmZpcnN0SW5GbG93Q2hp bGQoKTsKKyAgICBmb3IgKGF1dG8qIGN1cnJlbnRCb3ggPSAmbGF5b3V0Qm94OyBjdXJyZW50Qm94 OyBjdXJyZW50Qm94ID0gY3VycmVudEJveC0+cHJldmlvdXNJbkZsb3dTaWJsaW5nKCkpIHsKKyAg ICAgICAgaWYgKCFtYXJnaW5zQ29sbGFwc2VUaHJvdWdoKGxheW91dFN0YXRlLCAqY3VycmVudEJv eCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmIChjdXJyZW50Qm94ID09 IGZpcnN0SW5GbG93Q2hpbGQpCisgICAgICAgICAgICByZXR1cm4gbWFyZ2luQmVmb3JlQ29sbGFw c2VzV2l0aFBhcmVudE1hcmdpbkJlZm9yZShsYXlvdXRTdGF0ZSwgKmN1cnJlbnRCb3gpOyAKKyAg ICAgICAgaWYgKCFtYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUHJldmlvdXNTaWJsaW5nKCpjdXJy ZW50Qm94KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0ZXJDb2xsYXBzZXNX aXRoUGFyZW50TWFyZ2luQWZ0ZXIoY29uc3QgQm94JiBsYXlvdXRCb3gpCitib29sIEJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0ZXJDb2xs YXBzZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRl LCBjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAgICBpZiAobGF5b3V0Qm94LmlzQW5vbnltb3Vz KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTI4MSw3ICsyOTQsNyBAQCBib29sIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0ZXJD b2xsYXBzZXNXaXRoUAogCiAgICAgLy8gbm9yIChpZiB0aGUgYm94J3MgbWluLWhlaWdodCBpcyBu b24temVybykgd2l0aCB0aGUgYm94J3MgdG9wIG1hcmdpbi4KICAgICBhdXRvIGNvbXB1dGVkTWlu SGVpZ2h0ID0gcGFyZW50LnN0eWxlKCkubG9naWNhbE1pbkhlaWdodCgpOwotICAgIGlmICghY29t cHV0ZWRNaW5IZWlnaHQuaXNBdXRvKCkgJiYgY29tcHV0ZWRNaW5IZWlnaHQudmFsdWUoKSAmJiBt YXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5CZWZvcmUobGF5b3V0Qm94KSkKKyAg ICBpZiAoIWNvbXB1dGVkTWluSGVpZ2h0LmlzQXV0bygpICYmIGNvbXB1dGVkTWluSGVpZ2h0LnZh bHVlKCkgJiYgbWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2luQmVmb3JlKGxheW91 dFN0YXRlLCBsYXlvdXRCb3gpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4g dHJ1ZTsKQEAgLTQwNiw3ICs0MTksNyBAQCBMYXlvdXRVbml0IEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0ZXIoY29uc3QgTAogICAgIEFT U0VSVChsYXlvdXRCb3guaXNCbG9ja0xldmVsQm94KCkpOwogCiAgICAgLy8gVE9ETzogdGFrZSBf aGFzQWRqb2luaW5nTWFyZ2luQmVmb3JlQW5kQm90dG9tKCkgaW50byBhY2NvdW50LgotICAgIGlm IChtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlcihsYXlvdXRCb3gpKQor ICAgIGlmIChtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlcihsYXlvdXRT dGF0ZSwgbGF5b3V0Qm94KSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAobWFyZ2luc0Nv bGxhcHNlVGhyb3VnaChsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KSkK