192794 2018-12-17 20:27:05 -0800 [LFC][BFC][MarginCollapsing] Expand marginsCollapseThrough collapsing logic 2018-12-18 07:26:28 -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 1488753 0 zalan 2018-12-17 20:27:05 -0800 ssia 1488755 1 357525 zalan 2018-12-17 20:28:34 -0800 Created attachment 357525 Patch 1488875 2 zalan 2018-12-18 07:25:39 -0800 Committed r239332: <https://trac.webkit.org/changeset/239332> 1488877 3 webkit-bug-importer 2018-12-18 07:26:28 -0800 <rdar://problem/46809822> 357525 2018-12-17 20:28:34 -0800 2018-12-18 03:57:30 -0800 Patch Patch.txt text/plain 5359 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZTQ2OGYxMDZkYS4uZTgyYmIyODM5M2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOC0xMi0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10gRXhwYW5kIG1hcmdpbnNDb2xs YXBzZVRocm91Z2ggY29sbGFwc2luZyBsb2dpYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFy Z2luQ29sbGFwc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbnNDb2xsYXBzZVRocm91 Z2gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJlZm9yZSk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBz ZTo6bWFyZ2luQWZ0ZXIpOgorCiAyMDE4LTEyLTE3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bQkZDXVtNYXJnaW5Db2xsYXBzaW5nXSBFeHBhbmQgbWFy Z2luQWZ0ZXJDb2xsYXBzZXNXaXRoTmV4dFNpYmxpbmcgYW5kIG1hcmdpbkJlZm9yZUNvbGxhcHNl c1dpdGhQcmV2aW91c1NpYmxpbmcgY29sbGFwc2luZyBsb2dpYwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0Nv bnRleHQuaAppbmRleCA0ZjgzMDUyMTZiMC4uMTA2N2M0YjljYTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0 aW5nQ29udGV4dC5oCkBAIC0xMDcsNyArMTA3LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIHN0 YXRpYyBib29sIG1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aE5leHRTaWJsaW5nKGNvbnN0IEJveCYp OwogICAgICAgICAgICAgc3RhdGljIGJvb2wgbWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoU2libGlu Z01hcmdpbkJlZm9yZVdpdGhDbGVhcmFuY2UoY29uc3QgQm94Jik7CiAgICAgICAgICAgICBzdGF0 aWMgYm9vbCBtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5CZWZvcmUoY29uc3Qg Qm94Jik7Ci0gICAgICAgICAgICBzdGF0aWMgYm9vbCBtYXJnaW5zQ29sbGFwc2VUaHJvdWdoKGNv bnN0IEJveCYpOworICAgICAgICAgICAgc3RhdGljIGJvb2wgbWFyZ2luc0NvbGxhcHNlVGhyb3Vn aChjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOwogICAgICAgICB9OwogCiAgICAgICAg IHN0YXRpYyBIZWlnaHRBbmRNYXJnaW4gaW5GbG93Tm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4o Y29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmLCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+ IHVzZWRIZWlnaHQgPSB7IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKaW5kZXggMjUxMTE5 ZWVjYmIuLjYxOWQyYTJmMjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKQEAgLTI4LDYg KzI4LDcgQEAKIAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQogCisjaW5j bHVkZSAiSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgiCiAjaW5jbHVkZSAiTGF5b3V0Qm94LmgiCiAj aW5jbHVkZSAiTGF5b3V0Q29udGFpbmVyLmgiCiAjaW5jbHVkZSAiTGF5b3V0VW5pdC5oIgpAQCAt MzI2LDI2ICszMjcsMzggQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aE4KICAgICByZXR1cm4gbWFy Z2luQmVmb3JlQ29sbGFwc2VzV2l0aFByZXZpb3VzU2libGluZygqbGF5b3V0Qm94Lm5leHRJbkZs b3dTaWJsaW5nKCkpOwogfQogCi1ib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luc0NvbGxhcHNlVGhyb3VnaChjb25zdCBCb3gmIGxheW91 dEJveCkKK2Jvb2wgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxh cHNlOjptYXJnaW5zQ29sbGFwc2VUaHJvdWdoKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0 ZSwgY29uc3QgQm94JiBsYXlvdXRCb3gpCiB7CiAgICAgQVNTRVJUKGxheW91dEJveC5pc0Jsb2Nr TGV2ZWxCb3goKSk7CiAKLSAgICAvLyBJZiB0aGUgdG9wIGFuZCBib3R0b20gbWFyZ2lucyBvZiBh IGJveCBhcmUgYWRqb2luaW5nLCB0aGVuIGl0IGlzIHBvc3NpYmxlIGZvciBtYXJnaW5zIHRvIGNv bGxhcHNlIHRocm91Z2ggaXQuCisgICAgLy8gQSBib3gncyBvd24gbWFyZ2lucyBjb2xsYXBzZSBp ZiB0aGUgJ21pbi1oZWlnaHQnIHByb3BlcnR5IGlzIHplcm8sIGFuZCBpdCBoYXMgbmVpdGhlciB0 b3Agb3IgYm90dG9tIGJvcmRlcnMgbm9yIHRvcCBvciBib3R0b20gcGFkZGluZywKKyAgICAvLyBh bmQgaXQgaGFzIGEgJ2hlaWdodCcgb2YgZWl0aGVyIDAgb3IgJ2F1dG8nLCBhbmQgaXQgZG9lcyBu b3QgY29udGFpbiBhIGxpbmUgYm94LCBhbmQgYWxsIG9mIGl0cyBpbi1mbG93IGNoaWxkcmVuJ3Mg bWFyZ2lucyAoaWYgYW55KSBjb2xsYXBzZS4KICAgICBpZiAoaGFzQm9yZGVyQmVmb3JlKGxheW91 dEJveCkgfHwgaGFzQm9yZGVyQWZ0ZXIobGF5b3V0Qm94KSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgaWYgKGhhc1BhZGRpbmdCZWZvcmUobGF5b3V0Qm94KSB8fCBoYXNQYWRkaW5nQWZ0 ZXIobGF5b3V0Qm94KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFsYXlvdXRC b3guc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKSB8fCAhbGF5b3V0Qm94LnN0eWxlKCkubWluSGVp Z2h0KCkuaXNBdXRvKCkpCisgICAgLy8gRklYTUU6IENoZWNrIGZvciBjb21wdXRlZCAwIGhlaWdo dC4KKyAgICBpZiAoIWxheW91dEJveC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBGSVhNRTogQ2hlY2sgZm9yIGNvbXB1dGVkIDAgaGVp Z2h0LgorICAgIGlmICghbGF5b3V0Qm94LnN0eWxlKCkubWluSGVpZ2h0KCkuaXNBdXRvKCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghaXM8Q29udGFpbmVyPihsYXlvdXRCb3gp KQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIGF1dG8mIGNvbnRhaW5lciA9IGRvd25jYXN0 PENvbnRhaW5lcj4obGF5b3V0Qm94KTsKLSAgICBpZiAoY29udGFpbmVyLmhhc0luRmxvd09yRmxv YXRpbmdDaGlsZCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKGxheW91dEJveC5l c3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKKyAgICAgICAgaWYgKGRvd25j YXN0PElubGluZUZvcm1hdHRpbmdTdGF0ZT4obGF5b3V0U3RhdGUuZXN0YWJsaXNoZWRGb3JtYXR0 aW5nU3RhdGUobGF5b3V0Qm94KSkuaW5saW5lUnVucygpLmlzRW1wdHkoKSkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9IGVsc2UgeworICAgICAgICBmb3IgKGF1dG8qIGluZmxvd0No aWxkID0gZG93bmNhc3Q8Q29udGFpbmVyPihsYXlvdXRCb3gpLmZpcnN0SW5GbG93Q2hpbGQoKTsg aW5mbG93Q2hpbGQ7IGluZmxvd0NoaWxkID0gaW5mbG93Q2hpbGQtPm5leHRJbkZsb3dTaWJsaW5n KCkpIHsKKyAgICAgICAgICAgIGlmICghbWFyZ2luc0NvbGxhcHNlVGhyb3VnaChsYXlvdXRTdGF0 ZSwgKmluZmxvd0NoaWxkKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAg fQorICAgIH0KIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMzY2LDcgKzM3OSw3IEBAIExheW91 dFVuaXQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjpt YXJnaW5CZWZvcmUoY29uc3QKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAoIW1hcmdpbkJl Zm9yZUNvbGxhcHNlc1dpdGhQcmV2aW91c1NpYmxpbmcobGF5b3V0Qm94KSkgewotICAgICAgICBp ZiAoIW1hcmdpbnNDb2xsYXBzZVRocm91Z2gobGF5b3V0Qm94KSkKKyAgICAgICAgaWYgKCFtYXJn aW5zQ29sbGFwc2VUaHJvdWdoKGxheW91dFN0YXRlLCBsYXlvdXRCb3gpKQogICAgICAgICAgICAg cmV0dXJuIG5vbkNvbGxhcHNlZE1hcmdpbkJlZm9yZShsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsK ICAgICAgICAgLy8gQ29tcHV0ZSB0aGUgY29sbGFwc2VkIHRocm91Z2ggdmFsdWUuCiAgICAgICAg IGF1dG8gbWFyZ2luQmVmb3JlID0gbm9uQ29sbGFwc2VkTWFyZ2luQmVmb3JlKGxheW91dFN0YXRl LCBsYXlvdXRCb3gpOwpAQCAtMzk2LDcgKzQwOSw3IEBAIExheW91dFVuaXQgQmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5BZnRlcihjb25zdCBM CiAgICAgaWYgKG1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyKGxheW91 dEJveCkpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgaWYgKG1hcmdpbnNDb2xsYXBzZVRocm91 Z2gobGF5b3V0Qm94KSkKKyAgICBpZiAobWFyZ2luc0NvbGxhcHNlVGhyb3VnaChsYXlvdXRTdGF0 ZSwgbGF5b3V0Qm94KSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAvLyBGbG9hdHMgYW5kIG91 dCBvZiBmbG93IHBvc2l0aW9uZWQgYm94ZXMgZG8gbm90IGNvbGxhcHNlIHRoZWlyIG1hcmdpbnMu Cg==