187140 2018-06-28 07:54:05 -0700 [LFC] Add Display::Box::nonCollapsedMarginBox for verification purposes. 2018-06-28 08:43:23 -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 1437333 0 zalan 2018-06-28 07:54:05 -0700 to match marginBox() with RenderBox::marginBoxRect 1437335 1 343807 zalan 2018-06-28 08:03:31 -0700 Created attachment 343807 Patch 1437351 2 zalan 2018-06-28 08:42:50 -0700 Committed r233307: <https://trac.webkit.org/changeset/233307> 1437352 3 webkit-bug-importer 2018-06-28 08:43:23 -0700 <rdar://problem/41582585> 343807 2018-06-28 08:03:31 -0700 2018-06-28 08:06:52 -0700 Patch bug-187140-20180628080330.patch text/plain 6542 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE3NGYzMDBiMzZmZjE4 OTA3MTMwNGJiMWZjOWQ2ODNmMGIyNTcyNS4uMGIyY2E0YzcwNjA2ZDZkNjkzN2QwN2E2NDc5NDU0 ZWExMzEyYzY0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE4LTA2LTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gQWRkIERpc3BsYXk6 OkJveDo6bm9uQ29sbGFwc2VkTWFyZ2luQm94IGZvciB2ZXJpZmljYXRpb24gcHVycG9zZXMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODcxNDAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9G b3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlRmxvYXRpbmdIZWlnaHRBbmRNYXJnaW4gY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd0hv cml6b250YWxHZW9tZXRyeSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L1ZlcmlmaWNhdGlvbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om91dHB1dE1pc21hdGNoaW5nQm94SW5mb3Jt YXRpb25JZk5lZWRlZCk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd0hlaWdodEFuZE1hcmdpbiBjb25zdCk6CisgICAg ICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RGlzcGxheTo6Qm94Ojpub25Db2xsYXBzZWRNYXJnaW5Cb3ggY29uc3QpOgorICAgICAgICAq IGxheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpEaXNw bGF5OjpCb3g6OnNldFZlcnRpY2FsTm9uQ29sbGFwc2VkTWFyZ2luKToKKwogMjAxOC0wNi0yOCAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIFRoZSBtYXJn aW4gYm90dG9tIG9mIHRoZSBkb2N1bWVudCBlbGVtZW50IGRvZXMgbm90IGNvbGxhcHNlIHdpdGgg aXRzIGxhc3QgaW5mbG93IGNoaWxkJ3MgYm90dG9tIG1hcmdpbi4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDA4ZjM1ZDk3NGI5N2JhNWI4YmM0MTM1 OGM2YTVjZjNlMDdmNzZhZGQuLmQ4MTg4NTkwNjAxM2UxN2NmYjk5OWY0NDFiYzk5ODBjNmY1ZTkx YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAt NTUsNyArNTUsOCBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRmxvYXRpbmdIZWln aHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udAogewogICAgIGF1dG8gaGVpZ2h0 QW5kTWFyZ2luID0gR2VvbWV0cnk6OmZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luKGxheW91dENvbnRl eHQsIGxheW91dEJveCk7CiAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVpZ2h0KGhlaWdo dEFuZE1hcmdpbi5oZWlnaHQpOwotICAgIGRpc3BsYXlCb3gubW92ZVZlcnRpY2FsbHkoaGVpZ2h0 QW5kTWFyZ2luLmNvbGxhcHNlZE1hcmdpbi52YWx1ZV9vcihoZWlnaHRBbmRNYXJnaW4ubWFyZ2lu KS50b3ApOworICAgIGRpc3BsYXlCb3gubW92ZVZlcnRpY2FsbHkoaGVpZ2h0QW5kTWFyZ2luLm1h cmdpbi50b3ApOworICAgIEFTU0VSVCghaGVpZ2h0QW5kTWFyZ2luLmNvbGxhcHNlZE1hcmdpbik7 CiAgICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbihoZWlnaHRBbmRNYXJnaW4ubWFyZ2lu KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L1ZlcmlmaWNhdGlvbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNwcAppbmRleCBjN2ZkNzkw NzljYmFlNDI3NWQzNDg4ZDYzNWNlNDE3MGZjNTUyZGUzLi42Njk3ZWE4MmM1NzQ3ZmJiMzJiNWIx MzczYTU0NzY2OGU3OTQ5ZDE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVy aWZpY2F0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNw cApAQCAtNjcsMTAgKzY3LDE5IEBAIHN0YXRpYyBib29sIG91dHB1dE1pc21hdGNoaW5nQm94SW5m b3JtYXRpb25JZk5lZWRlZChUZXh0U3RyZWFtJiBzdHJlYW0sIGNvbnN0IExhCiAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIH0KIAotICAgIGlmIChyZW5kZXJlci5tYXJnaW5Cb3hSZWN0KCkgIT0g ZGlzcGxheUJveC0+bWFyZ2luQm94KCkpIHsKKyNpZm5kZWYgTkRFQlVHCisgICAgaWYgKHJlbmRl cmVyLm1hcmdpbkJveFJlY3QoKSAhPSBkaXNwbGF5Qm94LT5ub25Db2xsYXBzZWRNYXJnaW5Cb3go KSkgeworICAgICAgICBvdXRwdXRSZWN0KCJtYXJnaW5Cb3giLCByZW5kZXJlci5tYXJnaW5Cb3hS ZWN0KCksIGRpc3BsYXlCb3gtPm5vbkNvbGxhcHNlZE1hcmdpbkJveCgpKTsKKyAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgfQorI2Vsc2UKKyAgICAvLyBGb3Igbm93IGluIG5vbi1kZWJ1ZyBidWls ZHMsIHZlcmlmeSB0aGUgaG9yaXpvbnRhbCBtYXJnaW4gb25seQorICAgIGlmIChyZW5kZXJlci5t YXJnaW5Cb3hSZWN0KCkubGVmdCgpICE9IGRpc3BsYXlCb3gtPm1hcmdpbkJveCgpLmxlZnQoKQor ICAgICAgICB8fCByZW5kZXJlci5tYXJnaW5Cb3hSZWN0KCkucmlnaHQoKSAhPSBkaXNwbGF5Qm94 LT5tYXJnaW5Cb3goKS5yaWdodCgpICkgewogICAgICAgICBvdXRwdXRSZWN0KCJtYXJnaW5Cb3gi LCByZW5kZXJlci5tYXJnaW5Cb3hSZWN0KCksIGRpc3BsYXlCb3gtPm1hcmdpbkJveCgpKTsKICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQorI2VuZGlmCiAKICAgICBpZiAocmVuZGVyZXIuYm9y ZGVyQm94UmVjdCgpICE9IGRpc3BsYXlCb3gtPmJvcmRlckJveCgpKSB7CiAgICAgICAgIG91dHB1 dFJlY3QoImJvcmRlckJveCIsIHJlbmRlcmVyLmJvcmRlckJveFJlY3QoKSwgZGlzcGxheUJveC0+ Ym9yZGVyQm94KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNDM1Nzcz NWNiOTgzMWU5ZWZlNTFhZjI0NDA1M2JhMzAwN2M1NWE5Zi4uYzljODI3NTc1MWQ0ZmEzZDg2ZjVh ZWRiZjczOTgwNmQwODhhMzQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBA IC0xOTMsNyArMTkzLDEwIEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUlu Rmxvd0hlaWdodEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDCiAgICAgYXV0byBoZWln aHRBbmRNYXJnaW4gPSBHZW9tZXRyeTo6aW5GbG93SGVpZ2h0QW5kTWFyZ2luKGxheW91dENvbnRl eHQsIGxheW91dEJveCk7CiAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVpZ2h0KGhlaWdo dEFuZE1hcmdpbi5oZWlnaHQpOwogICAgIGRpc3BsYXlCb3gubW92ZVZlcnRpY2FsbHkoaGVpZ2h0 QW5kTWFyZ2luLmNvbGxhcHNlZE1hcmdpbi52YWx1ZV9vcihoZWlnaHRBbmRNYXJnaW4ubWFyZ2lu KS50b3ApOwotICAgIGRpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4oaGVpZ2h0QW5kTWFyZ2lu Lm1hcmdpbik7CisgICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbihoZWlnaHRBbmRNYXJn aW4uY29sbGFwc2VkTWFyZ2luLnZhbHVlX29yKGhlaWdodEFuZE1hcmdpbi5tYXJnaW4pKTsKKyNp Zm5kZWYgTkRFQlVHCisgICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE5vbkNvbGxhcHNlZE1hcmdp bihoZWlnaHRBbmRNYXJnaW4ubWFyZ2luKTsKKyNlbmRpZgogfQogCiB2b2lkIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6OmNvbXB1dGVJbkZsb3dXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBs YXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5 Qm94KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVl L0Rpc3BsYXlCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3Bs YXlCb3guY3BwCmluZGV4IDJiY2M2ZjRhZWNlNzcxMmI5YTU0ZWE5NGVkZTUwYTNmM2ZhNjEwMTku LmRjMWYzMWJiMDBkMjlkNDM4YzE1NjYyMWQ5YmQ4NzVhNGE4ZmIxNGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5jcHAKQEAgLTYyLDYgKzYy LDIwIEBAIEJveDo6UmVjdCBCb3g6Om1hcmdpbkJveCgpIGNvbnN0CiAgICAgcmV0dXJuIG1hcmdp bkJveDsKIH0KIAorI2lmbmRlZiBOREVCVUcKK0JveDo6UmVjdCBCb3g6Om5vbkNvbGxhcHNlZE1h cmdpbkJveCgpIGNvbnN0Cit7CisgICAgYXV0byBib3JkZXJCb3ggPSB0aGlzLT5ib3JkZXJCb3go KTsKKworICAgIFJlY3QgbWFyZ2luQm94OworICAgIG1hcmdpbkJveC5zZXRUb3AoYm9yZGVyQm94 LnRvcCgpIC0gbV9ub25Db2xsYXBzZWRWZXJ0aXZhbE1hcmdpbi50b3ApOworICAgIG1hcmdpbkJv eC5zZXRMZWZ0KGJvcmRlckJveC5sZWZ0KCkgLSBtYXJnaW5MZWZ0KCkpOworICAgIG1hcmdpbkJv eC5zZXRIZWlnaHQoYm9yZGVyQm94LmhlaWdodCgpICsgbV9ub25Db2xsYXBzZWRWZXJ0aXZhbE1h cmdpbi50b3AgKyBtX25vbkNvbGxhcHNlZFZlcnRpdmFsTWFyZ2luLmJvdHRvbSk7CisgICAgbWFy Z2luQm94LnNldFdpZHRoKGJvcmRlckJveC53aWR0aCgpICsgbWFyZ2luTGVmdCgpICsgbWFyZ2lu UmlnaHQoKSk7CisgICAgcmV0dXJuIG1hcmdpbkJveDsKK30KKyNlbmRpZgorCiBCb3g6OlJlY3Qg Qm94Ojpib3JkZXJCb3goKSBjb25zdAogewogICAgIFJlY3QgYm9yZGVyQm94OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKaW5kZXggYmEyZDg2NmEx YTIxYmU0YjU0YWNhZjliYTY0NDI4YzYzMTgzODc4OC4uNTJiZDlhYTQ3NzhkN2NiODc0MDNhNGM0 MmVlYTAyYTgxZjg2ZWRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3Bs YXl0cmVlL0Rpc3BsYXlCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRy ZWUvRGlzcGxheUJveC5oCkBAIC0xNDcsNiArMTQ3LDkgQEAgcHVibGljOgogICAgIExheW91dFVu aXQgY29udGVudEJveFdpZHRoKCkgY29uc3Q7CiAKICAgICBSZWN0IG1hcmdpbkJveCgpIGNvbnN0 OworI2lmbmRlZiBOREVCVUcKKyAgICBSZWN0IG5vbkNvbGxhcHNlZE1hcmdpbkJveCgpIGNvbnN0 OworI2VuZGlmCiAgICAgUmVjdCBib3JkZXJCb3goKSBjb25zdDsKICAgICBSZWN0IHBhZGRpbmdC b3goKSBjb25zdDsKICAgICBSZWN0IGNvbnRlbnRCb3goKSBjb25zdDsKQEAgLTE4Niw2ICsxODks OSBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBzZXRIb3Jpem9udGFsTWFyZ2luKEhvcml6b250YWxF ZGdlcyk7CiAgICAgdm9pZCBzZXRWZXJ0aWNhbE1hcmdpbihWZXJ0aWNhbEVkZ2VzKTsKKyNpZm5k ZWYgTkRFQlVHCisgICAgdm9pZCBzZXRWZXJ0aWNhbE5vbkNvbGxhcHNlZE1hcmdpbihWZXJ0aWNh bEVkZ2VzIG1hcmdpbikgeyAgbV9ub25Db2xsYXBzZWRWZXJ0aXZhbE1hcmdpbiA9IG1hcmdpbjsg fQorI2VuZGlmCiAgICAgdm9pZCBzZXRCb3JkZXIoRWRnZXMpOwogICAgIHZvaWQgc2V0UGFkZGlu ZyhFZGdlcyk7CiAKQEAgLTIxMSw2ICsyMTcsOSBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQg bV9jb250ZW50SGVpZ2h0OwogCiAgICAgRWRnZXMgbV9tYXJnaW47CisjaWZuZGVmIE5ERUJVRwor ICAgIFZlcnRpY2FsRWRnZXMgbV9ub25Db2xsYXBzZWRWZXJ0aXZhbE1hcmdpbjsKKyNlbmRpZgog ICAgIEVkZ2VzIG1fYm9yZGVyOwogICAgIEVkZ2VzIG1fcGFkZGluZzsKIAo=