218767 2020-11-10 12:20:00 -0800 [LFC][IFC] Add support for replaced element baseline 2020-11-10 13:29:15 -0800 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 1706160 0 zalan 2020-11-10 12:20:00 -0800 as replaced elements can have set baselines 1706161 1 413722 zalan 2020-11-10 12:21:31 -0800 Created attachment 413722 Patch 1706168 2 413722 koivisto 2020-11-10 12:35:11 -0800 Comment on attachment 413722 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=413722&action=review > Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp:265 > + } else if (layoutBox.isReplacedBox()) > + ascent = downcast<ReplacedBox>(layoutBox).baseline().valueOr(marginBoxHeight); Should this have a comment that this is an extensions, not something found from spec? 1706183 3 zalan 2020-11-10 13:09:01 -0800 (In reply to Antti Koivisto from comment #2) > Comment on attachment 413722 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=413722&action=review > > > Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp:265 > > + } else if (layoutBox.isReplacedBox()) > > + ascent = downcast<ReplacedBox>(layoutBox).baseline().valueOr(marginBoxHeight); > > Should this have a comment that this is an extensions, not something found > from spec? The spec talks about atomic inline box in general in the context of baseline set, so I assume that applies to replaced inline boxes as well. 1706193 4 ews-feeder 2020-11-10 13:28:01 -0800 Committed r269645: <https://trac.webkit.org/changeset/269645> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413722. 1706194 5 webkit-bug-importer 2020-11-10 13:29:15 -0800 <rdar://problem/71252659> 413722 2020-11-10 12:21:31 -0800 2020-11-10 13:28:01 -0800 Patch bug-218767-20201110122130.patch text/plain 4514 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEwOTQ2YThhNGEwZDkw ZjJkNzRjZTAwOWYxNmMxNTMzZjI3ZjJiNC4uNmQxMjYwMjVkY2Q5OGYxNjQ3ODgzNTkwNzRiOGIw NzAzMGFlY2ViYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTExLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3IgcmVwbGFjZWQgZWxlbWVudCBiYXNlbGluZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4NzY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZWQgZWxlbWVudHMgY2FuIGhhdmUgc2V0 IGJhc2VsaW5lcy4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5 b3V0L2xheW91dHRyZWUvTGF5b3V0UmVwbGFjZWRCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6UmVwbGFjZWRCb3g6OnNldEJhc2VsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6UmVwbGFjZWRCb3g6OmJhc2VsaW5lIGNvbnN0KToKKwogMjAyMC0xMS0wOSAgSnVsaWFuIEdv bnphbGV6ICA8anVsaWFuX2FfZ29uemFsZXpAYXBwbGUuY29tPgogCiAgICAgICAgIE51bGwgZGVy ZWZlcmVuY2UgaW4gQ29tcG9zaXRlRWRpdENvbW1hbmQ6OnNwbGl0VHJlZVRvTm9kZSgpIGR1ZSB0 byBub3QgY2hlY2tpbmcgZm9yIHRvcCBvZiBET00gdHJlZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBjOGY5MTlhZjk0ZjZhZjkyZjFmMjZh ZjgxNzU1ZTdmN2IwNTZkODJjLi5lNzI5NjMxN2I1MDA3ODY1NjMzZWE5M2NkZTAwOTc3MDc0N2Ew MTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cApAQCAtMjU0LDE5ICsyNTQsMjEgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4KICAgICAgICAg YXV0byBsb2dpY2FsTGVmdCA9IGhvcml6b250YWxBbGlnbWVudE9mZnNldCArIHJ1bi5sb2dpY2Fs TGVmdCgpOwogICAgICAgICBpZiAocnVuLmlzQm94KCkpIHsKICAgICAgICAgICAgIGF1dG8mIGlu bGluZUxldmVsQm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94 KGxheW91dEJveCk7Ci0gICAgICAgICAgICBhdXRvIGxvZ2ljYWxIZWlnaHQgPSBpbmxpbmVMZXZl bEJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpOwotICAgICAgICAgICAgYXV0byBhc2NlbnQg PSBsb2dpY2FsSGVpZ2h0OworICAgICAgICAgICAgYXV0byBtYXJnaW5Cb3hIZWlnaHQgPSBpbmxp bmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpOworICAgICAgICAgICAgYXV0byBh c2NlbnQgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKICAgICAgICAgICAgIGlmIChsYXlvdXRCb3gu aXNJbmxpbmVCbG9ja0JveCgpICYmIGxheW91dEJveC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRp bmdDb250ZXh0KCkpIHsKICAgICAgICAgICAgICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSBs YXlvdXRTdGF0ZSgpLmVzdGFibGlzaGVkSW5saW5lRm9ybWF0dGluZ1N0YXRlKGRvd25jYXN0PENv bnRhaW5lckJveD4obGF5b3V0Qm94KSk7CiAgICAgICAgICAgICAgICAgYXV0byYgbGFzdExpbmUg PSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5sYXN0KCk7CiAgICAgICAgICAgICAgICAgYXV0byBp bmxpbmVCbG9ja0Jhc2VsaW5lID0gbGFzdExpbmUubG9naWNhbFRvcCgpICsgbGFzdExpbmUuYmFz ZWxpbmUoKTsKICAgICAgICAgICAgICAgICBhc2NlbnQgPSBpbmxpbmVMZXZlbEJveEdlb21ldHJ5 Lm1hcmdpbkJlZm9yZSgpICsgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5ib3JkZXJUb3AoKSArIGlu bGluZUxldmVsQm94R2VvbWV0cnkucGFkZGluZ1RvcCgpLnZhbHVlT3IoMCkgKyBpbmxpbmVCbG9j a0Jhc2VsaW5lOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgYXV0byBhdG9taWNJbmxpbmVM ZXZlbEJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZl bEJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCB7IHJ1bi5sb2dpY2FsV2lkdGgoKSwgbG9naWNh bEhlaWdodCB9KTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94LmlzUmVwbGFjZWRC b3goKSkKKyAgICAgICAgICAgICAgICBhc2NlbnQgPSBkb3duY2FzdDxSZXBsYWNlZEJveD4obGF5 b3V0Qm94KS5iYXNlbGluZSgpLnZhbHVlT3IobWFyZ2luQm94SGVpZ2h0KTsKKyAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICAgICBhc2NlbnQgPSBtYXJnaW5Cb3hIZWlnaHQ7CisgICAgICAg ICAgICBhdXRvIGF0b21pY0lubGluZUxldmVsQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6 OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9naWNhbExlZnQsIHsgcnVu LmxvZ2ljYWxXaWR0aCgpLCBtYXJnaW5Cb3hIZWlnaHQgfSk7CiAgICAgICAgICAgICBhdG9taWNJ bmxpbmVMZXZlbEJveC0+c2V0QmFzZWxpbmUoYXNjZW50KTsKLSAgICAgICAgICAgIEFTU0VSVChs b2dpY2FsSGVpZ2h0ID49IGFzY2VudCk7Ci0gICAgICAgICAgICBhdG9taWNJbmxpbmVMZXZlbEJv eC0+c2V0TGF5b3V0Qm91bmRzKExpbmVCb3g6OklubGluZUxldmVsQm94OjpMYXlvdXRCb3VuZHMg eyBhc2NlbnQsIGxvZ2ljYWxIZWlnaHQgLSBhc2NlbnQgfSk7Ci0gICAgICAgICAgICBpZiAobG9n aWNhbEhlaWdodCkKKyAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRMYXlvdXRC b3VuZHMoTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OkxheW91dEJvdW5kcyB7IGFzY2VudCwgbWFy Z2luQm94SGVpZ2h0IC0gYXNjZW50IH0pOworICAgICAgICAgICAgaWYgKG1hcmdpbkJveEhlaWdo dCkKICAgICAgICAgICAgICAgICBhdG9taWNJbmxpbmVMZXZlbEJveC0+c2V0SXNOb25FbXB0eSgp OwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGF0b21pY0lu bGluZUxldmVsQm94KSk7CiAgICAgICAgIH0gZWxzZSBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQo KSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0 UmVwbGFjZWRCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFJl cGxhY2VkQm94LmgKaW5kZXggZGRkNDM5Y2NmMWU0MjRjMjhjMDliODViNDRhZGQ4YjcxODM4ZGJk YS4uMzg3ZGYzYjE0MWUxN2U4M2IxMDY3N2FjOThlZTNhNDI2YWU3NGE5ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0UmVwbGFjZWRCb3guaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRSZXBsYWNlZEJveC5oCkBA IC02MCwxMiArNjAsMTYgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgaW50cmluc2ljSGVpZ2h0 KCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBpbnRyaW5zaWNSYXRpbygpIGNvbnN0OwogCisgICAg dm9pZCBzZXRCYXNlbGluZShMYXlvdXRVbml0IGJhc2VsaW5lKSB7IG1fYmFzZWxpbmUgPSBiYXNl bGluZTsgfQorICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGJhc2VsaW5lKCkgY29uc3QgeyByZXR1 cm4gbV9iYXNlbGluZTsgfQorCiBwcml2YXRlOgogICAgIGJvb2wgaGFzQXNwZWN0UmF0aW8oKSBj b25zdDsKIAogICAgIE9wdGlvbmFsPExheW91dFNpemU+IG1faW50cmluc2ljU2l6ZTsKICAgICBP cHRpb25hbDxMYXlvdXRVbml0PiBtX2ludHJpbnNpY1JhdGlvOwogICAgIE9wdGlvbmFsPExheW91 dFNpemU+IG1fY29udGVudFNpemVGb3JJbnRlZ3JhdGlvbjsKKyAgICBPcHRpb25hbDxMYXlvdXRV bml0PiBtX2Jhc2VsaW5lOwogICAgIENhY2hlZEltYWdlKiBtX2NhY2hlZEltYWdlIHsgbnVsbHB0 ciB9OwogfTsKIAo=