231100 2021-10-01 13:56:16 -0700 [LFC][IFC] Pass in the correct style when adding a run to Line 2021-10-02 06:52:16 -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 1799525 0 zalan 2021-10-01 13:56:16 -0700 first-line 1799528 1 439907 zalan 2021-10-01 13:58:29 -0700 Created attachment 439907 Patch 1799733 2 439907 koivisto 2021-10-02 05:35:44 -0700 Comment on attachment 439907 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439907&action=review > Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp:821 > + auto& style = [&] () -> const RenderStyle& { > + return m_isFirstLine ? inlineItem.firstLineStyle() : inlineItem.style(); > + }(); Not sure if there is such a thing as overuse of lambda but this might be one. 1799736 3 439964 zalan 2021-10-02 06:15:37 -0700 Created attachment 439964 Patch 1799741 4 ews-feeder 2021-10-02 06:51:54 -0700 Committed r283442 (242429@main): <https://commits.webkit.org/242429@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439964. 1799742 5 webkit-bug-importer 2021-10-02 06:52:16 -0700 <rdar://problem/83797765> 439907 2021-10-01 13:58:29 -0700 2021-10-02 06:15:35 -0700 Patch bug-231100-20211001135828.patch text/plain 3797 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDFkODNmZDcyNzk2ZDhj Y2MxMWVkMjIwOWQzZDUyMmE5ZTFlOWJhMC4uNzM1ZTk2MzU1NTE1NzRmMzBiZGUwYzdlMzA3ZWI0 NjFiZmM5MTA0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFBhc3MgaW4g dGhlIGNvcnJlY3Qgc3R5bGUgd2hlbiBhZGRpbmcgYSBydW4gdG8gTGluZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMTAwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlv biBmb3Igc3VwcG9ydGluZyBmaXJzdC1saW5lIHN0eWxlLgorCisgICAgICAgICogbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50OjphcHBlbmRJbmxp bmVJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmhhbmRsZUlu bGluZUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y29t bWl0UGFydGlhbENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRl cjo6cmVidWlsZExpbmUpOgorCiAyMDIxLTEwLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyODMwNDcpOiBQZXJmb3JtYW5jZVRlc3RzL0xh eW91dC9saW5lLWxheW91dC1zaW1wbGUuaHRtbCByZWdyZXNzZWQgYnkgfjEwJQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDNkYTIyMDM5MDhjMTg0MWUzZjY4 YmFjNjY4NWViOTA2YzhmYzY3YWMuLmZhODgxZTdhYWFmNjJkNzdlMjQ0NzVmMDVmNjI4ZTNkOTMw YTIwODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTE4 OSw3ICsxODksNyBAQCBpbmxpbmUgdm9pZCBMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50Ojph cHBlbmRJbmxpbmVJdGVtKGNvbnN0IElubGluZUl0ZW0mIGlubAogICAgICAgICAvLyBDaGVjayBm b3IgcGFydGlhbGx5IGNvbGxhcHNpYmxlIGNvbnRlbnQuCiAgICAgICAgIGlmIChtX2lnbm9yZVRy YWlsaW5nTGV0dGVyU3BhY2luZykKICAgICAgICAgICAgIHJldHVybiB7IH07Ci0gICAgICAgIGF1 dG8gbGV0dGVyU3BhY2luZyA9IGlubGluZUl0ZW0uc3R5bGUoKS5sZXR0ZXJTcGFjaW5nKCk7Cisg ICAgICAgIGF1dG8gbGV0dGVyU3BhY2luZyA9IHN0eWxlLmxldHRlclNwYWNpbmcoKTsKICAgICAg ICAgaWYgKGxldHRlclNwYWNpbmcgPD0gMCkKICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAg ICAgIEFTU0VSVChsb2dpY2FsV2lkdGggPiBsZXR0ZXJTcGFjaW5nKTsKQEAgLTcwNSw3ICs3MDUs NyBAQCBMaW5lQnVpbGRlcjo6UmVzdWx0IExpbmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVDb250ZW50 KElubGluZUNvbnRlbnRCcmVha2VyJiBpbmxpbgogICAgICAgICAvLyBUaGlzIGNvbnRpbnVvdXMg Y29udGVudCBjYW4gYmUgZnVsbHkgcGxhY2VkIG9uIHRoZSBjdXJyZW50IGxpbmUuCiAgICAgICAg IG1fbGluZUxvZ2ljYWxSZWN0ID0gbGluZUxvZ2ljYWxSZWN0Rm9yQ2FuZGlkYXRlQ29udGVudDsK ICAgICAgICAgZm9yIChhdXRvJiBydW4gOiBjYW5kaWRhdGVSdW5zKQotICAgICAgICAgICAgbV9s aW5lLmFwcGVuZChydW4uaW5saW5lSXRlbSwgcnVuLmlubGluZUl0ZW0uc3R5bGUoKSwgcnVuLmxv Z2ljYWxXaWR0aCk7CisgICAgICAgICAgICBtX2xpbmUuYXBwZW5kKHJ1bi5pbmxpbmVJdGVtLCBy dW4uc3R5bGUsIHJ1bi5sb2dpY2FsV2lkdGgpOwogICAgICAgICBpZiAobGluZUNhbmRpZGF0ZS5p bmxpbmVDb250ZW50Lmhhc1RyYWlsaW5nU29mdFdyYXBPcHBvcnR1bml0eSgpKSB7CiAgICAgICAg ICAgICAvLyBDaGVjayBpZiB3ZSBhcmUgYWxsb3dlZCB0byB3cmFwIGF0IHRoaXMgcG9zaXRpb24u CiAgICAgICAgICAgICBhdXRvJiB0cmFpbGluZ1J1biA9IGNhbmRpZGF0ZVJ1bnMubGFzdCgpOwpA QCAtNzk0LDEwICs3OTQsMTAgQEAgdm9pZCBMaW5lQnVpbGRlcjo6Y29tbWl0UGFydGlhbENvbnRl bnQoY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb24KICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBUaGUgcGFydGlhbCBy dW4gaXMgdGhlIGxhc3QgY29udGVudCB0byBjb21taXQuCi0gICAgICAgICAgICBtX2xpbmUuYXBw ZW5kKHJ1bi5pbmxpbmVJdGVtLCBydW4uaW5saW5lSXRlbS5zdHlsZSgpLCBydW4ubG9naWNhbFdp ZHRoKTsKKyAgICAgICAgICAgIG1fbGluZS5hcHBlbmQocnVuLmlubGluZUl0ZW0sIHJ1bi5zdHls ZSwgcnVuLmxvZ2ljYWxXaWR0aCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAg ICAgICAgbV9saW5lLmFwcGVuZChydW4uaW5saW5lSXRlbSwgcnVuLmlubGluZUl0ZW0uc3R5bGUo KSwgcnVuLmxvZ2ljYWxXaWR0aCk7CisgICAgICAgIG1fbGluZS5hcHBlbmQocnVuLmlubGluZUl0 ZW0sIHJ1bi5zdHlsZSwgcnVuLmxvZ2ljYWxXaWR0aCk7CiAgICAgfQogfQogCkBAIC04MTYsNyAr ODE2LDEwIEBAIHNpemVfdCBMaW5lQnVpbGRlcjo6cmVidWlsZExpbmUoY29uc3QgSW5saW5lSXRl bVJhbmdlJiBsYXlvdXRSYW5nZSwgY29uc3QgSW5saW5lCiAgICAgfQogICAgIGZvciAoOyBjdXJy ZW50SXRlbUluZGV4IDwgbGF5b3V0UmFuZ2UuZW5kOyArK2N1cnJlbnRJdGVtSW5kZXgpIHsKICAg ICAgICAgYXV0byYgaW5saW5lSXRlbSA9IG1faW5saW5lSXRlbXNbY3VycmVudEl0ZW1JbmRleF07 Ci0gICAgICAgIG1fbGluZS5hcHBlbmQoaW5saW5lSXRlbSwgaW5saW5lSXRlbS5zdHlsZSgpLCBp bmxpbmVJdGVtV2lkdGgoaW5saW5lSXRlbSwgbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKSkp OworICAgICAgICBhdXRvJiBzdHlsZSA9IFsmXSAoKSAtPiBjb25zdCBSZW5kZXJTdHlsZSYgewor ICAgICAgICAgICAgcmV0dXJuIG1faXNGaXJzdExpbmUgPyBpbmxpbmVJdGVtLmZpcnN0TGluZVN0 eWxlKCkgOiBpbmxpbmVJdGVtLnN0eWxlKCk7CisgICAgICAgIH0oKTsKKyAgICAgICAgbV9saW5l LmFwcGVuZChpbmxpbmVJdGVtLCBzdHlsZSwgaW5saW5lSXRlbVdpZHRoKGlubGluZUl0ZW0sIG1f bGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCkpKTsKICAgICAgICAgaWYgKCZpbmxpbmVJdGVtID09 ICZsYXN0SW5saW5lSXRlbVRvQWRkKQogICAgICAgICAgICAgcmV0dXJuIGN1cnJlbnRJdGVtSW5k ZXggLSBsYXlvdXRSYW5nZS5zdGFydCArIDE7CiAgICAgfQo= 439964 2021-10-02 06:15:37 -0700 2021-10-02 06:51:55 -0700 Patch bug-231100-20211002061537.patch text/plain 3705 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ5MzU2MWQ1N2Y0YmRh YmZlMjQ1MDBkNWY4ZTk5ZmNlYTdhNWE0MC4uYjY1ZGVhZGM5MDliMTVkOWI3MTlhNTBlZmVjNzY2 ZjU5MjI0OTgxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTAyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFBhc3MgaW4g dGhlIGNvcnJlY3Qgc3R5bGUgd2hlbiBhZGRpbmcgYSBydW4gdG8gTGluZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMTAwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlv biBmb3Igc3VwcG9ydGluZyBmaXJzdC1saW5lIHN0eWxlLgorCisgICAgICAgICogbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50OjphcHBlbmRJbmxp bmVJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmhhbmRsZUlu bGluZUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y29t bWl0UGFydGlhbENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRl cjo6cmVidWlsZExpbmUpOgorCiAyMDIxLTEwLTAyICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5j b20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBBY2NvbW1vZGF0ZSBzcGFubmluZyBpdGVtcyBjcm9z c2luZyBmbGV4aWJsZSB0cmFja3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVy LmNwcAppbmRleCAzZGEyMjAzOTA4YzE4NDFlM2Y2OGJhYzY2ODVlYjkwNmM4ZmM2N2FjLi42ZDJi YTQ2ZTg5MGI5ODAwOWYzNGVjNWYwNDMxN2Q1YWVjYWQwNTNlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0xODksNyArMTg5LDcgQEAgaW5saW5lIHZvaWQg TGluZUNhbmRpZGF0ZTo6SW5saW5lQ29udGVudDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxp bmVJdGVtJiBpbmwKICAgICAgICAgLy8gQ2hlY2sgZm9yIHBhcnRpYWxseSBjb2xsYXBzaWJsZSBj b250ZW50LgogICAgICAgICBpZiAobV9pZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcpCiAgICAg ICAgICAgICByZXR1cm4geyB9OwotICAgICAgICBhdXRvIGxldHRlclNwYWNpbmcgPSBpbmxpbmVJ dGVtLnN0eWxlKCkubGV0dGVyU3BhY2luZygpOworICAgICAgICBhdXRvIGxldHRlclNwYWNpbmcg PSBzdHlsZS5sZXR0ZXJTcGFjaW5nKCk7CiAgICAgICAgIGlmIChsZXR0ZXJTcGFjaW5nIDw9IDAp CiAgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICBBU1NFUlQobG9naWNhbFdpZHRoID4g bGV0dGVyU3BhY2luZyk7CkBAIC03MDUsNyArNzA1LDcgQEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBM aW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudChJbmxpbmVDb250ZW50QnJlYWtlciYgaW5s aW4KICAgICAgICAgLy8gVGhpcyBjb250aW51b3VzIGNvbnRlbnQgY2FuIGJlIGZ1bGx5IHBsYWNl ZCBvbiB0aGUgY3VycmVudCBsaW5lLgogICAgICAgICBtX2xpbmVMb2dpY2FsUmVjdCA9IGxpbmVM b2dpY2FsUmVjdEZvckNhbmRpZGF0ZUNvbnRlbnQ7CiAgICAgICAgIGZvciAoYXV0byYgcnVuIDog Y2FuZGlkYXRlUnVucykKLSAgICAgICAgICAgIG1fbGluZS5hcHBlbmQocnVuLmlubGluZUl0ZW0s IHJ1bi5pbmxpbmVJdGVtLnN0eWxlKCksIHJ1bi5sb2dpY2FsV2lkdGgpOworICAgICAgICAgICAg bV9saW5lLmFwcGVuZChydW4uaW5saW5lSXRlbSwgcnVuLnN0eWxlLCBydW4ubG9naWNhbFdpZHRo KTsKICAgICAgICAgaWYgKGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5oYXNUcmFpbGluZ1Nv ZnRXcmFwT3Bwb3J0dW5pdHkoKSkgewogICAgICAgICAgICAgLy8gQ2hlY2sgaWYgd2UgYXJlIGFs bG93ZWQgdG8gd3JhcCBhdCB0aGlzIHBvc2l0aW9uLgogICAgICAgICAgICAgYXV0byYgdHJhaWxp bmdSdW4gPSBjYW5kaWRhdGVSdW5zLmxhc3QoKTsKQEAgLTc5NCwxMCArNzk0LDEwIEBAIHZvaWQg TGluZUJ1aWxkZXI6OmNvbW1pdFBhcnRpYWxDb250ZW50KGNvbnN0IElubGluZUNvbnRlbnRCcmVh a2VyOjpDb250aW51b3VzQ29uCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgLy8gVGhlIHBhcnRpYWwgcnVuIGlzIHRoZSBsYXN0IGNvbnRlbnQgdG8g Y29tbWl0LgotICAgICAgICAgICAgbV9saW5lLmFwcGVuZChydW4uaW5saW5lSXRlbSwgcnVuLmlu bGluZUl0ZW0uc3R5bGUoKSwgcnVuLmxvZ2ljYWxXaWR0aCk7CisgICAgICAgICAgICBtX2xpbmUu YXBwZW5kKHJ1bi5pbmxpbmVJdGVtLCBydW4uc3R5bGUsIHJ1bi5sb2dpY2FsV2lkdGgpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIG1fbGluZS5hcHBlbmQocnVuLmlu bGluZUl0ZW0sIHJ1bi5pbmxpbmVJdGVtLnN0eWxlKCksIHJ1bi5sb2dpY2FsV2lkdGgpOworICAg ICAgICBtX2xpbmUuYXBwZW5kKHJ1bi5pbmxpbmVJdGVtLCBydW4uc3R5bGUsIHJ1bi5sb2dpY2Fs V2lkdGgpOwogICAgIH0KIH0KIApAQCAtODE2LDcgKzgxNiw4IEBAIHNpemVfdCBMaW5lQnVpbGRl cjo6cmVidWlsZExpbmUoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSwgY29uc3Qg SW5saW5lCiAgICAgfQogICAgIGZvciAoOyBjdXJyZW50SXRlbUluZGV4IDwgbGF5b3V0UmFuZ2Uu ZW5kOyArK2N1cnJlbnRJdGVtSW5kZXgpIHsKICAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IG1f aW5saW5lSXRlbXNbY3VycmVudEl0ZW1JbmRleF07Ci0gICAgICAgIG1fbGluZS5hcHBlbmQoaW5s aW5lSXRlbSwgaW5saW5lSXRlbS5zdHlsZSgpLCBpbmxpbmVJdGVtV2lkdGgoaW5saW5lSXRlbSwg bV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKSkpOworICAgICAgICBhdXRvJiBzdHlsZSA9IG1f aXNGaXJzdExpbmUgPyBpbmxpbmVJdGVtLmZpcnN0TGluZVN0eWxlKCkgOiBpbmxpbmVJdGVtLnN0 eWxlKCk7CisgICAgICAgIG1fbGluZS5hcHBlbmQoaW5saW5lSXRlbSwgc3R5bGUsIGlubGluZUl0 ZW1XaWR0aChpbmxpbmVJdGVtLCBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpKSk7CiAgICAg ICAgIGlmICgmaW5saW5lSXRlbSA9PSAmbGFzdElubGluZUl0ZW1Ub0FkZCkKICAgICAgICAgICAg IHJldHVybiBjdXJyZW50SXRlbUluZGV4IC0gbGF5b3V0UmFuZ2Uuc3RhcnQgKyAxOwogICAgIH0K