198503 2019-06-03 16:33:32 -0700 [LFC][IFC] Add hard line break handling to LineBreaker 2019-06-04 08:50:40 -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 1541381 0 zalan 2019-06-03 16:33:32 -0700 ssia 1541382 1 webkit-bug-importer 2019-06-03 16:34:04 -0700 <rdar://problem/51373482> 1541387 2 371229 zalan 2019-06-03 16:43:10 -0700 Created attachment 371229 Patch 1541553 3 371229 koivisto 2019-06-04 07:24:56 -0700 Comment on attachment 371229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371229&action=review > Source/WebCore/ChangeLog:9 > + LineBreaker should simply return BreakingContext::Keep with the breaking opportunity of yes. Aren't you preparing for something? 1541590 4 zalan 2019-06-04 08:50:00 -0700 Committed r246066: <https://trac.webkit.org/changeset/246066> 1541591 5 zalan 2019-06-04 08:50:40 -0700 (In reply to Antti Koivisto from comment #3) > Comment on attachment 371229 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=371229&action=review > > > Source/WebCore/ChangeLog:9 > > + LineBreaker should simply return BreakingContext::Keep with the breaking opportunity of yes. > > Aren't you preparing for something? :) never. 371229 2019-06-03 16:43:10 -0700 2019-06-04 07:24:56 -0700 Patch bug-198503-20190603164308.patch text/plain 6610 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTJmM2FkMDBjYmNmMTI2 OTRmMGVlZTVhODg5YmYxY2Y1YmI2ODZkZi4uZDFmNzFjZDRiZDBlZWQ4ZTg1NTZkZjY3YTJlOTg3 YmRlOTFjZGJjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA2LTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgaGFy ZCBsaW5lIGJyZWFrIGhhbmRsaW5nIHRvIExpbmVCcmVha2VyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg1MDMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzUxMzczNDgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIExpbmVCcmVha2VyIHNob3VsZCBzaW1wbHkgcmV0dXJuIEJyZWFraW5nQ29udGV4dDo6 S2VlcCB3aXRoIHRoZSBicmVha2luZyBvcHBvcnR1bml0eSBvZiB5ZXMuCisKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 TGluZUxheW91dDo6cGxhY2VJbmxpbmVJdGVtcyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lQnJlYWtlcjo6YnJlYWtpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUJyZWFrZXI6OndvcmRCcmVha2luZ0JlaGF2aW9yIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJyZWFrZXI6OmlzQXRCcmVha2luZ09wcG9ydHVuaXR5 KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5o OgorCiAyMDE5LTA2LTAzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW0xGQ11bSUZDXSBSZW1vdmUgSW5saW5lSXRlbTo6d2lkdGgKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 TGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCmluZGV4IGI3ZDE5Y2I2YTYxNGE4 ODliZjc4ODQxZWI3ZGZlMWY0Y2QxMDViOTEuLmI5M2NkOWU3NDZiZTRhODM2NmQ4NjkwNGQ0ZTZk ZThlODIyZTFmZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRM aW5lTGF5b3V0LmNwcApAQCAtMjE0LDExICsyMTQsNiBAQCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6TGluZUxheW91dDo6TGluZUNvbnRlbnQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVM YQogICAgICAgICBhdXRvJiBpbmxpbmVJdGVtID0gbGluZUlucHV0LmlubGluZUl0ZW1zW2lubGlu ZUl0ZW1JbmRleF07CiAgICAgICAgIGF1dG8gaW5saW5lSXRlbVdpZHRoID0gV2ViQ29yZTo6TGF5 b3V0OjppbmxpbmVJdGVtV2lkdGgobGF5b3V0U3RhdGUoKSwgKmlubGluZUl0ZW0sIGN1cnJlbnRM b2dpY2FsUmlnaHQpOwogCi0gICAgICAgIGlmIChpbmxpbmVJdGVtLT5pc0hhcmRMaW5lQnJlYWso KSkgewotICAgICAgICAgICAgdW5jb21taXR0ZWRDb250ZW50LmFkZCgqaW5saW5lSXRlbSwgaW5s aW5lSXRlbVdpZHRoKTsKLSAgICAgICAgICAgIGNvbW1pdFBlbmRpbmdDb250ZW50KCk7Ci0gICAg ICAgICAgICByZXR1cm4gY2xvc2VMaW5lKCk7Ci0gICAgICAgIH0KICAgICAgICAgLy8gRklYTUU6 IEVuc3VyZSBMaW5lQ29udGV4dDo6dHJpbW1hYmxlV2lkdGggaW5jbHVkZXMgdW5jb21taXR0ZWQg Y29udGVudCBpZiBuZWVkZWQuCiAgICAgICAgIGF1dG8gYnJlYWtpbmdDb250ZXh0ID0gbGluZUJy ZWFrZXIuYnJlYWtpbmdDb250ZXh0KCppbmxpbmVJdGVtLCBpbmxpbmVJdGVtV2lkdGgsIHsgYXZh aWxhYmxlV2lkdGgsIGN1cnJlbnRMb2dpY2FsUmlnaHQsIGxpbmUtPnRyYWlsaW5nVHJpbW1hYmxl V2lkdGgoKSwgIWxpbmUtPmhhc0NvbnRlbnQoKSB9KTsKICAgICAgICAgaWYgKGJyZWFraW5nQ29u dGV4dC5pc0F0QnJlYWtpbmdPcHBvcnR1bml0eSkKQEAgLTIyOSwxOCArMjI0LDI0IEBAIElubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpMaW5lQ29udGVudCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6TGluZUxhCiAgICAgICAgICAgICByZXR1cm4gY2xvc2VMaW5lKCk7CiAKICAg ICAgICAgLy8gUGFydGlhbCBjb250ZW50IHN0YXlzIG9uIHRoZSBjdXJyZW50IGxpbmUuIAotICAg ICAgICBpZiAoYnJlYWtpbmdDb250ZXh0LmJyZWFraW5nQmVoYXZpb3IgPT0gTGluZUJyZWFrZXI6 OkJyZWFraW5nQmVoYXZpb3I6OkJyZWFrKSB7CisgICAgICAgIGlmIChicmVha2luZ0NvbnRleHQu YnJlYWtpbmdCZWhhdmlvciA9PSBMaW5lQnJlYWtlcjo6QnJlYWtpbmdCZWhhdmlvcjo6U3BsaXQp IHsKICAgICAgICAgICAgIEFTU0VSVChpbmxpbmVJdGVtLT5pc1RleHQoKSk7CiAKICAgICAgICAg ICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7CiAgICAgICAgICAgICByZXR1cm4gY2xv c2VMaW5lKCk7CiAgICAgICAgIH0KIAorICAgICAgICBBU1NFUlQoYnJlYWtpbmdDb250ZXh0LmJy ZWFraW5nQmVoYXZpb3IgPT0gTGluZUJyZWFrZXI6OkJyZWFraW5nQmVoYXZpb3I6OktlZXApOwog ICAgICAgICBpZiAoaW5saW5lSXRlbS0+aXNGbG9hdCgpKSB7CiAgICAgICAgICAgICBoYW5kbGVG bG9hdCgqbGluZSwgZmxvYXRpbmdDb250ZXh0LCAqaW5saW5lSXRlbSk7CiAgICAgICAgICAgICAr K2NvbW1pdHRlZElubGluZUl0ZW1Db3VudDsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICB9CisgICAgICAgIGlmIChpbmxpbmVJdGVtLT5pc0hhcmRMaW5lQnJlYWsoKSkgeworICAgICAg ICAgICAgdW5jb21taXR0ZWRDb250ZW50LmFkZCgqaW5saW5lSXRlbSwgaW5saW5lSXRlbVdpZHRo KTsKKyAgICAgICAgICAgIGNvbW1pdFBlbmRpbmdDb250ZW50KCk7CisgICAgICAgICAgICByZXR1 cm4gY2xvc2VMaW5lKCk7CisgICAgICAgIH0KIAogICAgICAgICB1bmNvbW1pdHRlZENvbnRlbnQu YWRkKCppbmxpbmVJdGVtLCBpbmxpbmVJdGVtV2lkdGgpOwogICAgICAgICBpZiAoYnJlYWtpbmdD b250ZXh0LmlzQXRCcmVha2luZ09wcG9ydHVuaXR5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCmlu ZGV4IDIzNjRmNmI3M2EwZjQyOWM0MGZiODljMGRkODc3NzQ4YjBiNWEzNDMuLjk5NmFmNDBlODZl MzJjYTJhMzEzZTVhOWFkYTkzOGUxMTM2NGY1MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAK QEAgLTQwLDYgKzQwLDkgQEAgTGluZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4dCBMaW5lQnJlYWtl cjo6YnJlYWtpbmdDb250ZXh0KGNvbnN0IElubGluZUl0ZW0mIGlubGkKICAgICBpZiAobGluZUNv bnRleHQuaXNFbXB0eSB8fCBsb2dpY2FsV2lkdGggPD0gbGluZUNvbnRleHQuYXZhaWxhYmxlV2lk dGgpCiAgICAgICAgIHJldHVybiB7IEJyZWFraW5nQmVoYXZpb3I6OktlZXAsIGlzQXRCcmVha2lu Z09wcG9ydHVuaXR5KGlubGluZUl0ZW0pIH07CiAKKyAgICBpZiAoaW5saW5lSXRlbS5pc0hhcmRM aW5lQnJlYWsoKSkKKyAgICAgICAgcmV0dXJuIHsgQnJlYWtpbmdCZWhhdmlvcjo6S2VlcCwgaXNB dEJyZWFraW5nT3Bwb3J0dW5pdHkoaW5saW5lSXRlbSkgfTsKKwogICAgIGlmIChpczxJbmxpbmVU ZXh0SXRlbT4oaW5saW5lSXRlbSkpCiAgICAgICAgIHJldHVybiB7IHdvcmRCcmVha2luZ0JlaGF2 aW9yKGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKSwgbGluZUNvbnRleHQuaXNF bXB0eSksIGlzQXRCcmVha2luZ09wcG9ydHVuaXR5KGlubGluZUl0ZW0pIH07CiAKQEAgLTYyLDIw ICs2NSwyMCBAQCBMaW5lQnJlYWtlcjo6QnJlYWtpbmdCZWhhdmlvciBMaW5lQnJlYWtlcjo6d29y ZEJyZWFraW5nQmVoYXZpb3IoY29uc3QgSW5saW5lVGV4dAogICAgIGF1dG8mIHN0eWxlID0gaW5s aW5lSXRlbS5zdHlsZSgpOwogCiAgICAgaWYgKGlubGluZUl0ZW0uaXNXaGl0ZXNwYWNlKCkpCi0g ICAgICAgIHJldHVybiBzdHlsZS5jb2xsYXBzZVdoaXRlU3BhY2UoKSA/IEJyZWFraW5nQmVoYXZp b3I6OldyYXAgOiBCcmVha2luZ0JlaGF2aW9yOjpCcmVhazsKKyAgICAgICAgcmV0dXJuIHN0eWxl LmNvbGxhcHNlV2hpdGVTcGFjZSgpID8gQnJlYWtpbmdCZWhhdmlvcjo6V3JhcCA6IEJyZWFraW5n QmVoYXZpb3I6OlNwbGl0OwogCiAgICAgYXV0byBzaG91bGRIeXBlbmF0ZSA9ICFtX2h5cGhlbmF0 aW9uSXNEaXNhYmxlZCAmJiBzdHlsZS5oeXBoZW5zKCkgPT0gSHlwaGVuczo6QXV0byAmJiBjYW5I eXBoZW5hdGUoc3R5bGUubG9jYWxlKCkpOwogICAgIGlmIChzaG91bGRIeXBlbmF0ZSkKLSAgICAg ICAgcmV0dXJuIEJyZWFraW5nQmVoYXZpb3I6OkJyZWFrOworICAgICAgICByZXR1cm4gQnJlYWtp bmdCZWhhdmlvcjo6U3BsaXQ7CiAKICAgICBpZiAoc3R5bGUuYXV0b1dyYXAoKSkgewogICAgICAg ICAvLyBCcmVhayBhbnkgd29yZAogICAgICAgICBpZiAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29y ZEJyZWFrOjpCcmVha0FsbCkKLSAgICAgICAgICAgIHJldHVybiBCcmVha2luZ0JlaGF2aW9yOjpC cmVhazsKKyAgICAgICAgICAgIHJldHVybiBCcmVha2luZ0JlaGF2aW9yOjpTcGxpdDsKIAogICAg ICAgICAvLyBCcmVhayBmaXJzdCBydW4gb24gbGluZS4KICAgICAgICAgaWYgKGxpbmVJc0VtcHR5 ICYmIHN0eWxlLmJyZWFrV29yZHMoKSAmJiBzdHlsZS5wcmVzZXJ2ZU5ld2xpbmUoKSkKLSAgICAg ICAgICAgIHJldHVybiBCcmVha2luZ0JlaGF2aW9yOjpCcmVhazsKKyAgICAgICAgICAgIHJldHVy biBCcmVha2luZ0JlaGF2aW9yOjpTcGxpdDsKICAgICB9CiAKICAgICAvLyBOb24tYnJlYWthYmxl IG5vbi13aGl0ZXNwYWNlIHJ1bi4KQEAgLTg0LDYgKzg3LDkgQEAgTGluZUJyZWFrZXI6OkJyZWFr aW5nQmVoYXZpb3IgTGluZUJyZWFrZXI6OndvcmRCcmVha2luZ0JlaGF2aW9yKGNvbnN0IElubGlu ZVRleHQKIAogYm9vbCBMaW5lQnJlYWtlcjo6aXNBdEJyZWFraW5nT3Bwb3J0dW5pdHkoY29uc3Qg SW5saW5lSXRlbSYgaW5saW5lSXRlbSkKIHsKKyAgICBpZiAoaW5saW5lSXRlbS5pc0hhcmRMaW5l QnJlYWsoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBpZiAoaXM8SW5saW5lVGV4dEl0 ZW0+KGlubGluZUl0ZW0pKQogICAgICAgICByZXR1cm4gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+ KGlubGluZUl0ZW0pLmlzV2hpdGVzcGFjZSgpOwogICAgIHJldHVybiAhaW5saW5lSXRlbS5pc0Zs b2F0KCkgJiYgIWlubGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgpICYmICFpbmxpbmVJdGVtLmlz Q29udGFpbmVyRW5kKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuaAppbmRleCAyN2VjMmI4ZjkzODk1OTAw OGNkYTViYjEzYTZlNGFmMWJiOTY5MjdiLi5hODQ1NDEzYzAzMjkyMjRiNzU4ZTdhZGM2ZjY0MDZk ZTQ0NDhlMTc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmgKQEAgLTM0LDcgKzM0LDcgQEAgY2xhc3Mg SW5saW5lVGV4dEl0ZW07CiAKIGNsYXNzIExpbmVCcmVha2VyIHsKIHB1YmxpYzoKLSAgICBlbnVt IGNsYXNzIEJyZWFraW5nQmVoYXZpb3IgeyBLZWVwLCBCcmVhaywgV3JhcCB9OworICAgIGVudW0g Y2xhc3MgQnJlYWtpbmdCZWhhdmlvciB7IEtlZXAsIFNwbGl0LCBXcmFwIH07CiAgICAgc3RydWN0 IEJyZWFraW5nQ29udGV4dCB7CiAgICAgICAgIEJyZWFraW5nQmVoYXZpb3IgYnJlYWtpbmdCZWhh dmlvcjsKICAgICAgICAgYm9vbCBpc0F0QnJlYWtpbmdPcHBvcnR1bml0eSB7IGZhbHNlIH07Cg==