217288 2020-10-03 19:28:20 -0700 [LFC][IFC][Soft hyphen] endsWithSoftWrapOpportunity should check if hyphenation is disabled 2020-10-04 05:14:24 -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 1694487 0 zalan 2020-10-03 19:28:20 -0700 ssia 1694488 1 410450 zalan 2020-10-03 19:32:46 -0700 Created attachment 410450 Patch 1694525 2 ews-feeder 2020-10-04 05:13:11 -0700 Committed r267944: <https://trac.webkit.org/changeset/267944> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410450. 1694526 3 webkit-bug-importer 2020-10-04 05:14:24 -0700 <rdar://problem/69928081> 410450 2020-10-03 19:32:46 -0700 2020-10-04 05:13:11 -0700 Patch bug-217288-20201003193246.patch text/plain 6763 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjhiYTQ4OGRiYWViZmZk YWIzNzRhMWQ4ZGMxODY2YjkzODc2MjA4MC4uMTIzZTFmYmIwNDYwMzI1ZGY1YTliMjg3YjE5OTJk NTJmNjU2OGU5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEwLTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXVtTb2Z0IGh5 cGhlbl0gZW5kc1dpdGhTb2Z0V3JhcE9wcG9ydHVuaXR5IHNob3VsZCBjaGVjayBpZiBoeXBoZW5h dGlvbiBpcyBkaXNhYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE3Mjg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhpcyBpcyB2ZXJ5IHNpbWlsYXIgSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFw cGVuZFRleHRJdGVtcyB3aGVyZSB3ZQorICAgICAgICBhbHNvIGNvbnN0cnVjdCBhIExhenlMaW5l QnJlYWtJdGVyYXRvciB0byBjaGVjayBmb3Igd29yZCB3cmFwIG9wcG9ydHVuaXRpZXMuCisKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzVGV4dENvbnRlbnQpOiBUaGUgdHJhaWxpbmcg Im9ubHkiIGlzIG1pc2xlYWRpbmcgc2luY2Ugd2UgY2FuJ3QgaGF2ZSBhIG1peHR1cmUgb2YgdGV4 dCBhbmQgbm9uLXRleHQgY29udGVudAorICAgICAgICB3aXRoaW4gYSBjb250aW51b3VzIGNvbnRl bnQgKHRoZXJlJ3MgYWx3YXlzIGEgd29yZCB3cmFwIG9wcG9ydHVuaXR5IGJldHdlZW4gYSB0ZXh0 IGFuZCBhIG5vbi10ZXh0IGNvbnRlbnQpLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc1Zp c3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzSW5saW5lQ29udGVudCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdD b250ZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6aXNUZXh0Q29udGVudE9u bHkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc1Zpc3VhbGx5RW1wdHlX aGl0ZXNwYWNlQ29udGVudE9ubHkpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6ZW5kc1dpdGhTb2Z0V3JhcE9wcG9ydHVuaXR5KToKKwogMjAyMC0xMC0wMyAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gUmVtb3ZlIExpbmU6 OmFwcGVuZFBhcnRpYWxUcmFpbGluZ1RleHRJdGVtIHNwZWNpYWwgY2FzZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFr ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29u dGVudEJyZWFrZXIuY3BwCmluZGV4IDczOWNmZDE4ZmJhOTU5MTdiZTczN2U5OWNjOWMwNzMyYjQ4 MzY0YjkuLjYwN2E5NzQzOGFkNjkwZDZlYjUxMDk5MDM0NmYxOWI3YjNiM2QyOTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRC cmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTM3LDcgKzM3LDcgQEAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCi1zdGF0aWMgaW5saW5lIGJvb2wgaXNUZXh0Q29u dGVudE9ubHkoY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50JiBj b250aW51b3VzQ29udGVudCkKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc1RleHRDb250ZW50KGNvbnN0 IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudCYgY29udGludW91c0NvbnRl bnQpCiB7CiAgICAgLy8gPHNwYW4+dGV4dDwvc3Bhbj4gaXMgY29uc2lkZXJlZCBhIHRleHQgcnVu IGV2ZW4gd2l0aCB0aGUgW2NvbnRhaW5lciBzdGFydF1bY29udGFpbmVyIGVuZF0gaW5saW5lIGl0 ZW1zLgogICAgIC8vIER1ZSB0byBjb21taXQgYm91bmRhcnkgcnVsZXMsIHdlIGp1c3QgbmVlZCB0 byBjaGVjayB0aGUgZmlyc3Qgbm9uLXR5cGVsZXNzIGlubGluZSBpdGVtIChjYW4ndCBoYXZlIGJv dGggW2ltZ10gYW5kIFt0ZXh0XSkKQEAgLTUwLDcgKzUwLDcgQEAgc3RhdGljIGlubGluZSBib29s IGlzVGV4dENvbnRlbnRPbmx5KGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3Vz Q29udGUKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBpc1Zpc3Vh bGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudE9ubHkoY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6 OkNvbnRpbnVvdXNDb250ZW50JiBjb250aW51b3VzQ29udGVudCkKK3N0YXRpYyBpbmxpbmUgYm9v bCBpc1Zpc3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudChjb25zdCBJbmxpbmVDb250ZW50QnJl YWtlcjo6Q29udGludW91c0NvbnRlbnQmIGNvbnRpbnVvdXNDb250ZW50KQogewogICAgIC8vIFs8 c3Bhbj48L3NwYW4+IF0gWzxzcGFuPiA8L3NwYW4+XSBbIDxzcGFuIHN0eWxlPSJwYWRkaW5nOiAw cHg7Ij48L3NwYW4+XSBhcmUgYWxsIGNvbnNpZGVyZWQgdmlzdWFsbHkgZW1wdHkgd2hpdGVzcGFj ZSBjb250ZW50LgogICAgIC8vIFs8c3BhbiBzdHlsZT0iYm9yZGVyOiAxcHggc29saWQgcmVkIj48 L3NwYW4+IF0gd2hpbGUgdGhpcyBpcyB3aGl0ZXNwYWNlIGNvbnRlbnQgb25seSwgaXQgaXMgbm90 IGNvbnNpZGVyZWQgdmlzdWFsbHkgZW1wdHkuCkBAIC0xNzAsNyArMTcwLDcgQEAgSW5saW5lQ29u dGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc0lubGluZUNv bnRlbnQoY29uc3QgQ28KICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAo cmVzdWx0LmFjdGlvbiA9PSBSZXN1bHQ6OkFjdGlvbjo6V3JhcCkgewotICAgICAgICBpZiAobGlu ZVN0YXR1cy50cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCAmJiBpc1RleHRDb250ZW50T25seShjYW5k aWRhdGVDb250ZW50KSkgeworICAgICAgICBpZiAobGluZVN0YXR1cy50cmFpbGluZ1NvZnRIeXBo ZW5XaWR0aCAmJiBpc1RleHRDb250ZW50KGNhbmRpZGF0ZUNvbnRlbnQpKSB7CiAgICAgICAgICAg ICAvLyBBIHRyYWlsaW5nIHNvZnQgaHlwaGVuIHdpdGggYSB3cmFwcGVkIHRleHQgY29udGVudCB0 dXJucyBpbnRvIGEgdmlzaWJsZSBoeXBoZW4uCiAgICAgICAgICAgICAvLyBMZXQncyBjaGVjayBp ZiB0aGVyZSdzIGVub3VnaCBzcGFjZSBmb3IgdGhlIGh5cGhlbiBjaGFyYWN0ZXIuCiAgICAgICAg ICAgICBhdXRvIGh5cGhlbk92ZXJmbG93cyA9ICpsaW5lU3RhdHVzLnRyYWlsaW5nU29mdEh5cGhl bldpZHRoID4gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aDsgCkBAIC0xOTQsNyArMTk0LDcgQEAg SW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vz c092ZXJmbG93aW5nQ29udGVudChjb24KIAogICAgIEFTU0VSVChjb250aW51b3VzQ29udGVudC5s b2dpY2FsV2lkdGgoKSA+IGxpbmVTdGF0dXMuYXZhaWxhYmxlV2lkdGgpOwogICAgIGlmIChjb250 aW51b3VzQ29udGVudC5oYXNUcmFpbGluZ0NvbGxhcHNpYmxlQ29udGVudCgpKSB7Ci0gICAgICAg IEFTU0VSVChpc1RleHRDb250ZW50T25seShjb250aW51b3VzQ29udGVudCkpOworICAgICAgICBB U1NFUlQoaXNUZXh0Q29udGVudChjb250aW51b3VzQ29udGVudCkpOwogICAgICAgICBhdXRvIElz RW5kT2ZMaW5lID0gaXNDb250ZW50V3JhcHBpbmdBbGxvd2VkKGNvbnRpbnVvdXNDb250ZW50KSA/ IElzRW5kT2ZMaW5lOjpZZXMgOiBJc0VuZE9mTGluZTo6Tm87CiAgICAgICAgIC8vIEZpcnN0IGNo ZWNrIGlmIHRoZSBjb250ZW50IGZpdHMgd2l0aG91dCB0aGUgdHJhaWxpbmcgY29sbGFwc2libGUg cGFydC4KICAgICAgICAgaWYgKGNvbnRpbnVvdXNDb250ZW50Lm5vbkNvbGxhcHNpYmxlTG9naWNh bFdpZHRoKCkgPD0gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCkKQEAgLTIxMCwxMyArMjEwLDEz IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5saW5lQ29udGVudEJyZWFrZXI6OnBy b2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgICAgIGlmIChjb250aW51b3VzQ29udGVu dC5sb2dpY2FsV2lkdGgoKSA8PSBsaW5lU3RhdHVzLmF2YWlsYWJsZVdpZHRoICsgbGluZVN0YXR1 cy5jb2xsYXBzaWJsZVdpZHRoKQogICAgICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246 OktlZXAgfTsKICAgICB9Ci0gICAgaWYgKGlzVmlzdWFsbHlFbXB0eVdoaXRlc3BhY2VDb250ZW50 T25seShjb250aW51b3VzQ29udGVudCkgJiYgc2hvdWxkS2VlcEVuZE9mTGluZVdoaXRlc3BhY2Uo Y29udGludW91c0NvbnRlbnQpKSB7CisgICAgaWYgKGlzVmlzdWFsbHlFbXB0eVdoaXRlc3BhY2VD b250ZW50KGNvbnRpbnVvdXNDb250ZW50KSAmJiBzaG91bGRLZWVwRW5kT2ZMaW5lV2hpdGVzcGFj ZShjb250aW51b3VzQ29udGVudCkpIHsKICAgICAgICAgLy8gVGhpcyBvdmVyZmxvd2luZyBjb250 ZW50IGFwcGFyZW50bHkgZmFsbHMgaW50byB0aGUgcmVtb3ZlL2hhbmcgZW5kLW9mLWxpbmUtc3Bh Y2VzIGNhdGVnb3J5LgogICAgICAgICAvLyBzZWUgaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy10 ZXh0LTMvI3doaXRlLXNwYWNlLXByb3BlcnR5IG1hdHJpeAogICAgICAgICByZXR1cm4geyBSZXN1 bHQ6OkFjdGlvbjo6S2VlcCB9OwogICAgIH0KIAotICAgIGlmIChpc1RleHRDb250ZW50T25seShj b250aW51b3VzQ29udGVudCkpIHsKKyAgICBpZiAoaXNUZXh0Q29udGVudChjb250aW51b3VzQ29u dGVudCkpIHsKICAgICAgICAgaWYgKGF1dG8gdHJhaWxpbmdDb250ZW50ID0gcHJvY2Vzc092ZXJm bG93aW5nVGV4dENvbnRlbnQoY29udGludW91c0NvbnRlbnQsIGxpbmVTdGF0dXMpKSB7CiAgICAg ICAgICAgICBpZiAoIXRyYWlsaW5nQ29udGVudC0+cnVuSW5kZXggJiYgdHJhaWxpbmdDb250ZW50 LT5oYXNPdmVyZmxvdykgewogICAgICAgICAgICAgICAgIC8vIFdlIHRyaWVkIHRvIGJyZWFrIHRo ZSBjb250ZW50IGJ1dCB0aGUgYXZhaWxhYmxlIHNwYWNlIGNhbid0IGV2ZW4gYWNjb21tb2RhdGUg dGhlIGZpcnN0IGNoYXJhY3Rlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBmNTNmODdj NzNkYWE1YmY4YjBlODg2ZjgwMjQ4OTcyYTkwZDAwYWNlLi5iM2RhODBjZjQwZDQ5OTg3Yzc3OWJm YmZlZjAzYWMyYWQ1OGNmNDAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0zNCw2ICsz NCw3IEBACiAjaW5jbHVkZSAiTGF5b3V0Qm94R2VvbWV0cnkuaCIKICNpbmNsdWRlICJMYXlvdXRT dGF0ZS5oIgogI2luY2x1ZGUgIlRleHRVdGlsLmgiCisjaW5jbHVkZSA8d3RmL3VuaWNvZGUvQ2hh cmFjdGVyTmFtZXMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91dCB7 CkBAIC01Niw2ICs1Nyw4IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBlbmRzV2l0aFNvZnRXcmFwT3Bw b3J0dW5pdHkoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGN1cnJlbnRUZXh0CiAgICAgYXV0byBwcmV2 aW91c0NvbnRlbnRMZW5ndGggPSBwcmV2aW91c0NvbnRlbnQubGVuZ3RoKCk7CiAgICAgLy8gRklY TUU6IFdlIHNob3VsZCBsb29rIGludG8gdGhlIGVudGlyZSB1bmNvbW1pdHRlZCBjb250ZW50IGZv ciBtb3JlIHRleHQgY29udGV4dC4KICAgICBVQ2hhciBsYXN0Q2hhcmFjdGVyID0gcHJldmlvdXND b250ZW50TGVuZ3RoID8gcHJldmlvdXNDb250ZW50W3ByZXZpb3VzQ29udGVudExlbmd0aCAtIDFd IDogMDsKKyAgICBpZiAobGFzdENoYXJhY3RlciA9PSBzb2Z0SHlwaGVuICYmIGN1cnJlbnRUZXh0 SXRlbS5zdHlsZSgpLmh5cGhlbnMoKSA9PSBIeXBoZW5zOjpOb25lKQorICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgVUNoYXIgc2Vjb25kVG9MYXN0Q2hhcmFjdGVyID0gcHJldmlvdXNDb250ZW50 TGVuZ3RoID4gMSA/IHByZXZpb3VzQ29udGVudFtwcmV2aW91c0NvbnRlbnRMZW5ndGggLSAyXSA6 IDA7CiAgICAgbGluZUJyZWFrSXRlcmF0b3Iuc2V0UHJpb3JDb250ZXh0KGxhc3RDaGFyYWN0ZXIs IHNlY29uZFRvTGFzdENoYXJhY3Rlcik7CiAgICAgLy8gTm93IGNoZWNrIGlmIHdlIGNhbiBicmVh ayByaWdodCBhdCB0aGUgaW5saW5lIGl0ZW0gYm91bmRhcnkuCg==