199100 2019-06-20 21:22:52 -0700 [LFC][IFC] Rename Line::m_contentLogicalHeight to m_lineLogicalHeight 2019-06-21 08:43:22 -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 1546801 0 zalan 2019-06-20 21:22:52 -0700 right now _line_logical_height_ seems closer to what that value represents. -this might change in the future though. 1546802 1 webkit-bug-importer 2019-06-20 21:23:37 -0700 <rdar://problem/51973614> 1546803 2 372616 zalan 2019-06-20 21:26:43 -0700 Created attachment 372616 Patch 1546880 3 zalan 2019-06-21 08:43:22 -0700 Committed r246679: <https://trac.webkit.org/changeset/246679> 372616 2019-06-20 21:26:43 -0700 2019-06-21 06:14:55 -0700 Patch bug-199100-20190620212642.patch text/plain 6403 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDdlYWEwMzc3NDBhODA3 M2UyYWQyOWFjNTc2N2NhM2YzMTc4MDUxOS4uNGRjNWIzYzVlNzg3OTQyNTlmOTBkYjNhYTI1NzE0 N2M4NGEyMDA5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA2LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW5hbWUg TGluZTo6bV9jb250ZW50TG9naWNhbEhlaWdodCB0byBtX2xpbmVMb2dpY2FsSGVpZ2h0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkxMDAKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzUxOTczNjE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIG1fbG9naWNhbExpbmVIZWlnaHQgbmFtZSBzZWVtcyBtb3Jl IGFwcHJvcHJpYXRlIGF0IHRoaXMgcG9pbnQgKHRob3VnaCB0aGUgbGluZSBoZWlnaCBpcyBkcml2 ZW4gYnkgdGhlIGNvbnRlbnQgaGVpZ2h0KS4gCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6 Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphZGp1c3RCYXNlbGluZUFu ZExpbmVIZWlnaHQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6bG9naWNhbEhlaWdodCBjb25z dCk6CisKIDIwMTktMDYtMjAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJRkNdIEFkanVzdCBiYXNlbGluZSB0b3Agd2hlbiB0aGUgYmFzZWxpbmUgbW92 ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuY3BwCmluZGV4IGYzYTg5Y2M4MTI3OTVkNjBhODU3NTY2YzcwMmRlZDhiZmVjNTlk MTEuLjk1OTczYzEwMTg5YjQxNDIzMTBmNTQ0ODIzN2M0ODcyNjBhNzBmYWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3Bw CkBAIC01MCw3ICs1MCw3IEBAIExpbmU6OkxpbmUoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0 YXRlLCBjb25zdCBJbml0aWFsQ29uc3RyYWludHMmIGluaXRpYWxDb25zCiAgICAgLCBtX2xvZ2lj YWxUb3BMZWZ0KGluaXRpYWxDb25zdHJhaW50cy50b3BMZWZ0KQogICAgICwgbV9iYXNlbGluZSh7 IGluaXRpYWxDb25zdHJhaW50cy5oZWlnaHRBbmRCYXNlbGluZS5iYXNlbGluZU9mZnNldCwgaW5p dGlhbENvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lLmhlaWdodCAtIGluaXRpYWxDb25zdHJh aW50cy5oZWlnaHRBbmRCYXNlbGluZS5iYXNlbGluZU9mZnNldCB9KQogICAgICwgbV9pbml0aWFs U3RydXQoaW5pdGlhbENvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lLnN0cnV0KQotICAgICwg bV9jb250ZW50TG9naWNhbEhlaWdodChpbml0aWFsQ29uc3RyYWludHMuaGVpZ2h0QW5kQmFzZWxp bmUuaGVpZ2h0KQorICAgICwgbV9saW5lTG9naWNhbEhlaWdodChpbml0aWFsQ29uc3RyYWludHMu aGVpZ2h0QW5kQmFzZWxpbmUuaGVpZ2h0KQogICAgICwgbV9saW5lTG9naWNhbFdpZHRoKGluaXRp YWxDb25zdHJhaW50cy5hdmFpbGFibGVXaWR0aCkKICAgICAsIG1fc2tpcFZlcnRpY2FsQWxpZ21l bnQoc2tpcFZlcnRpY2FsQWxpZ21lbnQgPT0gU2tpcFZlcnRpY2FsQWxpZ21lbnQ6OlllcykKIHsK QEAgLTkxLDEyICs5MSwxMiBAQCBzdGQ6OnVuaXF1ZV9wdHI8TGluZTo6Q29udGVudD4gTGluZTo6 Y2xvc2UoKQogICAgICAgICBpZiAoaXNWaXN1YWxseUVtcHR5KCkpIHsKICAgICAgICAgICAgIG1f YmFzZWxpbmUgPSB7IH07CiAgICAgICAgICAgICBtX2Jhc2VsaW5lVG9wID0geyB9OwotICAgICAg ICAgICAgbV9jb250ZW50TG9naWNhbEhlaWdodCA9IHsgfTsKKyAgICAgICAgICAgIG1fbGluZUxv Z2ljYWxIZWlnaHQgPSB7IH07CiAgICAgICAgIH0KIAogICAgICAgICAvLyBSZW1vdmUgZGVzY2Vu dCB3aGVuIGFsbCBjb250ZW50IGlzIGJhc2VsaW5lIGFsaWduZWQgYnV0IG5vbmUgb2YgdGhlbSBo YXZlIGRlc2NlbnQuCiAgICAgICAgIGlmIChJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtz OjpsaW5lRGVzY2VudE5lZWRzQ29sbGFwc2luZyhtX2xheW91dFN0YXRlLCAqbV9jb250ZW50KSkg ewotICAgICAgICAgICAgbV9jb250ZW50TG9naWNhbEhlaWdodCAtPSBtX2Jhc2VsaW5lLmRlc2Nl bnQ7CisgICAgICAgICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0IC09IG1fYmFzZWxpbmUuZGVzY2Vu dDsKICAgICAgICAgICAgIG1fYmFzZWxpbmUuZGVzY2VudCA9IHsgfTsKICAgICAgICAgfQogCkBA IC0zMjAsNyArMzIwLDcgQEAgdm9pZCBMaW5lOjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQo Y29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0VW5pdAogICAgICAgICAgICAgbV9i YXNlbGluZS5kZXNjZW50ID0gc3RkOjptYXgobV9iYXNlbGluZS5kZXNjZW50LCBoYWxmTGVhZGlu Zy5kZXNjZW50KTsKICAgICAgICAgaWYgKGhhbGZMZWFkaW5nLmFzY2VudCA+IDApCiAgICAgICAg ICAgICBtX2Jhc2VsaW5lLmFzY2VudCA9IHN0ZDo6bWF4KG1fYmFzZWxpbmUuYXNjZW50LCBoYWxm TGVhZGluZy5hc2NlbnQpOwotICAgICAgICBtX2NvbnRlbnRMb2dpY2FsSGVpZ2h0ID0gc3RkOjpt YXgobV9jb250ZW50TG9naWNhbEhlaWdodCwgbV9iYXNlbGluZS5oZWlnaHQoKSk7CisgICAgICAg IG1fbGluZUxvZ2ljYWxIZWlnaHQgPSBzdGQ6Om1heChtX2xpbmVMb2dpY2FsSGVpZ2h0LCBtX2Jh c2VsaW5lLmhlaWdodCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAvLyBBcHBseSBp bml0aWFsIHN0cnV0IGlmIG5lZWRlZC4KQEAgLTMyOSw3ICszMjksNyBAQCB2b2lkIExpbmU6OmFk anVzdEJhc2VsaW5lQW5kTGluZUhlaWdodChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBM YXlvdXRVbml0CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIG1fYmFzZWxpbmUuYXNjZW50 ID0gc3RkOjptYXgobV9pbml0aWFsU3RydXQtPmFzY2VudCwgbV9iYXNlbGluZS5hc2NlbnQpOwog ICAgICAgICBtX2Jhc2VsaW5lLmRlc2NlbnQgPSBzdGQ6Om1heChtX2luaXRpYWxTdHJ1dC0+ZGVz Y2VudCwgbV9iYXNlbGluZS5kZXNjZW50KTsKLSAgICAgICAgbV9jb250ZW50TG9naWNhbEhlaWdo dCA9IHN0ZDo6bWF4KG1fY29udGVudExvZ2ljYWxIZWlnaHQsIG1fYmFzZWxpbmUuaGVpZ2h0KCkp OworICAgICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0ID0gc3RkOjptYXgobV9saW5lTG9naWNhbEhl aWdodCwgbV9iYXNlbGluZS5oZWlnaHQoKSk7CiAgICAgICAgIG1faW5pdGlhbFN0cnV0ID0geyB9 OwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMzQ2LDIwICszNDYsMjAgQEAgdm9pZCBMaW5l OjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRl bSwgTGF5b3V0VW5pdAogICAgICAgICB9CiAgICAgICAgIG1fYmFzZWxpbmUuYXNjZW50ID0gc3Rk OjptYXgobmV3QmFzZWxpbmVDYW5kaWRhdGUuYXNjZW50LCBtX2Jhc2VsaW5lLmFzY2VudCk7CiAg ICAgICAgIG1fYmFzZWxpbmUuZGVzY2VudCA9IHN0ZDo6bWF4KG5ld0Jhc2VsaW5lQ2FuZGlkYXRl LmRlc2NlbnQsIG1fYmFzZWxpbmUuZGVzY2VudCk7Ci0gICAgICAgIG1fY29udGVudExvZ2ljYWxI ZWlnaHQgPSBzdGQ6Om1heChzdGQ6Om1heChtX2NvbnRlbnRMb2dpY2FsSGVpZ2h0LCBydW5IZWln aHQpLCBtX2Jhc2VsaW5lLmhlaWdodCgpKTsKKyAgICAgICAgbV9saW5lTG9naWNhbEhlaWdodCA9 IHN0ZDo6bWF4KHN0ZDo6bWF4KG1fbGluZUxvZ2ljYWxIZWlnaHQsIHJ1bkhlaWdodCksIG1fYmFz ZWxpbmUuaGVpZ2h0KCkpOwogICAgICAgICAvLyBCYXNlbGluZSBhc2NlbnQvZGVzY2VudCBuZXZl ciBzaHJpbmsgLT4gbWF4LgotICAgICAgICBtX2Jhc2VsaW5lVG9wID0gc3RkOjptYXgobV9iYXNl bGluZVRvcCwgbV9jb250ZW50TG9naWNhbEhlaWdodCAtIG1fYmFzZWxpbmUuaGVpZ2h0KCkpOwor ICAgICAgICBtX2Jhc2VsaW5lVG9wID0gc3RkOjptYXgobV9iYXNlbGluZVRvcCwgbV9saW5lTG9n aWNhbEhlaWdodCAtIG1fYmFzZWxpbmUuaGVpZ2h0KCkpOwogICAgICAgICBicmVhazsKICAgICB9 CiAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpUb3A6CiAgICAgICAgIC8vIFRvcCBhbGlnbiBjb250 ZW50IG5ldmVyIGNoYW5nZXMgdGhlIGJhc2VsaW5lIG9mZnNldCwgaXQgb25seSBwdXNoZXMgdGhl IGJvdHRvbSBvZiB0aGUgbGluZSBmdXJ0aGVyIGRvd24uCi0gICAgICAgIG1fY29udGVudExvZ2lj YWxIZWlnaHQgPSBzdGQ6Om1heChydW5IZWlnaHQsIG1fY29udGVudExvZ2ljYWxIZWlnaHQpOwor ICAgICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0ID0gc3RkOjptYXgocnVuSGVpZ2h0LCBtX2xpbmVM b2dpY2FsSGVpZ2h0KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpC b3R0b206CiAgICAgICAgIC8vIEJvdHRvbSBhbGlnbmVkLCB0YWxsIGNvbnRlbnQgcHVzaGVzIHRo ZSBiYXNlbGluZSBmdXJ0aGVyIGRvd24gZnJvbSB0aGUgbGluZSB0b3AuCi0gICAgICAgIGlmIChy dW5IZWlnaHQgPiBtX2NvbnRlbnRMb2dpY2FsSGVpZ2h0KSB7Ci0gICAgICAgICAgICBtX2Jhc2Vs aW5lVG9wICs9IChydW5IZWlnaHQgLSBtX2NvbnRlbnRMb2dpY2FsSGVpZ2h0KTsKLSAgICAgICAg ICAgIG1fY29udGVudExvZ2ljYWxIZWlnaHQgPSBydW5IZWlnaHQ7CisgICAgICAgIGlmIChydW5I ZWlnaHQgPiBtX2xpbmVMb2dpY2FsSGVpZ2h0KSB7CisgICAgICAgICAgICBtX2Jhc2VsaW5lVG9w ICs9IChydW5IZWlnaHQgLSBtX2xpbmVMb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIG1fbGlu ZUxvZ2ljYWxIZWlnaHQgPSBydW5IZWlnaHQ7CiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAg ICAgZGVmYXVsdDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmUuaAppbmRleCAyYTVlYjBkMzA3OTE5MjM0ZTE3NzQ2YTZkOGIwZjUzZWI2 YmMzMGViLi5jYjY5YWJiMjU3NDhiZmQxYWFhNTFkNWJkOTdkZmNkNThiNDM4OTUwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5o CkBAIC0xMTUsNyArMTE1LDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxSaWdo dCgpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxMZWZ0KCkgKyBsb2dpY2FsV2lkdGgoKTsgfQogCiAg ICAgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2xpbmVMb2dpY2Fs V2lkdGg7IH0KLSAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBt X2NvbnRlbnRMb2dpY2FsSGVpZ2h0OyB9CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkg Y29uc3QgeyByZXR1cm4gbV9saW5lTG9naWNhbEhlaWdodDsgfQogCiAgICAgTGF5b3V0VW5pdCBj b250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNhbFdpZHRo OyB9CiAgICAgTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fYmFz ZWxpbmUuYXNjZW50ICsgbV9iYXNlbGluZVRvcDsgfQpAQCAtMTQ1LDcgKzE0NSw3IEBAIHByaXZh dGU6CiAgICAgTGF5b3V0VW5pdCBtX2Jhc2VsaW5lVG9wOwogCiAgICAgT3B0aW9uYWw8TGluZUJv eDo6QmFzZWxpbmU+IG1faW5pdGlhbFN0cnV0OwotICAgIExheW91dFVuaXQgbV9jb250ZW50TG9n aWNhbEhlaWdodDsKKyAgICBMYXlvdXRVbml0IG1fbGluZUxvZ2ljYWxIZWlnaHQ7CiAgICAgTGF5 b3V0VW5pdCBtX2xpbmVMb2dpY2FsV2lkdGg7CiAgICAgYm9vbCBtX3NraXBWZXJ0aWNhbEFsaWdt ZW50IHsgZmFsc2UgfTsKIH07Cg==