236688 2022-02-15 21:08:10 -0800 [LFC][Integration] LineLayout::firstLineBaseline callers expect physical position 2022-02-16 09:32:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1842119 0 zalan 2022-02-15 21:08:10 -0800 ssia 1842121 1 452141 zalan 2022-02-15 21:13:06 -0800 Created attachment 452141 Patch 1842264 2 452141 koivisto 2022-02-16 06:37:48 -0800 Comment on attachment 452141 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452141&action=review > Source/WebCore/rendering/RenderBlockFlow.cpp:2962 > + return LayoutUnit { floorToInt(modernLineLayout()->firstLinePhysicalBaseline()) }; would be nice to rename RenderBlockFlow::firstLineBaseline etc too 1842266 3 zalan 2022-02-16 06:39:47 -0800 (In reply to Antti Koivisto from comment #2) > Comment on attachment 452141 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=452141&action=review > > > Source/WebCore/rendering/RenderBlockFlow.cpp:2962 > > + return LayoutUnit { floorToInt(modernLineLayout()->firstLinePhysicalBaseline()) }; > > would be nice to rename RenderBlockFlow::firstLineBaseline etc too Good idea. will do it in a follow up patch! 1842325 4 ews-feeder 2022-02-16 09:30:58 -0800 Committed r289897 (247333@main): <https://commits.webkit.org/247333@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452141. 1842326 5 webkit-bug-importer 2022-02-16 09:32:17 -0800 <rdar://problem/89030489> 452141 2022-02-15 21:13:06 -0800 2022-02-16 09:31:01 -0800 Patch bug-236688-20220215211305.patch text/plain 6134 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Nzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGVhMGYzMzU0N2YwYTQx OGE3Nzc4MDE0YmVmYjFiNDNhMzVmOWIxZC4uMmJiZGZmMWQxNTk2MGFmYjg3YmZhZGJmZWRkYjZh OGRmYjQ3MzU1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTAyLTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0g TGluZUxheW91dDo6Zmlyc3RMaW5lQmFzZWxpbmUgY2FsbGVycyBleHBlY3QgcGh5c2ljYWwgcG9z aXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz NjY4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExl Z2FjeSBsaW5lIGxheW91dCByZXR1cm5zIHRoZSBwaHlzaWNhbCBwb3NpdGlvbiB0b28sIHRob3Vn aCBpbiBhIGJpdCBvYnNjdXJlIG1hbm5lcjoKKworICAgICAgICAgIGZpcnN0Um9vdEJveCgpLT5s b2dpY2FsVG9wKCkgKyBmaXJzdExpbmVTdHlsZSgpLm1ldHJpY3NPZlByaW1hcnlGb250KCkuZGVz Y2VudChmaXJzdFJvb3RCb3goKS0+YmFzZWxpbmVUeXBlKCkpCisgICAgICAgICAgd2hlcmUKKyAg ICAgICAgICAgIC8vIFRoZSBsb2dpY2FsVG9wWyBwb3NpdGlvbiBpcyB0aGUgdG9wIGVkZ2Ugb2Yg dGhlIGxpbmUgYm94IGluIGEgaG9yaXpvbnRhbCBsaW5lIGFuZCB0aGUgbGVmdCBlZGdlIGluIGEg dmVydGljYWwgbGluZS4KKyAgICAgICAgICAgIGZsb2F0IGxvZ2ljYWxUb3AoKSBjb25zdCB7IHJl dHVybiBpc0hvcml6b250YWwoKSA/IG1fdG9wTGVmdC55KCkgOiBtX3RvcExlZnQueCgpOyB9CisK KyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmg6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZTo6bGluZUJveEhlaWdodCBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZTo6bGluZUJv eFdpZHRoIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25MaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjpMaW5lTGF5b3V0OjpmaXJzdExpbmVQaHlzaWNhbEJhc2VsaW5lIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpsYXN0TGluZUxvZ2ljYWxC YXNlbGluZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGlu ZUxheW91dDo6Zmlyc3RMaW5lQmFzZWxpbmUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6Omxhc3RMaW5lQmFzZWxpbmUgY29u c3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Zmlyc3RMaW5lQmFzZWxpbmUg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjppbmxpbmVCbG9ja0Jh c2VsaW5lIGNvbnN0KToKKwogMjAyMi0wMi0xNSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ11bSUZDXSAndmVydGljYWwtYWxpZ246IGJvdHRvbScgbWFrZXMg aW5saW5lIGxldmVsIGJveGVzIHN0aWNrIG91dCBvZiB0aGVpciBwYXJlbnQgYmxvY2sgYm94CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25MaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25MaW5lLmgKaW5kZXggZjA2YTY5MGM3MTBhNjJmYmQ0ZGQ3OTYxYTc3NTA2NWIwYmVk NTEzZS4uZjNjMThkZmVmMjMyZmZjYTJkYmM1YmU2Y2JkYTRmOGM1NGFhN2FmYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGlu ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmUuaApAQCAtNTgsNiArNTgsOCBAQCBwdWJsaWM6CiAgICAgZmxvYXQgbGluZUJveEJv dHRvbSgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3QubWF4WSgpOyB9CiAgICAgZmxvYXQg bGluZUJveExlZnQoKSBjb25zdCB7IHJldHVybiBtX2xpbmVCb3hSZWN0LngoKTsgfQogICAgIGZs b2F0IGxpbmVCb3hSaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3QubWF4WCgpOyB9 CisgICAgZmxvYXQgbGluZUJveEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3Qu aGVpZ2h0KCk7IH0KKyAgICBmbG9hdCBsaW5lQm94V2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2xp bmVCb3hSZWN0LndpZHRoKCk7IH0KIAogICAgIGZsb2F0IGVuY2xvc2luZ0NvbnRlbnRUb3AoKSBj b25zdCB7IHJldHVybiBtX2VuY2xvc2luZ0NvbnRlbnRUb3A7IH0KICAgICBmbG9hdCBlbmNsb3Np bmdDb250ZW50Qm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9lbmNsb3NpbmdDb250ZW50Qm90dG9t OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IDc5MjZlYTVkZGYzMTRm YWRmZWNjYTczZjdmMDEwNzMzMjVlOWE0ZjcuLjhhY2UwMzMxZWJjNDQ2YzU4NmU5N2NlODI1ZTkw ZjA0NmUzNDU2M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC00MjQs NyArNDI0LDcgQEAgc2l6ZV90IExpbmVMYXlvdXQ6OmxpbmVDb3VudCgpIGNvbnN0CiAgICAgcmV0 dXJuIG1faW5saW5lQ29udGVudC0+bGluZXMuc2l6ZSgpOwogfQogCi1MYXlvdXRVbml0IExpbmVM YXlvdXQ6OmZpcnN0TGluZUJhc2VsaW5lKCkgY29uc3QKK0xheW91dFVuaXQgTGluZUxheW91dDo6 Zmlyc3RMaW5lUGh5c2ljYWxCYXNlbGluZSgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2lubGluZUNv bnRlbnQgfHwgbV9pbmxpbmVDb250ZW50LT5saW5lcy5pc0VtcHR5KCkpIHsKICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CkBAIC00MzUsMTIgKzQzNSwxMCBAQCBMYXlvdXRVbml0IExpbmVM YXlvdXQ6OmZpcnN0TGluZUJhc2VsaW5lKCkgY29uc3QKICAgICBpZiAocm9vdExheW91dEJveCgp LnN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKICAgICAgICAgcmV0dXJuIExheW91 dFVuaXQgeyBmaXJzdExpbmUubGluZUJveFRvcCgpICsgZmlyc3RMaW5lLmJhc2VsaW5lKCkgfTsK IAotICAgIC8vIFNlZSBMaW5lTGF5b3V0OjpsYXN0TGluZUJhc2VsaW5lIGJlbG93IGZvciBtb3Jl IGluZm8uCi0gICAgYXV0byBsaW5lTG9naWNhbFRvcCA9IGZsb3coKS5sb2dpY2FsSGVpZ2h0KCkg LSBmaXJzdExpbmUubGluZUJveFJpZ2h0KCk7Ci0gICAgcmV0dXJuIExheW91dFVuaXQgeyBsaW5l TG9naWNhbFRvcCArIGZpcnN0TGluZS5iYXNlbGluZSgpIH07CisgICAgcmV0dXJuIExheW91dFVu aXQgeyBmaXJzdExpbmUubGluZUJveExlZnQoKSArIChmaXJzdExpbmUubGluZUJveFdpZHRoKCkg LSBmaXJzdExpbmUuYmFzZWxpbmUoKSkgfTsKIH0KIAotTGF5b3V0VW5pdCBMaW5lTGF5b3V0Ojps YXN0TGluZUJhc2VsaW5lKCkgY29uc3QKK0xheW91dFVuaXQgTGluZUxheW91dDo6bGFzdExpbmVM b2dpY2FsQmFzZWxpbmUoKSBjb25zdAogewogICAgIGlmICghbV9pbmxpbmVDb250ZW50IHx8IG1f aW5saW5lQ29udGVudC0+bGluZXMuaXNFbXB0eSgpKSB7CiAgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uTGluZUxheW91dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oCmluZGV4IDBiYWY1NWZiYmQzNGFm ZTRkMWViZmViZmU0Y2ZlMmFjMThiYzAxNmYuLjE1NWNiMDM3ZDBjMzEwMjFjNjY1M2QzNjc0ZTQz MmZhMWQwY2I4MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmgKQEAgLTg4LDggKzg4 LDggQEAgcHVibGljOgogICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxIZWlnaHQoKSBjb25z dDsKICAgICBzaXplX3QgbGluZUNvdW50KCkgY29uc3Q7CiAKLSAgICBMYXlvdXRVbml0IGZpcnN0 TGluZUJhc2VsaW5lKCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBsYXN0TGluZUJhc2VsaW5lKCkg Y29uc3Q7CisgICAgTGF5b3V0VW5pdCBmaXJzdExpbmVQaHlzaWNhbEJhc2VsaW5lKCkgY29uc3Q7 CisgICAgTGF5b3V0VW5pdCBsYXN0TGluZUxvZ2ljYWxCYXNlbGluZSgpIGNvbnN0OwogCiAgICAg dm9pZCBhZGp1c3RGb3JQYWdpbmF0aW9uKCk7CiAgICAgdm9pZCBjb2xsZWN0T3ZlcmZsb3coKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggOTA3 NGY1N2MwMmZmZTM1NjNhNGFjYTE0ZDA3MWIyYzY2OGM5MGI4NS4uZDIyYjYxMTU4NmNlN2RiMjA3 ZTMwNDAyODcwNjNkMjZkOWY4OTExMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrRmxvdy5jcHAKQEAgLTI5NTksNyArMjk1OSw3IEBAIHN0ZDo6b3B0aW9uYWw8TGF5 b3V0VW5pdD4gUmVuZGVyQmxvY2tGbG93OjpmaXJzdExpbmVCYXNlbGluZSgpIGNvbnN0CiAKICNp ZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKICAgICBpZiAobW9kZXJuTGluZUxh eW91dCgpKQotICAgICAgICByZXR1cm4gTGF5b3V0VW5pdCB7IGZsb29yVG9JbnQobW9kZXJuTGlu ZUxheW91dCgpLT5maXJzdExpbmVCYXNlbGluZSgpKSB9OworICAgICAgICByZXR1cm4gTGF5b3V0 VW5pdCB7IGZsb29yVG9JbnQobW9kZXJuTGluZUxheW91dCgpLT5maXJzdExpbmVQaHlzaWNhbEJh c2VsaW5lKCkpIH07CiAjZW5kaWYKIAogICAgIEFTU0VSVChmaXJzdFJvb3RCb3goKSk7CkBAIC0z MDEwLDcgKzMwMTAsNyBAQCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckJsb2NrRmxv dzo6aW5saW5lQmxvY2tCYXNlbGluZShMaW5lRGlyZWN0aW9uTW9kZQogICAgICAgICB9CiAjaWYg RU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCiAgICAgICAgIGVsc2UgaWYgKG1vZGVy bkxpbmVMYXlvdXQoKSkKLSAgICAgICAgICAgIGxhc3RCYXNlbGluZSA9IGZsb29yVG9JbnQobW9k ZXJuTGluZUxheW91dCgpLT5sYXN0TGluZUJhc2VsaW5lKCkpOworICAgICAgICAgICAgbGFzdEJh c2VsaW5lID0gZmxvb3JUb0ludChtb2Rlcm5MaW5lTGF5b3V0KCktPmxhc3RMaW5lTG9naWNhbEJh c2VsaW5lKCkpOwogI2VuZGlmCiAgICAgfQogICAgIC8vIEFjY29yZGluZyB0byB0aGUgQ1NTIHNw ZWMgaHR0cDovL3d3dy53My5vcmcvVFIvQ1NTMjEvdmlzdWRldC5odG1sLCB3ZSBzaG91bGRuJ3Qg YmUgcGVyZm9ybWluZyB0aGlzIG1pbiwgYnV0IHNob3VsZAo=