193812 2019-01-24 21:02:43 -0800 [LFC][BFC][MarginCollapsing] Move positive/negative margin value updating to a dedicated function 2019-01-25 08:47:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1498132 0 zalan 2019-01-24 21:02:43 -0800 we should move it back if it turns out to be too expensive. 1498133 1 360079 zalan 2019-01-24 21:05:56 -0800 Created attachment 360079 Patch 1498252 2 360079 commit-queue 2019-01-25 08:46:52 -0800 Comment on attachment 360079 Patch Clearing flags on attachment: 360079 Committed r240474: <https://trac.webkit.org/changeset/240474> 1498253 3 commit-queue 2019-01-25 08:46:54 -0800 All reviewed patches have been landed. Closing bug. 1498256 4 webkit-bug-importer 2019-01-25 08:47:29 -0800 <rdar://problem/47550416> 360079 2019-01-24 21:05:56 -0800 2019-01-25 08:46:52 -0800 Patch bug-193812-20190124210547.patch text/plain 6085 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzhhNjc2OWU0ZWE3ZGRm NWUzZTNmMzA3ZjEzZjE3MDg3NmMyMTIyMy4uZDE1OGI3MGM5MGFiYmY5NDY0Y2IyMTNlM2NhM2I1 YzJmN2EwMDc2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTAxLTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXVtNYXJnaW5D b2xsYXBzaW5nXSBNb3ZlIHBvc2l0aXZlL25lZ2F0aXZlIG1hcmdpbiB2YWx1ZSB1cGRhdGluZyB0 byBhIGRlZGljYXRlZCBmdW5jdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTkzODEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTW92ZSB1cGRhdGUgbG9naWMgdG8gQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6TWFyZ2luQ29sbGFwc2U6OnVwZGF0ZVBvc2l0aXZlTmVnYXRpdmVNYXJnaW5WYWx1ZXMoKS4K KworICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVIZWlnaHRBbmRNYXJnaW4gY29uc3QpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjp1cGRhdGVQb3Np dGl2ZU5lZ2F0aXZlTWFyZ2luVmFsdWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OmNvbGxhcHNlZFZlcnRpY2FsVmFs dWVzKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6bGF5b3V0VXNpbmdGb3JtYXR0aW5nQ29udGV4dCk6CisKIDIwMTktMDEtMjQg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtCRkNdW01h cmdpbkNvbGxhcHNpbmddIFJlZmFjdG9yIE1hcmdpbkNvbGxhcHNlOjp1cGRhdGVDb2xsYXBzZWRN YXJnaW5BZnRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggMzQxZjA1MDlk NTliNjVlNjY0NzBiNzIxMjYwMzMwZTQzNGU5YWY4ZS4uN2ZjNGViYzM1OGQ4MmU5YjhlY2Q5MDRi NGJmZGQ1ODkxNjIwNjgzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC00 MzEsNiArNDMxLDggQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSGVpZ2h0 QW5kTWFyZ2luKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAogICAgIGRpc3BsYXlCb3guc2V0 VG9wKGFkanVzdGVkVmVydGljYWxQb3NpdGlvbkFmdGVyTWFyZ2luQ29sbGFwc2luZyhsYXlvdXRC b3gsIHZlcnRpY2FsTWFyZ2luKSk7CiAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVpZ2h0 KGhlaWdodEFuZE1hcmdpbi5oZWlnaHQpOwogICAgIGRpc3BsYXlCb3guc2V0VmVydGljYWxNYXJn aW4odmVydGljYWxNYXJnaW4pOworCisgICAgTWFyZ2luQ29sbGFwc2U6OnVwZGF0ZVBvc2l0aXZl TmVnYXRpdmVNYXJnaW5WYWx1ZXMobGF5b3V0U3RhdGUsIGxheW91dEJveCk7CiAgICAgLy8gQWRq dXN0IHRoZSBwcmV2aW91cyBzaWJsaW5nJ3MgbWFyZ2luIGJvdHRvbSBub3cgdGhhdCB0aGlzIGJv eCdzIHZlcnRpY2FsIG1hcmdpbiBpcyBjb21wdXRlZC4KICAgICBNYXJnaW5Db2xsYXBzZTo6dXBk YXRlTWFyZ2luQWZ0ZXJGb3JQcmV2aW91c1NpYmxpbmcobGF5b3V0U3RhdGUsIGxheW91dEJveCk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGUwNTQzZDE0ODkxZThkYjRiN2M2 Nzg0OWUwMWQ3MGFmMmMyODgwYzguLjM4MmIyYTJlMmVhYmQzOGEyODdkYzQ5N2U2OGU0ODliNTRl MmM4ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC05Nyw2ICs5Nyw3IEBAIHBy aXZhdGU6CiAgICAgICAgIHN0YXRpYyBFc3RpbWF0ZWRNYXJnaW5CZWZvcmUgZXN0aW1hdGVkTWFy Z2luQmVmb3JlKGNvbnN0IExheW91dFN0YXRlJiwgY29uc3QgQm94Jik7CiAgICAgICAgIHN0YXRp YyBMYXlvdXRVbml0IG1hcmdpbkJlZm9yZUlnbm9yaW5nQ29sbGFwc2luZ1Rocm91Z2goY29uc3Qg TGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmLCBjb25zdCBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNv bGxhcHNlZFZhbHVlcyYpOwogICAgICAgICBzdGF0aWMgdm9pZCB1cGRhdGVNYXJnaW5BZnRlckZv clByZXZpb3VzU2libGluZyhjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOworICAgICAg ICBzdGF0aWMgdm9pZCB1cGRhdGVQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luVmFsdWVzKGNvbnN0IExh eW91dFN0YXRlJiwgY29uc3QgQm94Jik7CiAKICAgICAgICAgc3RhdGljIGJvb2wgbWFyZ2luQmVm b3JlQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkJlZm9yZShjb25zdCBMYXlvdXRTdGF0ZSYsIGNv bnN0IEJveCYpOwogICAgICAgICBzdGF0aWMgYm9vbCBtYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRo Rmlyc3RJbkZsb3dDaGlsZE1hcmdpbkJlZm9yZShjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJv eCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja01hcmdpbkNvbGxhcHNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKaW5kZXggM2NhMWMwYmZjOTg2NTcxZWI4OGU3 ZTdiNmQzYmM4YzM0MmJhMjc2OS4uZDQxNDA1YzM0ZGM3NzZmNjA5ZTFkMTI5ZGRkMTdiYjEzYzA4 NTQ1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja01hcmdpbkNvbGxhcHNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCkBAIC02MDYsNiArNjA2LDIyIEBAIExh eW91dFVuaXQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJl Zm9yZUlnbm9yaW5nQ29sbGFwc2luCiAgICAgcmV0dXJuIG1hcmdpblZhbHVlKHBvc2l0aXZlTmVn YXRpdmVNYXJnaW5CZWZvcmUobGF5b3V0U3RhdGUsIGxheW91dEJveCwgbm9uQ29sbGFwc2VkVmFs dWVzKSkudmFsdWVPcihub25Db2xsYXBzZWRWYWx1ZXMuYmVmb3JlKTsKIH0KIAordm9pZCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6dXBkYXRlUG9zaXRpdmVOZWdhdGl2 ZU1hcmdpblZhbHVlcyhjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IEJveCYg bGF5b3V0Qm94KQoreworICAgIEFTU0VSVChsYXlvdXRCb3guaXNCbG9ja0xldmVsQm94KCkpOwor ICAgIGF1dG8gbm9uQ29sbGFwc2VkVmFsdWVzID0gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxh eW91dEJveChsYXlvdXRCb3gpLnZlcnRpY2FsTWFyZ2luKCkubm9uQ29sbGFwc2VkVmFsdWVzKCk7 CisKKyAgICBhdXRvIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUgPSBNYXJnaW5Db2xsYXBz ZTo6cG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZShsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94LCBu b25Db2xsYXBzZWRWYWx1ZXMpOworICAgIGF1dG8gcG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkFmdGVy ID0gTWFyZ2luQ29sbGFwc2U6OnBvc2l0aXZlTmVnYXRpdmVNYXJnaW5BZnRlcihsYXlvdXRTdGF0 ZSwgbGF5b3V0Qm94LCBub25Db2xsYXBzZWRWYWx1ZXMpOworCisgICAgaWYgKE1hcmdpbkNvbGxh cHNlOjptYXJnaW5zQ29sbGFwc2VUaHJvdWdoKGxheW91dFN0YXRlLCBsYXlvdXRCb3gpKSB7Cisg ICAgICAgIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUgPSBjb21wdXRlZFBvc2l0aXZlQW5k TmVnYXRpdmVNYXJnaW4ocG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZSwgcG9zaXRpdmVOZWdh dGl2ZU1hcmdpbkFmdGVyKTsKKyAgICAgICAgcG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkFmdGVyID0g cG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZTsKKyAgICB9CisgICAgYXV0byYgYmxvY2tGb3Jt YXR0aW5nU3RhdGUgPSBkb3duY2FzdDxCbG9ja0Zvcm1hdHRpbmdTdGF0ZT4obGF5b3V0U3RhdGUu Zm9ybWF0dGluZ1N0YXRlRm9yQm94KGxheW91dEJveCkpOworICAgIGJsb2NrRm9ybWF0dGluZ1N0 YXRlLnNldFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihsYXlvdXRCb3gsIHsgcG9z aXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZSwgcG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkFmdGVyIH0p OworfQorCiBVc2VkVmVydGljYWxNYXJnaW46OkNvbGxhcHNlZFZhbHVlcyBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6Y29sbGFwc2VkVmVydGljYWxWYWx1ZXMoY29uc3Qg TGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgVXNl ZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMmIG5vbkNvbGxhcHNlZFZhbHVlcykK IHsKICAgICBpZiAobGF5b3V0Qm94LmlzQW5vbnltb3VzKCkpCkBAIC02MjUsMTAgKzY0MSw2IEBA IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Q29sbGFwc2VkVmFsdWVzIEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6Ok1hcmdpbkNvbGxhcHNlOjpjb2xsCiAgICAgICAgIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5B ZnRlciA9IHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmU7CiAgICAgfQogCi0gICAgLy8gRklY TUU6IE1vdmUgc3RhdGUgc2F2aW5nIG91dCBvZiB0aGlzIGZ1bmN0aW9uLgotICAgIGF1dG8mIGJs b2NrRm9ybWF0dGluZ1N0YXRlID0gZG93bmNhc3Q8QmxvY2tGb3JtYXR0aW5nU3RhdGU+KGxheW91 dFN0YXRlLmZvcm1hdHRpbmdTdGF0ZUZvckJveChsYXlvdXRCb3gpKTsKLSAgICBibG9ja0Zvcm1h dHRpbmdTdGF0ZS5zZXRQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4obGF5b3V0Qm94 LCB7IHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUsIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5B ZnRlciB9KTsKLQogICAgIGF1dG8gYmVmb3JlTWFyZ2luSXNDb2xsYXBzZWRWYWx1ZSA9IG1hcmdp bkJlZm9yZUNvbGxhcHNlc1dpdGhGaXJzdEluRmxvd0NoaWxkTWFyZ2luQmVmb3JlKGxheW91dFN0 YXRlLCBsYXlvdXRCb3gpIHx8IG1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQcmV2aW91c1NpYmxp bmdNYXJnaW5BZnRlcihsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsKICAgICBhdXRvIGFmdGVyTWFy Z2luSXNDb2xsYXBzZWRWYWx1ZSA9IG1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aExhc3RJbkZsb3dD aGlsZE1hcmdpbkFmdGVyKGxheW91dFN0YXRlLCBsYXlvdXRCb3gpOwogCg==