218884 2020-11-12 20:07:47 -0800 [LFC][Integration] Add initial bidi support 2020-11-13 06:14:19 -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 1707104 0 zalan 2020-11-12 20:07:47 -0800 no bidi boundaries yet. 1707105 1 413999 zalan 2020-11-12 20:17:05 -0800 Created attachment 413999 Patch 1707213 2 ews-feeder 2020-11-13 06:13:02 -0800 Committed r269773: <https://trac.webkit.org/changeset/269773> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413999. 1707214 3 webkit-bug-importer 2020-11-13 06:14:19 -0800 <rdar://problem/71369170> 413999 2020-11-12 20:17:05 -0800 2020-11-13 06:13:03 -0800 Patch bug-218884-20201112201704.patch text/plain 7537 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFhMTcwYTY5NzE5Mzc4 OTJhZmZiMDNiNzJhMGY5ZjgxZDg0MTg1MC4uNDhmYWEwMzkyYjJhNzE4ZjQ2NzgyZDNjMTA5MzIx NDQ0MTg2MjA2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIwLTExLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IEFkZCBpbml0aWFsIGJpZGkgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE4ODg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSW4gdGhpcyBwYXRjaCwgd2UgaW50cm9kdWNlIHRoZSBCaWRpIFJ1 biBhbmQgdGhlIEl0ZXJhdG9yIGFuZCB1c2UgdGhlIEJpZGlSZXNvbHZlciB0byBjb21wdXRlCisg ICAgICAgIHRoZSBiaWRpIGJvdW5kYXJpZXMuCisgICAgICAgIEN1cnJlbnRseSBvbmx5IHNpbmds ZSBkaXJlY3Rpb24gY29udGVudCBpcyBwYXNzZWQgaW4gdG8gdGhlIEJpZGlSZXNvbHZlciB3aGlj aCBtZWFzIHRoYXQgd2UgYWx3YXlzCisgICAgICAgIGVuZCB1cCB3aXRoIG9uZSBhbmQgb25seSBv bmUgQmlkaSBydW4uCisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJ bnRlZ3JhdGlvbjo6SXRlcmF0b3I6Om9mZnNldCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXRJbnRlZ3JhdGlvbjo6SXRlcmF0b3I6OmN1cnJlbnRSdW4gY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Okl0ZXJhdG9yOjpydW5PZmZzZXQgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Okl0ZXJhdG9yOjpvcGVyYXRvcj09 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpJdGVyYXRvcjo6 b3BlcmF0b3IhPSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 SXRlcmF0b3I6OmF0RW5kIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpJdGVyYXRvcjo6SXRlcmF0b3IpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246Okl0ZXJhdG9yOjpkaXJlY3Rpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0SW50ZWdyYXRpb246Okl0ZXJhdG9yOjppbmNyZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0SW50ZWdyYXRpb246OkJpZGlSdW46OnN0YXJ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpCaWRpUnVuOjplbmQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkJpZGlSdW46OmxldmVsIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCaWRpUnVuOjpuZXh0IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCaWRpUnVuOjpzZXROZXh0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCaWRpUnVuOjp0YWtlTmV4dCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6QmlkaVJ1bjo6QmlkaVJ1bik6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmNy ZWF0ZURpc3BsYXlMaW5lUnVucyBjb25zdCk6CisKIDIwMjAtMTEtMTIgIFphbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gTWlub3IgcmVu YW1lIGFuZCBjbGVhbnVwIGluIElubGluZUNvbnRlbnRCdWlsZGVyCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250 ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKaW5kZXggYWJiNTQzN2Y2OTYyZjA2 M2Y5OTk4NTY2ZDY2MjAwNjkzN2VjYjhhZi4uMjdiYWQ4MDBkMDNmNmJkOTY4NTg2NTZhM2QyN2Nk ZjA4ZWQzMzNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRC dWlsZGVyLmNwcApAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRU SU5HX0NPTlRFWFQpCiAKKyNpbmNsdWRlICJCaWRpUmVzb2x2ZXIuaCIKICNpbmNsdWRlICJJbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5oIgogI2luY2x1ZGUgIklubGluZUZvcm1hdHRpbmdTdGF0ZS5o IgogI2luY2x1ZGUgIkxheW91dEJveEdlb21ldHJ5LmgiCkBAIC01OSw2ICs2MCw5MiBAQCBpbmxp bmUgc3RhdGljIGZsb2F0IGxpbmVPdmVyZmxvd1dpZHRoKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYg ZmxvdywgSW5saW5lTGF5b3V0VQogICAgIHJldHVybiBzdGQ6Om1heChsaW5lTG9naWNhbFdpZHRo LCBsaW5lQm94TG9naWNhbFdpZHRoKTsKIH0KIAorY2xhc3MgSXRlcmF0b3IgeworcHVibGljOgor ICAgIEl0ZXJhdG9yKCkgPSBkZWZhdWx0OworICAgIEl0ZXJhdG9yKGNvbnN0IExheW91dDo6SW5s aW5lTGluZVJ1bnMqIHJ1bkxpc3QsIHNpemVfdCBjdXJyZW50UnVuSW5kZXgpOworCisgICAgdm9p ZCBpbmNyZW1lbnQoKTsKKyAgICB1bnNpZ25lZCBvZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX29m ZnNldDsgfQorICAgIFVDaGFyRGlyZWN0aW9uIGRpcmVjdGlvbigpIGNvbnN0OworCisgICAgYm9v bCBvcGVyYXRvcj09KGNvbnN0IEl0ZXJhdG9yJiBvdGhlcikgY29uc3QgeyByZXR1cm4gb2Zmc2V0 KCkgPT0gb3RoZXIub2Zmc2V0KCk7IH0KKyAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgSXRlcmF0 b3ImIG90aGVyKSBjb25zdCB7IHJldHVybiBvZmZzZXQoKSAhPSBvdGhlci5vZmZzZXQoKTsgfTsK KyAgICBib29sIGF0RW5kKCkgY29uc3QgeyByZXR1cm4gIW1fcnVuTGlzdCB8fCBtX3J1bkluZGV4 ID09IG1fcnVuTGlzdC0+c2l6ZSgpOyB9OworCitwcml2YXRlOgorICAgIGNvbnN0IExheW91dDo6 TGluZVJ1biYgY3VycmVudFJ1bigpIGNvbnN0IHsgcmV0dXJuIG1fcnVuTGlzdC0+YXQobV9ydW5J bmRleCk7IH0KKworICAgIGNvbnN0IExheW91dDo6SW5saW5lTGluZVJ1bnMqIG1fcnVuTGlzdCB7 IG51bGxwdHIgfTsKKyAgICBzaXplX3QgbV9vZmZzZXQgeyAwIH07CisgICAgc2l6ZV90IG1fcnVu SW5kZXggeyAwIH07CisgICAgc2l6ZV90IG1fcnVuT2Zmc2V0IHsgMCB9OworfTsKKworSXRlcmF0 b3I6Okl0ZXJhdG9yKGNvbnN0IExheW91dDo6SW5saW5lTGluZVJ1bnMqIHJ1bkxpc3QsIHNpemVf dCBydW5JbmRleCkKKyAgICA6IG1fcnVuTGlzdChydW5MaXN0KQorICAgICwgbV9ydW5JbmRleChy dW5JbmRleCkKK3sKK30KKworVUNoYXJEaXJlY3Rpb24gSXRlcmF0b3I6OmRpcmVjdGlvbigpIGNv bnN0Cit7CisgICAgQVNTRVJUKG1fcnVuTGlzdCk7CisgICAgQVNTRVJUKCFhdEVuZCgpKTsKKyAg ICBhdXRvJiB0ZXh0Q29udGVudCA9IGN1cnJlbnRSdW4oKS50ZXh0KCk7CisgICAgaWYgKCF0ZXh0 Q29udGVudCkKKyAgICAgICAgcmV0dXJuIFVfT1RIRVJfTkVVVFJBTDsKKyAgICByZXR1cm4gdV9j aGFyRGlyZWN0aW9uKHRleHRDb250ZW50LT5jb250ZW50KClbdGV4dENvbnRlbnQtPnN0YXJ0KCkg KyBtX3J1bk9mZnNldF0pOworfQorCit2b2lkIEl0ZXJhdG9yOjppbmNyZW1lbnQoKQoreworICAg IEFTU0VSVChtX3J1bkxpc3QpOworICAgIEFTU0VSVCghYXRFbmQoKSk7CisgICAgKyttX29mZnNl dDsKKyAgICBhdXRvJiBjdXJyZW50UnVuID0gdGhpcy0+Y3VycmVudFJ1bigpOworICAgIGlmIChh dXRvJiB0ZXh0Q29udGVudCA9IGN1cnJlbnRSdW4udGV4dCgpKSB7CisgICAgICAgIGlmICgrK21f cnVuT2Zmc2V0IDwgdGV4dENvbnRlbnQtPmxlbmd0aCgpKQorICAgICAgICAgICAgcmV0dXJuOwor ICAgIH0KKyAgICArK21fcnVuSW5kZXg7CisgICAgbV9ydW5PZmZzZXQgPSAwOworfQorCitjbGFz cyBCaWRpUnVuIHsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKK3B1YmxpYzoKKyAgICBC aWRpUnVuKHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQsIEJpZGlDb250ZXh0KiwgVUNoYXJE aXJlY3Rpb24pOworCisgICAgc2l6ZV90IHN0YXJ0KCkgY29uc3QgeyByZXR1cm4gbV9zdGFydDsg fQorICAgIHNpemVfdCBlbmQoKSBjb25zdCB7IHJldHVybiBtX2VuZDsgfQorICAgIHVuc2lnbmVk IGNoYXIgbGV2ZWwoKSBjb25zdCB7IHJldHVybiBtX2xldmVsOyB9CisKKyAgICBCaWRpUnVuKiBu ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9uZXh0LmdldCgpOyB9CisgICAgdm9pZCBzZXROZXh0KHN0 ZDo6dW5pcXVlX3B0cjxCaWRpUnVuPiYmIG5leHQpIHsgbV9uZXh0ID0gV1RGTW92ZShuZXh0KTsg fQorICAgIHN0ZDo6dW5pcXVlX3B0cjxCaWRpUnVuPiB0YWtlTmV4dCgpIHsgcmV0dXJuIFdURk1v dmUobV9uZXh0KTsgfQorCitwcml2YXRlOgorICAgIHN0ZDo6dW5pcXVlX3B0cjxCaWRpUnVuPiBt X25leHQ7CisgICAgc2l6ZV90IG1fc3RhcnQgeyAwIH07CisgICAgc2l6ZV90IG1fZW5kIHsgMCB9 OworICAgIHVuc2lnbmVkIGNoYXIgbV9sZXZlbCB7IDAgfTsKK307CisKK0JpZGlSdW46OkJpZGlS dW4odW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGVuZCwgQmlkaUNvbnRleHQqIGNvbnRleHQsIFVD aGFyRGlyZWN0aW9uIGRpcmVjdGlvbikKKyAgICA6IG1fc3RhcnQoc3RhcnQpCisgICAgLCBtX2Vu ZChlbmQpCisgICAgLCBtX2xldmVsKGNvbnRleHQtPmxldmVsKCkpCit7CisgICAgQVNTRVJUKGNv bnRleHQpOworICAgIGlmIChkaXJlY3Rpb24gPT0gVV9PVEhFUl9ORVVUUkFMKQorICAgICAgICBk aXJlY3Rpb24gPSBjb250ZXh0LT5kaXIoKTsKKyAgICBpZiAobV9sZXZlbCAlIDIpCisgICAgICAg IG1fbGV2ZWwgPSAoZGlyZWN0aW9uID09IFVfTEVGVF9UT19SSUdIVCB8fCBkaXJlY3Rpb24gPT0g VV9BUkFCSUNfTlVNQkVSIHx8IGRpcmVjdGlvbiA9PSBVX0VVUk9QRUFOX05VTUJFUikgPyBtX2xl dmVsICsgMSA6IG1fbGV2ZWw7CisgICAgZWxzZQorICAgICAgICBtX2xldmVsID0gKGRpcmVjdGlv biA9PSBVX1JJR0hUX1RPX0xFRlQpID8gbV9sZXZlbCArIDEgOiAoZGlyZWN0aW9uID09IFVfQVJB QklDX05VTUJFUiB8fCBkaXJlY3Rpb24gPT0gVV9FVVJPUEVBTl9OVU1CRVIpID8gbV9sZXZlbCAr IDIgOiBtX2xldmVsOworfQorCiBJbmxpbmVDb250ZW50QnVpbGRlcjo6SW5saW5lQ29udGVudEJ1 aWxkZXIoY29uc3QgTGF5b3V0OjpMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IFJlbmRl ckJsb2NrRmxvdyYgYmxvY2tGbG93KQogICAgIDogbV9sYXlvdXRTdGF0ZShsYXlvdXRTdGF0ZSkK ICAgICAsIG1fYmxvY2tGbG93KGJsb2NrRmxvdykKQEAgLTExMiw2ICsxOTksMTQgQEAgdm9pZCBJ bmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVSdW5zKGNvbnN0IExheW91dDo6 SW5saW5lRm9ybWF0dGluZ1MKICAgICBpZiAocnVuTGlzdC5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybjsKICAgICBhdXRvJiBsaW5lcyA9IGlubGluZUZvcm1hdHRpbmdTdGF0ZS5saW5lcygpOwor CisgICAgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBCaWRpUnVuPiBiaWRpUmVzb2x2ZXI7CisgICAg Ly8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBvdmVycmlkZS4KKyAgICBiaWRpUmVzb2x2ZXIuc2V0 U3RhdHVzKEJpZGlTdGF0dXMobV9sYXlvdXRTdGF0ZS5yb290KCkuc3R5bGUoKS5kaXJlY3Rpb24o KSwgZmFsc2UpKTsKKyAgICAvLyBGSVhNRTogR3JhYiB0aGUgbmVzdGVkIGlzb2xhdGVzIGZyb20g dGhlIHByZXZpb3VzIGxpbmUuCisgICAgYmlkaVJlc29sdmVyLnNldFBvc2l0aW9uKEl0ZXJhdG9y KCZydW5MaXN0LCAwKSwgMCk7CisgICAgYmlkaVJlc29sdmVyLmNyZWF0ZUJpZGlSdW5zRm9yTGlu ZShJdGVyYXRvcigmcnVuTGlzdCwgcnVuTGlzdC5zaXplKCkpKTsKKwogICAgIFZlY3Rvcjxib29s PiBoYXNBZGp1c3RlZFRyYWlsaW5nTGluZUxpc3QobGluZXMuc2l6ZSgpLCBmYWxzZSk7CiAKICAg ICBhdXRvIGNyZWF0ZURpc3BsYXlCb3hSdW4gPSBbJl0oYXV0byYgbGluZVJ1bikgewpAQCAtMTg3 LDEyICsyODIsMTcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxp bmVSdW5zKGNvbnN0IExheW91dDo6SW5saW5lRm9ybWF0dGluZ1MKICAgICAgICAgaW5saW5lQ29u dGVudC5ydW5zLmFwcGVuZChkaXNwbGF5UnVuKTsKICAgICB9OwogCi0gICAgZm9yIChhdXRvJiBs aW5lUnVuIDogaW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVSdW5zKCkpIHsKLSAgICAgICAgaWYg KGF1dG8mIHRleHQgPSBsaW5lUnVuLnRleHQoKSkKLSAgICAgICAgICAgIGNyZWF0ZURpc3BsYXlU ZXh0UnVuRm9yUmFuZ2UobGluZVJ1biwgdGV4dC0+c3RhcnQoKSwgdGV4dC0+ZW5kKCkpOwotICAg ICAgICBlbHNlCi0gICAgICAgICAgICBjcmVhdGVEaXNwbGF5Qm94UnVuKGxpbmVSdW4pOwotICAg IH0KKyAgICBhdXRvJiBiaWRpUnVucyA9IGJpZGlSZXNvbHZlci5ydW5zKCk7CisgICAgaWYgKGJp ZGlSdW5zLnJ1bkNvdW50KCkgPT0gMSkgeworICAgICAgICAvLyBGYXN0IHBhdGggZm9yIGNhc2Vz IHdoZW4gdGhlcmUncyBubyBiaWRpIGJvdW5kYXJ5LgorICAgICAgICBmb3IgKGF1dG8mIGxpbmVS dW4gOiBpbmxpbmVGb3JtYXR0aW5nU3RhdGUubGluZVJ1bnMoKSkgeworICAgICAgICAgICAgaWYg KGF1dG8mIHRleHQgPSBsaW5lUnVuLnRleHQoKSkKKyAgICAgICAgICAgICAgICBjcmVhdGVEaXNw bGF5VGV4dFJ1bkZvclJhbmdlKGxpbmVSdW4sIHRleHQtPnN0YXJ0KCksIHRleHQtPmVuZCgpKTsK KyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjcmVhdGVEaXNwbGF5Qm94UnVuKGxp bmVSdW4pOworICAgICAgICB9CisgICAgfSBlbHNlCisgICAgICAgIEFTU0VSVF9OT1RfSU1QTEVN RU5URURfWUVUKCk7CiB9CiAKIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3Bs YXlMaW5lcyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZSYgaW5saW5lRm9ybWF0 dGluZ1N0YXRlLCBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50LCBjb25zdCBMaW5lTGV2ZWxW aXN1YWxBZGp1c3RtZW50c0ZvclJ1bnNMaXN0JiBsaW5lTGV2ZWxWaXN1YWxBZGp1c3RtZW50c0Zv clJ1bnMpIGNvbnN0Cg==