206133 2020-01-11 12:12:31 -0800 [LFC][IFC] Visually collapse hanging pre-wrap content. 2020-01-11 16:29:48 -0800 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 1605552 0 zalan 2020-01-11 12:12:31 -0800 "If white-space is set to pre-wrap, the UA must (unconditionally) hang this sequence, unless the sequence is followed by a forced line break, in which case it must conditionally hang the sequence is instead. It ___may___ also visually collapse the character advance widths of any that would otherwise overflow." 1605553 1 webkit-bug-importer 2020-01-11 12:12:50 -0800 <rdar://problem/58505750> 1605554 2 387441 zalan 2020-01-11 12:16:29 -0800 Created attachment 387441 Patch 1605559 3 387441 koivisto 2020-01-11 12:42:59 -0800 Comment on attachment 387441 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387441&action=review > Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp:237 > + visuallyCollapsePreWrapOverflowContent(); Shouldn't this depend on alignment somehow? 1605564 4 zalan 2020-01-11 13:06:21 -0800 (In reply to Antti Koivisto from comment #3) > Comment on attachment 387441 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387441&action=review > > > Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp:237 > > + visuallyCollapsePreWrapOverflowContent(); > > Shouldn't this depend on alignment somehow? Yup, you are right 1605569 5 zalan 2020-01-11 15:25:00 -0800 (In reply to zalan from comment #4) > (In reply to Antti Koivisto from comment #3) > > Comment on attachment 387441 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=387441&action=review > > > > > Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp:237 > > > + visuallyCollapsePreWrapOverflowContent(); > > > > Shouldn't this depend on alignment somehow? > Yup, you are right It is actually the other way around. The unconditionally hanging whitespace should be ignored when it comes to horizontal alignment even if it places the trailing whitespace outside of the line box. -> "As the preserved spaces at the end of lines without a forced break must hang, they are not considered when placing the rest of the line during text alignment. When aligning towards the end, this means any such spaces will overflow, and will not prevent the rest of the line’s content from being flush with the edge of the line." 1605570 6 zalan 2020-01-11 15:25:50 -0800 There are some very nice visual examples at https://www.w3.org/TR/css-text-3/#white-space-phase-2 1605571 7 zalan 2020-01-11 15:43:24 -0800 SLL seems to be retrofitting the hanging content width. 1605572 8 zalan 2020-01-11 15:48:02 -0800 Committed r254402: <https://trac.webkit.org/changeset/254402> 387441 2020-01-11 12:16:29 -0800 2020-01-11 15:48:13 -0800 Patch bug-206133-20200111121629.patch text/plain 5718 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0Mjk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmI4ZjljMTNlYWRlYjI1 NTEzNmE3NDg5OWU2YWJhMTI1MGY3N2EzMy4uYTM5ZWM0NTlhZjkzNmY5NjhlYjY0ZmQxYzBlZjBk YWE0M2YwODI1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAxLTExICBaYWxh biBCdXRqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtMRkNdW0lGQ10gVmlzdWFs bHkgY29sbGFwc2UgaGFuZ2luZyBwcmUtd3JhcCBjb250ZW50LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MTMzCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS81ODUwNTc1MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGlzIGNoYW5nZSBpcyB0byBjb21wbHkgd2l0aCBvdGhlciByZW5kZXJpbmcgZW5n aW5lcyB3aGVuIGl0IGNvbWVzIHRvIHZpc3VhbGx5IGNvbGxhcHNpbmcgaGFuZ2luZyBwcmUtd3Jh cCBjb250ZW50LgorCisgICAgICAgIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9jc3MtdGV4dC0zLyN3 aGl0ZS1zcGFjZS1waGFzZS0yCisgICAgICAgICJJZiB3aGl0ZS1zcGFjZSBpcyBzZXQgdG8gcHJl LXdyYXAsIHRoZSBVQSBtdXN0ICh1bmNvbmRpdGlvbmFsbHkpIGhhbmcgdGhpcyBzZXF1ZW5jZSwg dW5sZXNzIHRoZSBzZXF1ZW5jZQorICAgICAgICBpcyBmb2xsb3dlZCBieSBhIGZvcmNlZCBsaW5l IGJyZWFrLCBpbiB3aGljaCBjYXNlIGl0IG11c3QgY29uZGl0aW9uYWxseSBoYW5nIHRoZSBzZXF1 ZW5jZSBpcyBpbnN0ZWFkLgorICAgICAgICBJdCBfX19tYXlfX18gYWxzbyB2aXN1YWxseSBjb2xs YXBzZSB0aGUgY2hhcmFjdGVyIGFkdmFuY2Ugd2lkdGhzIG9mIGFueSB0aGF0IHdvdWxkIG90aGVy d2lzZSBvdmVyZmxvdy4iCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVy OjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjp2aXN1YWxs eUNvbGxhcHNlUHJlV3JhcE92ZXJmbG93Q29udGVudCk6CisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJ1aWxkZXI6OklubGluZUl0ZW1SdW46OmFkanVzdExvZ2ljYWxXaWR0aCk6CisKIDIw MjAtMDEtMDkgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAg ICAgSW1wbGVtZW50IGVuY29kZXJzIGFuZCBkZWNvZGVycyBmb3IgbW9yZSBmb250LXJlbGF0ZWQg ZW50aXRpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCA2MTczYmE2ZTM4ZGE0YzM0YTEx NjM4NjJiMmQzOWI4OWNlYzkxNmJmLi41MWY5NzkzZThiYjFmYjlmNTg4NjM0YmI3NzQzYWViMTM0 NWYwZDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0yMzQsNiArMjM0LDcgQEAgTGlu ZUJ1aWxkZXI6OlJ1bkxpc3QgTGluZUJ1aWxkZXI6OmNsb3NlKElzTGFzdExpbmVXaXRoSW5saW5l Q29udGVudCBpc0xhc3RMaW5lV2kKICAgICAvLyAyLiBKb2luIHRleHQgcnVucyB0b2dldGhlciB3 aGVuIHBvc3NpYmxlIFtmb29dWyBdW2Jhcl0gLT4gW2ZvbyBiYXJdLgogICAgIC8vIDMuIEFsaWdu IG1lcmdlZCBydW5zIGJvdGggdmVydGljYWxseSBhbmQgaG9yaXpvbnRhbGx5LgogICAgIHJlbW92 ZVRyYWlsaW5nQ29sbGFwc2libGVDb250ZW50KCk7CisgICAgdmlzdWFsbHlDb2xsYXBzZVByZVdy YXBPdmVyZmxvd0NvbnRlbnQoKTsKICAgICBhdXRvIGhhbmdpbmdDb250ZW50ID0gY29sbGVjdEhh bmdpbmdDb250ZW50KGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCk7CiAKICAgICBhdXRvIG1l cmdlZElubGluZUl0ZW1SdW5zID0gWyZdIHsKQEAgLTUwOCw2ICs1MDksNDEgQEAgdm9pZCBMaW5l QnVpbGRlcjo6cmVtb3ZlVHJhaWxpbmdDb2xsYXBzaWJsZUNvbnRlbnQoKQogICAgIG1fbGluZUlz VmlzdWFsbHlFbXB0eUJlZm9yZUNvbGxhcHNpYmxlQ29udGVudCA9IHsgfTsKIH0KIAordm9pZCBM aW5lQnVpbGRlcjo6dmlzdWFsbHlDb2xsYXBzZVByZVdyYXBPdmVyZmxvd0NvbnRlbnQoKQorewor ICAgIEFTU0VSVChtX2NvbGxhcHNpYmxlQ29udGVudC5pc0VtcHR5KCkpOworICAgIC8vIElmIHdo aXRlLXNwYWNlIGlzIHNldCB0byBwcmUtd3JhcCwgdGhlIFVBIG11c3QKKyAgICAvLyAuLi4KKyAg ICAvLyBJdCBtYXkgYWxzbyB2aXN1YWxseSBjb2xsYXBzZSB0aGUgY2hhcmFjdGVyIGFkdmFuY2Ug d2lkdGhzIG9mIGFueSB0aGF0IHdvdWxkIG90aGVyd2lzZSBvdmVyZmxvdy4KKyAgICBhdXRvIG92 ZXJmbG93V2lkdGggPSAtYXZhaWxhYmxlV2lkdGgoKTsKKyAgICBpZiAob3ZlcmZsb3dXaWR0aCA8 PSAwKQorICAgICAgICByZXR1cm47CisgICAgLy8gTGV0J3MganVzdCBmaW5kIHRoZSB0cmFpbGlu ZyBwcmUtd3JhcCB3aGl0ZXNwYWNlIGNvbnRlbnQgZm9yIG5vdyAoZS5nIGNoZWNrIGlmIHRoZXJl IGFyZSBtdWx0aXBsZSB0cmFpbGluZyBydW5zIHdpdGgKKyAgICAvLyBkaWZmZXJlbnQgc2V0IG9m IHdoaXRlLXNwYWNlIHZhbHVlcyBhbmQgZGVjaWRlIGlmIHRoZSBpbi1iZXR3ZWVuIHByZS13cmFw IGNvbnRlbnQgc2hvdWxkIGJlIGNvbGxhcHNlZCBhcyB3ZWxsLikKKyAgICBJbmxpbmVMYXlvdXRV bml0IHRyaW1tZWRDb250ZW50V2lkdGggPSAwOworICAgIGZvciAoYXV0byYgaW5saW5lSXRlbVJ1 biA6IFdURjo6bWFrZVJldmVyc2VkUmFuZ2UobV9pbmxpbmVJdGVtUnVucykpIHsKKyAgICAgICAg aWYgKGlubGluZUl0ZW1SdW4uc3R5bGUoKS53aGl0ZVNwYWNlKCkgIT0gV2hpdGVTcGFjZTo6UHJl V3JhcCkgeworICAgICAgICAgICAgLy8gV2UgYXJlIG9ubHkgaW50ZXJlc3RlZCBpbiBwcmUtd3Jh cCB0cmFpbGluZyBjb250ZW50LgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAg ICAgYXV0byBwcmVXcmFwVmlzdWFsbHlDb2xsYXBzaWJsZUlubGluZUl0ZW0gPSBpbmxpbmVJdGVt UnVuLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtUnVuLmlzQ29udGFpbmVyRW5kKCkg fHwgaW5saW5lSXRlbVJ1bi5pc1doaXRlc3BhY2UoKTsKKyAgICAgICAgaWYgKCFwcmVXcmFwVmlz dWFsbHlDb2xsYXBzaWJsZUlubGluZUl0ZW0pCisgICAgICAgICAgICBicmVhazsKKyAgICAgICAg YXV0byBydW5Mb2dpY2FsV2lkdGggPSBpbmxpbmVJdGVtUnVuLmxvZ2ljYWxXaWR0aCgpOworICAg ICAgICAvLyBOZXZlciBwYXJ0aWFsbHkgY29sbGFwc2UgaW5saW5lIGNvbnRhaW5lciBzdGFydC9l bmQgaXRlbXMuCisgICAgICAgIGF1dG8gaXNQYXJ0aWFsQ29sbGFwc2luZ0FsbG93ZWQgPSBpbmxp bmVJdGVtUnVuLmlzVGV4dCgpOworICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGFsd2F5cyBj b2xsYXBzZSB0aGUgcnVuIGF0IGEgZ2x5cGggYm91bmRhcnkgYXMgdGhlIHNwZWMgaW5kaWNhdGVz OiAiY29sbGFwc2UgdGhlIGNoYXJhY3RlciBhZHZhbmNlIHdpZHRocyBvZiBhbnkgdGhhdCB3b3Vs ZCBvdGhlcndpc2Ugb3ZlcmZsb3ciCisgICAgICAgIGF1dG8gcnVuTG9naWNhbFdpZHRoQWZ0ZXJD b2xsYXBzaW5nID0gaXNQYXJ0aWFsQ29sbGFwc2luZ0FsbG93ZWQgPyBzdGQ6Om1heDxJbmxpbmVM YXlvdXRVbml0PigwLCBydW5Mb2dpY2FsV2lkdGggLSBvdmVyZmxvd1dpZHRoKSA6IDA7CisgICAg ICAgIGF1dG8gdHJpbW1lZCA9IHJ1bkxvZ2ljYWxXaWR0aCAtIHJ1bkxvZ2ljYWxXaWR0aEFmdGVy Q29sbGFwc2luZzsKKyAgICAgICAgdHJpbW1lZENvbnRlbnRXaWR0aCArPSB0cmltbWVkOworICAg ICAgICBvdmVyZmxvd1dpZHRoIC09IHRyaW1tZWQ7CisgICAgICAgIGlubGluZUl0ZW1SdW4uYWRq dXN0TG9naWNhbFdpZHRoKHJ1bkxvZ2ljYWxXaWR0aEFmdGVyQ29sbGFwc2luZyk7CisgICAgICAg IGlmIChvdmVyZmxvd1dpZHRoIDw9IDApCisgICAgICAgICAgICBicmVhazsKKyAgICB9CisgICAg bV9saW5lQm94LnNocmlua0hvcml6b250YWxseSh0cmltbWVkQ29udGVudFdpZHRoKTsKK30KKwog SGFuZ2luZ0NvbnRlbnQgTGluZUJ1aWxkZXI6OmNvbGxlY3RIYW5naW5nQ29udGVudChJc0xhc3RM aW5lV2l0aElubGluZUNvbnRlbnQgaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50KQogewogICAg IGF1dG8gaGFuZ2luZ0NvbnRlbnQgPSBIYW5naW5nQ29udGVudCB7IH07CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxk ZXIuaAppbmRleCBkMDI1ZDM1Yzk5NDA2MjIyZWQ4MDFhMjA4ZGYzNTk4ZmVkMWE0NTA3Li5lMjg1 ZGIxOWE3OTk4ZjAzNGQ4MGUyZTE0YTk3OWI5MWU1NTAyMmIxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVy LmgKQEAgLTE0Miw2ICsxNDIsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYXBwZW5kTGluZUJyZWFr KGNvbnN0IElubGluZUl0ZW0mKTsKIAogICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdDb2xsYXBzaWJs ZUNvbnRlbnQoKTsKKyAgICB2b2lkIHZpc3VhbGx5Q29sbGFwc2VQcmVXcmFwT3ZlcmZsb3dDb250 ZW50KCk7CiAgICAgSGFuZ2luZ0NvbnRlbnQgY29sbGVjdEhhbmdpbmdDb250ZW50KElzTGFzdExp bmVXaXRoSW5saW5lQ29udGVudCk7CiAgICAgdm9pZCBhbGlnbkhvcml6b250YWxseShSdW5MaXN0 JiwgY29uc3QgSGFuZ2luZ0NvbnRlbnQmLCBJc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpOwog ICAgIHZvaWQgYWxpZ25Db250ZW50VmVydGljYWxseShSdW5MaXN0Jik7CkBAIC0xNzksNiArMTgw LDcgQEAgcHJpdmF0ZToKICAgICAgICAgYm9vbCBpc0NvbGxhcHNlZCgpIGNvbnN0IHsgcmV0dXJu IG1faXNDb2xsYXBzZWQ7IH0KIAogICAgICAgICB2b2lkIG1vdmVIb3Jpem9udGFsbHkoSW5saW5l TGF5b3V0VW5pdCBvZmZzZXQpIHsgbV9sb2dpY2FsTGVmdCArPSBvZmZzZXQ7IH0KKyAgICAgICAg dm9pZCBhZGp1c3RMb2dpY2FsV2lkdGgoSW5saW5lTGF5b3V0VW5pdCBhZGp1c3RlZFdpZHRoKSB7 IG1fbG9naWNhbFdpZHRoID0gYWRqdXN0ZWRXaWR0aDsgfQogCiAgICAgICAgIGJvb2wgaXNDb2xs YXBzaWJsZVdoaXRlc3BhY2UoKSBjb25zdDsKICAgICAgICAgYm9vbCBoYXNUcmFpbGluZ0xldHRl clNwYWNpbmcoKSBjb25zdDsK