198899 2019-06-15 19:35:29 -0700 [LFC][IFC] Use the borderBox rect consistently to size the inline box. 2019-06-16 12:28:21 -0700 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 1545082 0 zalan 2019-06-15 19:35:29 -0700 ssia 1545083 1 webkit-bug-importer 2019-06-15 19:37:58 -0700 <rdar://problem/51781969> 1545084 2 372210 zalan 2019-06-15 19:39:23 -0700 Created attachment 372210 Patch 1545145 3 372210 commit-queue 2019-06-16 12:28:19 -0700 Comment on attachment 372210 Patch Clearing flags on attachment: 372210 Committed r246475: <https://trac.webkit.org/changeset/246475> 1545146 4 commit-queue 2019-06-16 12:28:21 -0700 All reviewed patches have been landed. Closing bug. 372210 2019-06-15 19:39:23 -0700 2019-06-16 12:28:19 -0700 Patch bug-198899-20190615193923.patch text/plain 6398 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQzZjBkNjEwY2MwMGQ4 YmEwODE3ODNkM2Y3MDBiMWFjZjRiOWZjOS4uMWFiMmFmOTYwZTNkYjAyN2NiYzhhZmZmZjU4MWFl NDI0NTllYjdjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA2LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBVc2UgdGhl IGJvcmRlckJveCByZWN0IGNvbnNpc3RlbnRseSB0byBzaXplIHRoZSBpbmxpbmUgYm94LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4ODk5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS81MTc4MTk2OT4KKworICAgICAgICBVc2UgdGhlIG1hcmdpbiBib3ggaGVpZ2h0ICh3aGVuIGFw cGxpY2FibGUpIHRvIGFkanVzdCB0aGUgbGluZSBoZWlnaHQgYW5kIHVzZSB0aGUgYm9yZGVyQm94 IHJlY3QgKG9yIGZvbnQgc2l6ZSkgaGVpZ2h0IHRvIHNpemUgdGhlIGlubGluZSBib3guCisKKyAg ICAgICAgKiBsYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oOgorICAgICAgICAoV2ViQ29y ZTo6RGlzcGxheTo6Qm94Ojpib3JkZXJCb3hIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6RGlzcGxheTo6Qm94OjptYXJnaW5Cb3hIZWlnaHQgY29uc3QpOgorICAgICAgICAqIGxheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lOjphcHBlbmRJbmxpbmVDb250YWluZXJTdGFydCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkxpbmU6OmFwcGVuZFRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZTo6YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3gpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjppbmxpbmVJdGVtQ29udGVudEhlaWdodCBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmlubGluZUl0ZW1IZWlnaHQgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaDoKKwogMjAx OS0wNi0xNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNd W0lGQ10gTGluZTo6aXNWaXN1YWxseUVtcHR5IHNob3VsZCBjaGVjayBpbmxpbmUtYmxvY2sgYm94 ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxh eUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaApp bmRleCA1Y2RmNjNiZjc3OTU5MWE4OGU3NDgyMzI2MmEwYTkwYzIxOTdhNGMwLi40ZGYwMWEzZDIw OGNlYWYyMjk2YTE0NmUyY2JjYjNlODIwMzI5NjQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKQEAgLTExOSw3ICsxMTksOSBAQCBwdWJsaWM6 CiAgICAgTGF5b3V0VW5pdCBwYWRkaW5nQm94SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gcGFkZGlu Z1RvcCgpLnZhbHVlT3IoMCkgKyBjb250ZW50Qm94SGVpZ2h0KCkgKyBwYWRkaW5nQm90dG9tKCku dmFsdWVPcigwKTsgfQogICAgIExheW91dFVuaXQgcGFkZGluZ0JveFdpZHRoKCkgY29uc3QgeyBy ZXR1cm4gcGFkZGluZ0xlZnQoKS52YWx1ZU9yKDApICsgY29udGVudEJveFdpZHRoKCkgKyBwYWRk aW5nUmlnaHQoKS52YWx1ZU9yKDApOyB9CiAKKyAgICBMYXlvdXRVbml0IGJvcmRlckJveEhlaWdo dCgpIGNvbnN0IHsgcmV0dXJuIGJvcmRlclRvcCgpICsgcGFkZGluZ0JveEhlaWdodCgpICsgYm9y ZGVyQm90dG9tKCk7IH0KICAgICBMYXlvdXRVbml0IGJvcmRlckJveFdpZHRoKCkgY29uc3QgeyBy ZXR1cm4gYm9yZGVyTGVmdCgpICsgcGFkZGluZ0JveFdpZHRoKCkgKyBib3JkZXJSaWdodCgpOyB9 CisgICAgTGF5b3V0VW5pdCBtYXJnaW5Cb3hIZWlnaHQoKSBjb25zdCB7IHJldHVybiBtYXJnaW5C ZWZvcmUoKSArIGJvcmRlckJveEhlaWdodCgpICsgbWFyZ2luQWZ0ZXIoKTsgfQogICAgIExheW91 dFVuaXQgbWFyZ2luQm94V2lkdGgoKSBjb25zdCB7IHJldHVybiBtYXJnaW5TdGFydCgpICsgYm9y ZGVyQm94V2lkdGgoKSArIG1hcmdpbkVuZCgpOyB9CiAKICAgICBSZWN0IG1hcmdpbkJveCgpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmNwcAppbmRleCBiZmVjOGE4ZGYxZjllY2YxMzMzZTM0ZDQzZDc3NjdlMjkwNzM4 ZDBlLi45YWVkYWIxM2ExNGM1NmIwNDhlNjUzYTRlMWNmNzYxMTE1NmZkYjJmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNw cApAQCAtMjAxLDcgKzIwMSw3IEBAIHZvaWQgTGluZTo6YXBwZW5kSW5saW5lQ29udGFpbmVyU3Rh cnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0VW5pdCBsCiAgICAgbG9naWNh bFJlY3Quc2V0V2lkdGgobG9naWNhbFdpZHRoKTsKIAogICAgIGlmICghbV9za2lwVmVydGljYWxB bGlnbWVudCkgewotICAgICAgICBhdXRvIGxvZ2ljYWxIZWlnaHQgPSBpbmxpbmVJdGVtSGVpZ2h0 KGlubGluZUl0ZW0pOworICAgICAgICBhdXRvIGxvZ2ljYWxIZWlnaHQgPSBpbmxpbmVJdGVtQ29u dGVudEhlaWdodChpbmxpbmVJdGVtKTsKICAgICAgICAgYWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVp Z2h0KGlubGluZUl0ZW0sIGxvZ2ljYWxIZWlnaHQpOwogICAgICAgICBsb2dpY2FsUmVjdC5zZXRI ZWlnaHQobG9naWNhbEhlaWdodCk7CiAgICAgfQpAQCAtMjQ4LDcgKzI0OCw3IEBAIHZvaWQgTGlu ZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZUl0ZW0sIExh eW91dFVuaXQgbG9naWNhCiAgICAgbG9naWNhbFJlY3Quc2V0TGVmdChjb250ZW50TG9naWNhbFJp Z2h0KCkpOwogICAgIGxvZ2ljYWxSZWN0LnNldFdpZHRoKGxvZ2ljYWxXaWR0aCk7CiAgICAgaWYg KCFtX3NraXBWZXJ0aWNhbEFsaWdtZW50KQotICAgICAgICBsb2dpY2FsUmVjdC5zZXRIZWlnaHQo aW5saW5lSXRlbUhlaWdodChpbmxpbmVJdGVtKSk7CisgICAgICAgIGxvZ2ljYWxSZWN0LnNldEhl aWdodChpbmxpbmVJdGVtQ29udGVudEhlaWdodChpbmxpbmVJdGVtKSk7CiAKICAgICBhdXRvIHRl eHRDb250ZXh0ID0gQ29udGVudDo6UnVuOjpUZXh0Q29udGV4dCB7IGlubGluZUl0ZW0uc3RhcnQo KSwgaW5saW5lSXRlbS5pc0NvbGxhcHNlZCgpID8gMSA6IGlubGluZUl0ZW0ubGVuZ3RoKCkgfTsK ICAgICBhdXRvIGxpbmVJdGVtID0gc3RkOjptYWtlX3VuaXF1ZTxDb250ZW50OjpSdW4+KGlubGlu ZUl0ZW0sIGxvZ2ljYWxSZWN0LCB0ZXh0Q29udGV4dCwgaXNDb21wbGV0ZWx5Q29sbGFwc2VkLCBj YW5CZUV4dGVuZGVkKTsKQEAgLTI2OCw5ICsyNjgsOCBAQCB2b2lkIExpbmU6OmFwcGVuZE5vblJl cGxhY2VkSW5saW5lQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQg bAogICAgIGxvZ2ljYWxSZWN0LnNldExlZnQoY29udGVudExvZ2ljYWxSaWdodCgpICsgaG9yaXpv bnRhbE1hcmdpbi5zdGFydCk7CiAgICAgbG9naWNhbFJlY3Quc2V0V2lkdGgobG9naWNhbFdpZHRo KTsKICAgICBpZiAoIW1fc2tpcFZlcnRpY2FsQWxpZ21lbnQpIHsKLSAgICAgICAgYXV0byBsb2dp Y2FsSGVpZ2h0ID0gaW5saW5lSXRlbUhlaWdodChpbmxpbmVJdGVtKTsKLSAgICAgICAgYWRqdXN0 QmFzZWxpbmVBbmRMaW5lSGVpZ2h0KGlubGluZUl0ZW0sIGxvZ2ljYWxIZWlnaHQpOwotICAgICAg ICBsb2dpY2FsUmVjdC5zZXRIZWlnaHQobG9naWNhbEhlaWdodCk7CisgICAgICAgIGFkanVzdEJh c2VsaW5lQW5kTGluZUhlaWdodChpbmxpbmVJdGVtLCBkaXNwbGF5Qm94Lm1hcmdpbkJveEhlaWdo dCgpKTsKKyAgICAgICAgbG9naWNhbFJlY3Quc2V0SGVpZ2h0KGlubGluZUl0ZW1Db250ZW50SGVp Z2h0KGlubGluZUl0ZW0pKTsKICAgICB9CiAKICAgICBtX2NvbnRlbnQtPnJ1bnMoKS5hcHBlbmQo c3RkOjptYWtlX3VuaXF1ZTxDb250ZW50OjpSdW4+KGlubGluZUl0ZW0sIGxvZ2ljYWxSZWN0LCBD b250ZW50OjpSdW46OlRleHRDb250ZXh0IHsgfSwgZmFsc2UsIGZhbHNlKSk7CkBAIC0zNDQsNyAr MzQzLDcgQEAgdm9pZCBMaW5lOjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoY29uc3QgSW5s aW5lSXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0VW5pdAogICAgIH0KIH0KIAotTGF5b3V0VW5pdCBM aW5lOjppbmxpbmVJdGVtSGVpZ2h0KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0pIGNvbnN0 CitMYXlvdXRVbml0IExpbmU6OmlubGluZUl0ZW1Db250ZW50SGVpZ2h0KGNvbnN0IElubGluZUl0 ZW0mIGlubGluZUl0ZW0pIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFtX3NraXBWZXJ0aWNhbEFsaWdt ZW50KTsKICAgICBhdXRvJiBmb250TWV0cmljcyA9IGlubGluZUl0ZW0uc3R5bGUoKS5mb250TWV0 cmljcygpOwpAQCAtMzU2LDE2ICszNTUsMTYgQEAgTGF5b3V0VW5pdCBMaW5lOjppbmxpbmVJdGVt SGVpZ2h0KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0pIGNvbnN0CiAgICAgYXV0byYgZGlz cGxheUJveCA9IG1fbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRCb3gp OwogCiAgICAgaWYgKGxheW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKQotICAgICAgICBy ZXR1cm4gZGlzcGxheUJveC5tYXJnaW5Cb3goKS5oZWlnaHQoKTsKKyAgICAgICAgcmV0dXJuIGRp c3BsYXlCb3guYm9yZGVyQm94SGVpZ2h0KCk7CiAKICAgICBpZiAobGF5b3V0Qm94LmlzUmVwbGFj ZWQoKSkKLSAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3guaGVpZ2h0KCk7CisgICAgICAgIHJldHVy biBkaXNwbGF5Qm94LmJvcmRlckJveEhlaWdodCgpOwogCiAgICAgaWYgKGlubGluZUl0ZW0uaXND b250YWluZXJTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSkKICAgICAgICAg cmV0dXJuIGZvbnRNZXRyaWNzLmhlaWdodCgpICsgZGlzcGxheUJveC52ZXJ0aWNhbEJvcmRlcigp ICsgZGlzcGxheUJveC52ZXJ0aWNhbFBhZGRpbmcoKS52YWx1ZU9yKDApOwogCiAgICAgLy8gTm9u LXJlcGxhY2VkIGlubGluZSBib3ggKGUuZy4gaW5saW5lLWJsb2NrKQotICAgIHJldHVybiBkaXNw bGF5Qm94Lm1hcmdpbkJveCgpLmhlaWdodCgpOworICAgIHJldHVybiBkaXNwbGF5Qm94LmJvcmRl ckJveEhlaWdodCgpOwogfQogCiBMaW5lQm94OjpCYXNlbGluZSBMaW5lOjpoYWxmTGVhZGluZ01l dHJpY3MoY29uc3QgRm9udE1ldHJpY3MmIGZvbnRNZXRyaWNzLCBMYXlvdXRVbml0IGxpbmVMb2dp Y2FsSGVpZ2h0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZS5oCmluZGV4IDdiYjY1ZjIzMzBkNDU3ZmMyOWE3MTk2OTJkOGJiYzNhNTc3 Mzc2MDcuLjA4YzEwODY3NDk3NjQ3MjQwNjQxMjFiODM2Y2M2MzFkYzI5NGRhMWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgK QEAgLTExOCw3ICsxMTgsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdUcmlt bWFibGVDb250ZW50KCk7CiAKICAgICB2b2lkIGFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodChj b25zdCBJbmxpbmVJdGVtJiwgTGF5b3V0VW5pdCBydW5IZWlnaHQpOwotICAgIExheW91dFVuaXQg aW5saW5lSXRlbUhlaWdodChjb25zdCBJbmxpbmVJdGVtJikgY29uc3Q7CisgICAgTGF5b3V0VW5p dCBpbmxpbmVJdGVtQ29udGVudEhlaWdodChjb25zdCBJbmxpbmVJdGVtJikgY29uc3Q7CiAgICAg Ym9vbCBpc1Zpc3VhbGx5RW1wdHkoKSBjb25zdDsKIAogICAgIGNvbnN0IExheW91dFN0YXRlJiBt X2xheW91dFN0YXRlOwo=