187114 2018-06-27 13:02:22 -0700 [LFC] Do not collapse margin with the parent when element has border/padding. 2018-06-27 13:11:33 -0700 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 1437070 0 zalan 2018-06-27 13:02:22 -0700 ssia. 1437072 1 343743 zalan 2018-06-27 13:03:33 -0700 Created attachment 343743 Patch 1437073 2 zalan 2018-06-27 13:10:32 -0700 Committed r233275: <https://trac.webkit.org/changeset/233275> 1437074 3 webkit-bug-importer 2018-06-27 13:11:33 -0700 <rdar://problem/41539187> 343743 2018-06-27 13:03:33 -0700 2018-06-27 13:08:14 -0700 Patch bug-187114-20180627130331.patch text/plain 4345 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM2YzQwNzJmM2IwYjgx OWU3YThjNzg5MThmMjE3MjgwODQ2M2UwYy4uMTM0ODM1YmUyMDVjY2M1ODM1ZjNjYTg4YjE5ZTA1 ZjhmZGJmN2M1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE4LTA2LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRG8gbm90IGNvbGxh cHNlIG1hcmdpbiB3aXRoIHRoZSBwYXJlbnQgd2hlbiBlbGVtZW50IGhhcyBib3JkZXIvcGFkZGlu Zy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzEx NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0IGNvbnN0KToK KyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc01hcmdpblRvcENvbGxhcHNlZFdpdGhQYXJl bnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpN YXJnaW5Db2xsYXBzZTo6Y29sbGFwc2VkTWFyZ2luVG9wRnJvbUZpcnN0Q2hpbGQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBz ZTo6bWFyZ2luVG9wKToKKwogMjAxOC0wNi0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdIE91dC1vZi1mbG93IHBvc2l0aW9uZWQgZWxlbWVudCdzIGhl aWdodCBkZXBlbmRzIG9uIGl0cyBjb250YWluaW5nIGJsb2NrJ3MgaGVpZ2h0LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZjlkYzdjNjJmMzQ0OGVmNWMxZGE3OWViYTdjODU3 MzU0NjViYzhhMS4uMWQzNDJiYmNmMjJmZWUzMWEyZmQzNTQwYjFiMTg0NzZhMjlkNmVhOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC04NCw3ICs4NCw3IEBAIHZvaWQgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KExheW91dENvbnRleHQmIGxheW91dENvbnRleHQs IEZvcm1hdHRpbmdTdGF0CiAgICAgICAgICAgICAgICAgLy8gU2luY2UgdGhpcyBib3ggaXMgYSBm b3JtYXR0aW5nIGNvbnRleHQgcm9vdCwgaXQgdGFrZXMgY2FyZSBvZiBpdHMgZW50aXJlIHN1YnRy ZWUuCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAK KwogICAgICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBz dHJlYW0gPDwgIltDb21wdXRlXSAtPiBbUG9zaXRpb25dW0JvcmRlcl1bUGFkZGluZ11bV2lkdGhd W01hcmdpbl0gLT4gZm9yIGxheW91dEJveCgiIDw8ICZsYXlvdXRCb3ggPDwgIikiKTsKICAgICAg ICAgICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGRp c3BsYXlCb3gpOwogICAgICAgICAgICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcobGF5b3V0Q29u dGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCmlu ZGV4IDFkYjhlZTFkNzFjZWI2OTc3NTQyYTA5ZWUzOTdkOGM4MjYyODgzMjkuLjQyYTllYjhlMzQw NGI3YjcwZGE2ZmVlZjE1YTgzYWEwMDEwOWM0YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNw cApAQCAtNzgsNyArNzgsNyBAQCBzdGF0aWMgYm9vbCBpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFdp dGhTaWJsaW5nKGNvbnN0IEJveCYgbGF5b3V0Qm94KQogICAgIHJldHVybiBsYXlvdXRCb3guc3R5 bGUoKS5ib3R0b20oKS5pc0F1dG8oKTsKIH0KIAotc3RhdGljIGJvb2wgaXNNYXJnaW5Ub3BDb2xs YXBzZWRXaXRoUGFyZW50KGNvbnN0IEJveCYgbGF5b3V0Qm94KQorc3RhdGljIGJvb2wgaXNNYXJn aW5Ub3BDb2xsYXBzZWRXaXRoUGFyZW50KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBEaXNw bGF5OjpCb3gmIGRpc3BsYXlCb3gpCiB7CiAgICAgLy8gVGhlIGZpcnN0IGluZmxvdyBjaGlsZCBj b3VsZCBwcm9wYWdhdGUgaXRzIHRvcCBtYXJnaW4gdG8gcGFyZW50LgogICAgIC8vIGh0dHBzOi8v d3d3LnczLm9yZy9UUi9DU1MyMS9ib3guaHRtbCNjb2xsYXBzaW5nLW1hcmdpbnMKQEAgLTk5LDEz ICs5OSwxMyBAQCBzdGF0aWMgYm9vbCBpc01hcmdpblRvcENvbGxhcHNlZFdpdGhQYXJlbnQoY29u c3QgQm94JiBsYXlvdXRCb3gpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIE1hcmdp bnMgb2YgdGhlIHJvb3QgZWxlbWVudCdzIGJveCBkbyBub3QgY29sbGFwc2UuCi0gICAgaWYgKHBh cmVudC5pc0luaXRpYWxDb250YWluaW5nQmxvY2soKSkKKyAgICBpZiAobGF5b3V0Qm94LmlzSW5p dGlhbENvbnRhaW5pbmdCbG9jaygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAo IXBhcmVudC5zdHlsZSgpLmJvcmRlclRvcCgpLm5vblplcm8oKSkKKyAgICBpZiAoZGlzcGxheUJv eC5ib3JkZXJUb3AoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFwYXJlbnQu c3R5bGUoKS5wYWRkaW5nVG9wKCkuaXNaZXJvKCkpCisgICAgaWYgKCFkaXNwbGF5Qm94LnBhZGRp bmdUb3AoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CkBAIC0x MTgsNyArMTE4LDggQEAgTGF5b3V0VW5pdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5D b2xsYXBzZTo6Y29sbGFwc2VkTWFyZ2luVG9wRnJvbUZpcnN0Q2gKICAgICAgICAgcmV0dXJuIDA7 CiAKICAgICBhdXRvJiBmaXJzdEluRmxvd0NoaWxkID0gKmRvd25jYXN0PENvbnRhaW5lcj4obGF5 b3V0Qm94KS5maXJzdEluRmxvd0NoaWxkKCk7Ci0gICAgaWYgKCFpc01hcmdpblRvcENvbGxhcHNl ZFdpdGhQYXJlbnQoZmlyc3RJbkZsb3dDaGlsZCkpCisgICAgYXV0byYgZmlzdEluZmxvd0Rpc3Bs YXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGZpcnN0SW5GbG93 Q2hpbGQpOworICAgIGlmICghaXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoUGFyZW50KGZpcnN0SW5G bG93Q2hpbGQsIGZpc3RJbmZsb3dEaXNwbGF5Qm94KSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAg ICAvLyBDb2xsZWN0IGNvbGxhcHNlZCBtYXJnaW4gdG9wIHJlY3Vyc2l2ZWx5LgpAQCAtMTYxLDcg KzE2Miw4IEBAIExheW91dFVuaXQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFw c2U6Om1hcmdpblRvcChjb25zdCBMYXlvdXRDb250ZXh0CiAgICAgICAgIHJldHVybiAwOwogCiAg ICAgLy8gVE9ETzogdGFrZSBfaGFzQWRqb2luaW5nTWFyZ2luVG9wQW5kQm90dG9tKCkgaW50byBh Y2NvdW50LgotICAgIGlmIChpc01hcmdpblRvcENvbGxhcHNlZFdpdGhQYXJlbnQobGF5b3V0Qm94 KSkKKyAgICBhdXRvJiBkaXNwbGF5Qm94ID0gKmxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxh eW91dEJveChsYXlvdXRCb3gpOworICAgIGlmIChpc01hcmdpblRvcENvbGxhcHNlZFdpdGhQYXJl bnQobGF5b3V0Qm94LCBkaXNwbGF5Qm94KSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAvLyBG bG9hdHMgYW5kIG91dCBvZiBmbG93IHBvc2l0aW9uZWQgYm94ZXMgZG8gbm90IGNvbGxhcHNlIHRo ZWlyIG1hcmdpbnMuCg==