225993 2021-05-19 16:32:56 -0700 [Modern Media Controls] should not use `codePointCompare` as it doesn't take into account language specific sorting rules 2021-05-20 10:29:18 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225900 InRadar P2 Normal --- 1 hi hi eric.carlson ews-watchlist glenn hi jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1761764 0 hi 2021-05-19 16:32:56 -0700 . 1761782 1 429116 hi 2021-05-19 17:12:03 -0700 Created attachment 429116 Patch 1762018 2 ews-feeder 2021-05-20 10:28:48 -0700 Committed r277793 (237954@main): <https://commits.webkit.org/237954@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429116. 1762019 3 webkit-bug-importer 2021-05-20 10:29:18 -0700 <rdar://problem/78265256> 429116 2021-05-19 17:12:03 -0700 2021-05-20 10:28:49 -0700 Patch 225993.diff text/plain 5690 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZDUwYTMxM2U3OGUuLmY4NjAwOWQ2OWI2ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDIxLTA1LTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBzaG91bGQgbm90IHVzZSBgY29k ZVBvaW50Q29tcGFyZWAgYXMgaXQgZG9lc24ndCB0YWtlIGludG8gYWNjb3VudCBsYW5ndWFnZSBz cGVjaWZpYyBzb3J0aW5nIHJ1bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjU5OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlcy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpzb3J0ZWRUcmFja0xpc3RGb3JNZW51 KToKKyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnRleHRUcmFja0NvbXBhcmUpOgorICAgICAgICAoV2ViQ29yZTo6Q2Fw dGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnNvcnRlZFRyYWNrTGlzdEZvck1lbnUpOgorCiAy MDIxLTA1LTE4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3Zl IENGU3RyaW5nUmVmIGFuZCBOU1N0cmluZyBzdXBwb3J0IGZyb20gU3RyaW5nQnVpbGRlciBpbnRv IFN0cmluZ0NvbmNhdGVuYXRlQ0YKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2Fw dGlvblVzZXJQcmVmZXJlbmNlcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2Vy UHJlZmVyZW5jZXMuY3BwCmluZGV4IDlkZTFiODUyZTk1Mi4uZDNlNDVlOGJiNGM3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlcy5jcHAKQEAgLTQ1LDYg KzQ1LDcgQEAKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9KU0NlbGxJbmxpbmVzLmg+CiAjaW5j bHVkZSA8SmF2YVNjcmlwdENvcmUvU3RydWN0dXJlSW5saW5lcy5oPgogI2luY2x1ZGUgPHd0Zi9M YW5ndWFnZS5oPgorI2luY2x1ZGUgPHd0Zi91bmljb2RlL0NvbGxhdG9yLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtMjM3LDggKzIzOCwxMCBAQCBWZWN0b3I8UmVmUHRyPFRleHRUcmFj az4+IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OnNvcnRlZFRyYWNrTGlzdEZvck1lbnUoVGV4dFRy YQogICAgICAgICAgICAgdHJhY2tzRm9yTWVudS5hcHBlbmQodHJhY2spOwogICAgIH0KIAotICAg IHN0ZDo6c29ydCh0cmFja3NGb3JNZW51LmJlZ2luKCksIHRyYWNrc0Zvck1lbnUuZW5kKCksIFtd KGF1dG8mIGEsIGF1dG8mIGIpIHsKLSAgICAgICAgcmV0dXJuIGNvZGVQb2ludENvbXBhcmUodHJh Y2tEaXNwbGF5TmFtZShhLmdldCgpKSwgdHJhY2tEaXNwbGF5TmFtZShiLmdldCgpKSkgPCAwOwor ICAgIENvbGxhdG9yIGNvbGxhdG9yOworCisgICAgc3RkOjpzb3J0KHRyYWNrc0Zvck1lbnUuYmVn aW4oKSwgdHJhY2tzRm9yTWVudS5lbmQoKSwgWyZdIChhdXRvJiBhLCBhdXRvJiBiKSB7CisgICAg ICAgIHJldHVybiBjb2xsYXRvci5jb2xsYXRlKHRyYWNrRGlzcGxheU5hbWUoYS5nZXQoKSksIHRy YWNrRGlzcGxheU5hbWUoYi5nZXQoKSkpIDwgMDsKICAgICB9KTsKIAogICAgIGlmIChraW5kcy5j b250YWlucyhUZXh0VHJhY2s6OktpbmQ6OlN1YnRpdGxlcykgfHwga2luZHMuY29udGFpbnMoVGV4 dFRyYWNrOjpLaW5kOjpDYXB0aW9ucykgfHwga2luZHMuY29udGFpbnMoVGV4dFRyYWNrOjpLaW5k OjpEZXNjcmlwdGlvbnMpKSB7CkBAIC0yNzksOCArMjgyLDEwIEBAIFZlY3RvcjxSZWZQdHI8QXVk aW9UcmFjaz4+IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OnNvcnRlZFRyYWNrTGlzdEZvck1lbnUo QXVkaW9UCiAgICAgICAgIHRyYWNrc0Zvck1lbnUuYXBwZW5kKHRyYWNrKTsKICAgICB9CiAKLSAg ICBzdGQ6OnNvcnQodHJhY2tzRm9yTWVudS5iZWdpbigpLCB0cmFja3NGb3JNZW51LmVuZCgpLCBb XShhdXRvJiBhLCBhdXRvJiBiKSB7Ci0gICAgICAgIHJldHVybiBjb2RlUG9pbnRDb21wYXJlKHRy YWNrRGlzcGxheU5hbWUoYS5nZXQoKSksIHRyYWNrRGlzcGxheU5hbWUoYi5nZXQoKSkpIDwgMDsK KyAgICBDb2xsYXRvciBjb2xsYXRvcjsKKworICAgIHN0ZDo6c29ydCh0cmFja3NGb3JNZW51LmJl Z2luKCksIHRyYWNrc0Zvck1lbnUuZW5kKCksIFsmXSAoYXV0byYgYSwgYXV0byYgYikgeworICAg ICAgICByZXR1cm4gY29sbGF0b3IuY29sbGF0ZSh0cmFja0Rpc3BsYXlOYW1lKGEuZ2V0KCkpLCB0 cmFja0Rpc3BsYXlOYW1lKGIuZ2V0KCkpKSA8IDA7CiAgICAgfSk7CiAKICAgICByZXR1cm4gdHJh Y2tzRm9yTWVudTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQ cmVmZXJlbmNlc01lZGlhQUYuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclBy ZWZlcmVuY2VzTWVkaWFBRi5jcHAKaW5kZXggMDExNzdiMzIwNmZhLi4yNjE1ZWRjOTM5MTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlh QUYuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01l ZGlhQUYuY3BwCkBAIC00OSw2ICs0OSw3IEBACiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVp bGRlci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRlTnVtYmVycy5oPgog I2luY2x1ZGUgPHd0Zi90ZXh0L2NmL1N0cmluZ0NvbmNhdGVuYXRlQ0YuaD4KKyNpbmNsdWRlIDx3 dGYvdW5pY29kZS9Db2xsYXRvci5oPgogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICNpbXBv cnQgIldlYkNvcmVUaHJlYWRSdW4uaCIKQEAgLTY4MSwxMyArNjgyLDE1IEBAIHN0YXRpYyBib29s IHRleHRUcmFja0NvbXBhcmUoY29uc3QgUmVmUHRyPFRleHRUcmFjaz4mIGEsIGNvbnN0IFJlZlB0 cjxUZXh0VHJhY2s+CiAgICAgU3RyaW5nIGJMYW5ndWFnZURpc3BsYXlOYW1lID0gZGlzcGxheU5h bWVGb3JMYW5ndWFnZUxvY2FsZShsYW5ndWFnZUlkZW50aWZpZXIoYi0+dmFsaWRCQ1A0N0xhbmd1 YWdlKCkpKTsKIAogICAgIC8vIFRyYWNrcyBpbiB0aGUgdXNlcidzIHByZWZlcnJlZCBsYW5ndWFn ZSBhcmUgYWx3YXlzIGF0IHRoZSB0b3Agb2YgdGhlIG1lbnUuCi0gICAgYm9vbCBhSXNQcmVmZXJy ZWRMYW5ndWFnZSA9ICFjb2RlUG9pbnRDb21wYXJlKGFMYW5ndWFnZURpc3BsYXlOYW1lLCBwcmVm ZXJyZWRMYW5ndWFnZURpc3BsYXlOYW1lKTsKLSAgICBib29sIGJJc1ByZWZlcnJlZExhbmd1YWdl ID0gIWNvZGVQb2ludENvbXBhcmUoYkxhbmd1YWdlRGlzcGxheU5hbWUsIHByZWZlcnJlZExhbmd1 YWdlRGlzcGxheU5hbWUpOworICAgIGJvb2wgYUlzUHJlZmVycmVkTGFuZ3VhZ2UgPSBhTGFuZ3Vh Z2VEaXNwbGF5TmFtZSA9PSBwcmVmZXJyZWRMYW5ndWFnZURpc3BsYXlOYW1lOworICAgIGJvb2wg YklzUHJlZmVycmVkTGFuZ3VhZ2UgPSBiTGFuZ3VhZ2VEaXNwbGF5TmFtZSA9PSBwcmVmZXJyZWRM YW5ndWFnZURpc3BsYXlOYW1lOwogICAgIGlmIChhSXNQcmVmZXJyZWRMYW5ndWFnZSAhPSBiSXNQ cmVmZXJyZWRMYW5ndWFnZSkKICAgICAgICAgcmV0dXJuIGFJc1ByZWZlcnJlZExhbmd1YWdlOwog CisgICAgQ29sbGF0b3IgY29sbGF0b3I7CisKICAgICAvLyBUcmFja3Mgbm90IGluIHRoZSB1c2Vy J3MgcHJlZmVycmVkIGxhbmd1YWdlIHNvcnQgZmlyc3QgYnkgbGFuZ3VhZ2UgLi4uCi0gICAgaWYg KGF1dG8gbGFuZ3VhZ2VEaXNwbGF5TmFtZUNvbXBhcmlzb24gPSBjb2RlUG9pbnRDb21wYXJlKGFM YW5ndWFnZURpc3BsYXlOYW1lLCBiTGFuZ3VhZ2VEaXNwbGF5TmFtZSkpCisgICAgaWYgKGF1dG8g bGFuZ3VhZ2VEaXNwbGF5TmFtZUNvbXBhcmlzb24gPSBjb2xsYXRvci5jb2xsYXRlKGFMYW5ndWFn ZURpc3BsYXlOYW1lLCBiTGFuZ3VhZ2VEaXNwbGF5TmFtZSkpCiAgICAgICAgIHJldHVybiBsYW5n dWFnZURpc3BsYXlOYW1lQ29tcGFyaXNvbiA8IDA7CiAKICAgICAvLyAuLi4gYnV0IHdoZW4gdHJh Y2tzIGhhdmUgdGhlIHNhbWUgbGFuZ3VhZ2UsIG1haW4gcHJvZ3JhbSBjb250ZW50IHNvcnRzIG5l eHQgaGlnaGVzdCAuLi4KQEAgLTcwMyw3ICs3MDYsNyBAQCBzdGF0aWMgYm9vbCB0ZXh0VHJhY2tD b21wYXJlKGNvbnN0IFJlZlB0cjxUZXh0VHJhY2s+JiBhLCBjb25zdCBSZWZQdHI8VGV4dFRyYWNr PgogICAgICAgICByZXR1cm4gYUlzQ0M7CiAKICAgICAvLyAuLi4gYW5kIHRyYWNrcyBvZiB0aGUg c2FtZSB0eXBlIGFuZCBsYW5ndWFnZSBzb3J0IGJ5IHRoZSBtZW51IGl0ZW0gdGV4dC4KLSAgICBp ZiAoYXV0byB0cmFja0Rpc3BsYXlDb21wYXJpc29uID0gY29kZVBvaW50Q29tcGFyZSh0cmFja0Rp c3BsYXlOYW1lKGEuZ2V0KCkpLCB0cmFja0Rpc3BsYXlOYW1lKGIuZ2V0KCkpKSkKKyAgICBpZiAo YXV0byB0cmFja0Rpc3BsYXlDb21wYXJpc29uID0gY29sbGF0b3IuY29sbGF0ZSh0cmFja0Rpc3Bs YXlOYW1lKGEuZ2V0KCkpLCB0cmFja0Rpc3BsYXlOYW1lKGIuZ2V0KCkpKSkKICAgICAgICAgcmV0 dXJuIHRyYWNrRGlzcGxheUNvbXBhcmlzb24gPCAwOwogCiAgICAgLy8gLi4uIGFuZCBpZiB0aGUg bWVudSBpdGVtIHRleHQgaXMgdGhlIHNhbWUsIGNvbXBhcmUgdGhlIHVuaXF1ZSBJRHMKQEAgLTcy MSwxMCArNzI0LDExIEBAIFZlY3RvcjxSZWZQdHI8QXVkaW9UcmFjaz4+IENhcHRpb25Vc2VyUHJl ZmVyZW5jZXNNZWRpYUFGOjpzb3J0ZWRUcmFja0xpc3RGb3JNZW51CiAgICAgICAgIFN0cmluZyBs YW5ndWFnZSA9IGRpc3BsYXlOYW1lRm9yTGFuZ3VhZ2VMb2NhbGUodHJhY2stPnZhbGlkQkNQNDdM YW5ndWFnZSgpKTsKICAgICAgICAgdHJhY2tzRm9yTWVudS5hcHBlbmQodHJhY2spOwogICAgIH0K LSAgICAKLSAgICBzdGQ6OnNvcnQodHJhY2tzRm9yTWVudS5iZWdpbigpLCB0cmFja3NGb3JNZW51 LmVuZCgpLCBbXShhdXRvJiBhLCBhdXRvJiBiKSB7Ci0gICAgICAgIGF1dG8gdHJhY2tEaXNwbGF5 Q29tcGFyaXNvbiA9IGNvZGVQb2ludENvbXBhcmUodHJhY2tEaXNwbGF5TmFtZShhLmdldCgpKSwg dHJhY2tEaXNwbGF5TmFtZShiLmdldCgpKSk7Ci0gICAgICAgIGlmICh0cmFja0Rpc3BsYXlDb21w YXJpc29uKQorCisgICAgQ29sbGF0b3IgY29sbGF0b3I7CisKKyAgICBzdGQ6OnNvcnQodHJhY2tz Rm9yTWVudS5iZWdpbigpLCB0cmFja3NGb3JNZW51LmVuZCgpLCBbJl0gKGF1dG8mIGEsIGF1dG8m IGIpIHsKKyAgICAgICAgaWYgKGF1dG8gdHJhY2tEaXNwbGF5Q29tcGFyaXNvbiA9IGNvbGxhdG9y LmNvbGxhdGUodHJhY2tEaXNwbGF5TmFtZShhLmdldCgpKSwgdHJhY2tEaXNwbGF5TmFtZShiLmdl dCgpKSkpCiAgICAgICAgICAgICByZXR1cm4gdHJhY2tEaXNwbGF5Q29tcGFyaXNvbiA8IDA7CiAK ICAgICAgICAgcmV0dXJuIGEtPnVuaXF1ZUlkKCkgPCBiLT51bmlxdWVJZCgpOwo=