225995 2021-05-19 16:35:47 -0700 [Modern Media Controls] add a suffix based on `TextTrack::Kind` when generating display names for `TrackBase` 2021-05-20 10:34:20 -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 peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1761766 0 hi 2021-05-19 16:35:47 -0700 . 1761784 1 429118 hi 2021-05-19 17:12:27 -0700 Created attachment 429118 Patch 1762027 2 ews-feeder 2021-05-20 10:33:54 -0700 Committed r277797 (237955@main): <https://commits.webkit.org/237955@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429118. 1762028 3 webkit-bug-importer 2021-05-20 10:34:20 -0700 <rdar://problem/78265522> 429118 2021-05-19 17:12:27 -0700 2021-05-20 10:33:55 -0700 Patch 225995.diff text/plain 7417 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZDUwYTMxM2U3OGUuLjk0OTQ0YWRhMmRkMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIxIEBACisyMDIxLTA1LTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBhZGQgYSBzdWZmaXggYmFzZWQg b24gYFRleHRUcmFjazo6S2luZGAgd2hlbiBnZW5lcmF0aW5nIGRpc3BsYXkgbmFtZXMgZm9yIGBU cmFja0Jhc2VgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjU5OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6YnVpbGREaXNwbGF5U3RyaW5nRm9yVHJhY2tCYXNlKToKKworICAgICAgICAqIHBsYXRm b3JtL0xvY2FsaXplZFN0cmluZ3MuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJp bmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNhcHRpb25zVGV4dFRyYWNrV2l0aG91dExhYmVs TWVudUl0ZW1UZXh0KTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpkZXNjcmlwdGlvbnNUZXh0 VHJhY2tXaXRob3V0TGFiZWxNZW51SXRlbVRleHQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OmNoYXB0ZXJzVGV4dFRyYWNrV2l0aG91dExhYmVsTWVudUl0ZW1UZXh0KTogQWRkZWQuCisgICAg ICAgIChXZWJDb3JlOjptZXRhZGF0YVRleHRUcmFja1dpdGhvdXRMYWJlbE1lbnVJdGVtVGV4dCk6 IEFkZGVkLgorICAgICAgICAqIGVuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3M6CisKIDIwMjEt MDUtMTggIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgQ0ZT dHJpbmdSZWYgYW5kIE5TU3RyaW5nIHN1cHBvcnQgZnJvbSBTdHJpbmdCdWlsZGVyIGludG8gU3Ry aW5nQ29uY2F0ZW5hdGVDRgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9j YWxpemFibGUuc3RyaW5ncyBiL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0 cmluZ3MKaW5kZXggOWFlNDEzNzE1Mjg4Li41ZDA4OWIyZjJmNWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MKKysrIGIvU291cmNlL1dlYkNv cmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncwpAQCAtMjgsNiArMjgsMTUgQEAKIC8qIFRl eHQgdHJhY2sgY29udGFpbnMgY2xvc2VkIGNhcHRpb25zICovCiAiJUAgQ0MiID0gIiVAIENDIjsK IAorLyogQ2FwdGlvbnMgdGV4dCB0cmFjayBkaXNwbGF5IG5hbWUgZm9ybWF0IHRoYXQgaW5jbHVk ZXMgdGhlIGxhbmd1YWdlIGFuZC9vciBsb2NhbGUgKGUuZy4gJ0VuZ2xpc2ggQ2FwdGlvbnMnKS4g Ki8KKyIlQCBDYXB0aW9ucyIgPSAiJUAgQ2FwdGlvbnMiOworCisvKiBDaGFwdGVycyB0ZXh0IHRy YWNrIGRpc3BsYXkgbmFtZSBmb3JtYXQgdGhhdCBpbmNsdWRlcyB0aGUgbGFuZ3VhZ2UgYW5kL29y IGxvY2FsZSAoZS5nLiAnRW5nbGlzaCBDaGFwdGVycycpLiAqLworIiVAIENoYXB0ZXJzIiA9ICIl QCBDaGFwdGVycyI7CisKKy8qIERlc2NyaXB0aW9ucyB0ZXh0IHRyYWNrIGRpc3BsYXkgbmFtZSBm b3JtYXQgdGhhdCBpbmNsdWRlcyB0aGUgbGFuZ3VhZ2UgYW5kL29yIGxvY2FsZSAoZS5nLiAnRW5n bGlzaCBEZXNjcmlwdGlvbnMnKS4gKi8KKyIlQCBEZXNjcmlwdGlvbnMiID0gIiVAIERlc2NyaXB0 aW9ucyI7CisKIC8qIFRleHQgdHJhY2sgY29udGFpbnMgc2ltcGxpZmllZCAoM3JkIGdyYWRlIGxl dmVsKSBzdWJ0aXRsZXMgKi8KICIlQCBFYXN5IFJlYWRlciIgPSAiJUAgRWFzeSBSZWFkZXIiOwog CkBAIC0zNyw2ICs0Niw5IEBACiAvKiB2aXNpYmxlIG5hbWUgb2YgdGhlIEdQVSBwcm9jZXNzLiBU aGUgYXJndW1lbnQgaXMgdGhlIGFwcGxpY2F0aW9uIG5hbWUuICovCiAiJUAgR3JhcGhpY3MgYW5k IE1lZGlhIiA9ICIlQCBHcmFwaGljcyBhbmQgTWVkaWEiOwogCisvKiBNZXRhZGF0YSB0ZXh0IHRy YWNrIGRpc3BsYXkgbmFtZSBmb3JtYXQgdGhhdCBpbmNsdWRlcyB0aGUgbGFuZ3VhZ2UgYW5kL29y IGxvY2FsZSAoZS5nLiAnRW5nbGlzaCBNZXRhZGF0cycpLiAqLworIiVAIE1ldGFkYXRhIiA9ICIl QCBNZXRhZGF0YSI7CisKIC8qIHZpc2libGUgbmFtZSBvZiB0aGUgbmV0d29yayBwcm9jZXNzLiBU aGUgYXJndW1lbnQgaXMgdGhlIGFwcGxpY2F0aW9uIG5hbWUuICovCiAiJUAgTmV0d29ya2luZyIg PSAiJUAgTmV0d29ya2luZyI7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2Fw dGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0 aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAKaW5kZXggMDExNzdiMzIwNmZhLi4wYmYxZDQw Mzk5NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJl bmNlc01lZGlhQUYuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVm ZXJlbmNlc01lZGlhQUYuY3BwCkBAIC02MDcsMTEgKzYwNyw0MyBAQCBzdGF0aWMgdm9pZCBidWls ZERpc3BsYXlTdHJpbmdGb3JUcmFja0Jhc2UoU3RyaW5nQnVpbGRlciYgZGlzcGxheU5hbWUsIGNv bnN0IFRyYQogICAgIH0gZWxzZSB7CiAgICAgICAgIFN0cmluZyBsYW5ndWFnZUFuZExvY2FsZSA9 IGFkb3B0Q0YoQ0ZMb2NhbGVDb3B5RGlzcGxheU5hbWVGb3JQcm9wZXJ0eVZhbHVlKGN1cnJlbnRM b2NhbGUuZ2V0KCksIGtDRkxvY2FsZUlkZW50aWZpZXIsIHRyYWNrTGFuZ3VhZ2VJZGVudGlmaWVy LmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCkpKS5nZXQoKTsKICAgICAgICAgaWYgKCFsYW5ndWFnZUFu ZExvY2FsZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBkaXNwbGF5TmFtZS5hcHBlbmQobGFuZ3Vh Z2VBbmRMb2NhbGUpOworICAgICAgICAgICAgbGFiZWwgPSBsYW5ndWFnZUFuZExvY2FsZTsKICAg ICAgICAgZWxzZSBpZiAoIWxhbmd1YWdlLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIGRpc3BsYXlO YW1lLmFwcGVuZChsYW5ndWFnZSk7CisgICAgICAgICAgICBsYWJlbCA9IGxhbmd1YWdlOwogICAg ICAgICBlbHNlCi0gICAgICAgICAgICBkaXNwbGF5TmFtZS5hcHBlbmQobG9jYWxlSWRlbnRpZmll ci5nZXQoKSk7CisgICAgICAgICAgICBsYWJlbCA9IGxvY2FsZUlkZW50aWZpZXIuZ2V0KCk7CisK KyAgICAgICAgaWYgKHRyYWNrLnR5cGUoKSA9PSBUcmFja0Jhc2U6OlRleHRUcmFjaykgeworICAg ICAgICAgICAgYXV0byYgdGV4dFRyYWNrID0gZG93bmNhc3Q8VGV4dFRyYWNrPih0cmFjayk7Cisg ICAgICAgICAgICBzd2l0Y2ggKHRleHRUcmFjay5raW5kKCkpIHsKKyAgICAgICAgICAgIGNhc2Ug VGV4dFRyYWNrOjpLaW5kOjpTdWJ0aXRsZXM6CisgICAgICAgICAgICAgICAgLy8gU3VidGl0bGUg dGV4dCB0cmFja3MgYXJlIG9ubHkgc2hvd24gaW4gYSBkZWRpY2F0ZWQgIlN1YnRpdGxlIiBncm91 cGluZywgbWVhbmluZworICAgICAgICAgICAgICAgIC8vIGl0IHdvdWxkIGxvb2sgb2RkIHRvIGFk ZCB0aGUgc2FtZSB0aXRsZSBhcyBhIHN1ZmZpeCAoZS5nLiAiRW5nbGlzaCBTdWJ0aXRsZXMiKS4K KyAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgY2FzZSBUZXh0VHJhY2s6Oktp bmQ6OkNhcHRpb25zOgorICAgICAgICAgICAgICAgIGxhYmVsID0gY2FwdGlvbnNUZXh0VHJhY2tX aXRob3V0TGFiZWxNZW51SXRlbVRleHQobGFiZWwpOworICAgICAgICAgICAgICAgIGJyZWFrOwor CisgICAgICAgICAgICBjYXNlIFRleHRUcmFjazo6S2luZDo6RGVzY3JpcHRpb25zOgorICAgICAg ICAgICAgICAgIGxhYmVsID0gZGVzY3JpcHRpb25zVGV4dFRyYWNrV2l0aG91dExhYmVsTWVudUl0 ZW1UZXh0KGxhYmVsKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgY2Fz ZSBUZXh0VHJhY2s6OktpbmQ6OkNoYXB0ZXJzOgorICAgICAgICAgICAgICAgIGxhYmVsID0gY2hh cHRlcnNUZXh0VHJhY2tXaXRob3V0TGFiZWxNZW51SXRlbVRleHQobGFiZWwpOworICAgICAgICAg ICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBjYXNlIFRleHRUcmFjazo6S2luZDo6TWV0YWRh dGE6CisgICAgICAgICAgICAgICAgbGFiZWwgPSBtZXRhZGF0YVRleHRUcmFja1dpdGhvdXRMYWJl bE1lbnVJdGVtVGV4dChsYWJlbCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAg ICAgIGNhc2UgVGV4dFRyYWNrOjpLaW5kOjpGb3JjZWQ6CisgICAgICAgICAgICAgICAgbGFiZWwg PSBmb3JjZWRUcmFja01lbnVJdGVtVGV4dChsYWJlbCk7CisgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBkaXNwbGF5TmFtZS5hcHBlbmQo bGFiZWwpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v TG9jYWxpemVkU3RyaW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRT dHJpbmdzLmNwcAppbmRleCBjYzM1NTNmZmI5NzMuLmIwYTkzZjI2MjM3ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5jcHAKQEAgLTExMTAsNiArMTExMCwy NiBAQCBTdHJpbmcgYXVkaW9UcmFja05vTGFiZWxUZXh0KCkKIAogI2lmIFVTRShDRikKIAorU3Ry aW5nIGNhcHRpb25zVGV4dFRyYWNrV2l0aG91dExhYmVsTWVudUl0ZW1UZXh0KGNvbnN0IFN0cmlu ZyYgdGl0bGUpCit7CisgICAgcmV0dXJuIGZvcm1hdExvY2FsaXplZFN0cmluZyhXRUJfVUlfQ0ZT VFJJTkcoIiVAIENhcHRpb25zIiwgIkNhcHRpb25zIHRleHQgdHJhY2sgZGlzcGxheSBuYW1lIGZv cm1hdCB0aGF0IGluY2x1ZGVzIHRoZSBsYW5ndWFnZSBhbmQvb3IgbG9jYWxlIChlLmcuICdFbmds aXNoIENhcHRpb25zJykuIiksIHRpdGxlLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCkpOworfQorCitT dHJpbmcgZGVzY3JpcHRpb25zVGV4dFRyYWNrV2l0aG91dExhYmVsTWVudUl0ZW1UZXh0KGNvbnN0 IFN0cmluZyYgdGl0bGUpCit7CisgICAgcmV0dXJuIGZvcm1hdExvY2FsaXplZFN0cmluZyhXRUJf VUlfQ0ZTVFJJTkcoIiVAIERlc2NyaXB0aW9ucyIsICJEZXNjcmlwdGlvbnMgdGV4dCB0cmFjayBk aXNwbGF5IG5hbWUgZm9ybWF0IHRoYXQgaW5jbHVkZXMgdGhlIGxhbmd1YWdlIGFuZC9vciBsb2Nh bGUgKGUuZy4gJ0VuZ2xpc2ggRGVzY3JpcHRpb25zJykuIiksIHRpdGxlLmNyZWF0ZUNGU3RyaW5n KCkuZ2V0KCkpOworfQorCitTdHJpbmcgY2hhcHRlcnNUZXh0VHJhY2tXaXRob3V0TGFiZWxNZW51 SXRlbVRleHQoY29uc3QgU3RyaW5nJiB0aXRsZSkKK3sKKyAgICByZXR1cm4gZm9ybWF0TG9jYWxp emVkU3RyaW5nKFdFQl9VSV9DRlNUUklORygiJUAgQ2hhcHRlcnMiLCAiQ2hhcHRlcnMgdGV4dCB0 cmFjayBkaXNwbGF5IG5hbWUgZm9ybWF0IHRoYXQgaW5jbHVkZXMgdGhlIGxhbmd1YWdlIGFuZC9v ciBsb2NhbGUgKGUuZy4gJ0VuZ2xpc2ggQ2hhcHRlcnMnKS4iKSwgdGl0bGUuY3JlYXRlQ0ZTdHJp bmcoKS5nZXQoKSk7Cit9CisKK1N0cmluZyBtZXRhZGF0YVRleHRUcmFja1dpdGhvdXRMYWJlbE1l bnVJdGVtVGV4dChjb25zdCBTdHJpbmcmIHRpdGxlKQoreworICAgIHJldHVybiBmb3JtYXRMb2Nh bGl6ZWRTdHJpbmcoV0VCX1VJX0NGU1RSSU5HKCIlQCBNZXRhZGF0YSIsICJNZXRhZGF0YSB0ZXh0 IHRyYWNrIGRpc3BsYXkgbmFtZSBmb3JtYXQgdGhhdCBpbmNsdWRlcyB0aGUgbGFuZ3VhZ2UgYW5k L29yIGxvY2FsZSAoZS5nLiAnRW5nbGlzaCBNZXRhZGF0cycpLiIpLCB0aXRsZS5jcmVhdGVDRlN0 cmluZygpLmdldCgpKTsKK30KKwogU3RyaW5nIHRleHRUcmFja0NvdW50cnlBbmRMYW5ndWFnZU1l bnVJdGVtVGV4dChjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGNvdW50cnksIGNv bnN0IFN0cmluZyYgbGFuZ3VhZ2UpCiB7CiAgICAgcmV0dXJuIGZvcm1hdExvY2FsaXplZFN0cmlu ZyhXRUJfVUlfQ0ZTVFJJTkcoIiVAICglQC0lQCkiLCAiVGV4dCB0cmFjayBkaXNwbGF5IG5hbWUg Zm9ybWF0IHRoYXQgaW5jbHVkZXMgdGhlIGNvdW50cnkgYW5kIGxhbmd1YWdlIG9mIHRoZSBzdWJ0 aXRsZSwgaW4gdGhlIGZvcm0gb2YgJ1RpdGxlIChMYW5ndWFnZS1Db3VudHJ5KSciKSwgdGl0bGUu Y3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgbGFuZ3VhZ2UuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwg Y291bnRyeS5jcmVhdGVDRlN0cmluZygpLmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0xvY2FsaXplZFN0cmluZ3MuaAppbmRleCBkYmY3ZWI3OTNkZjUuLmI4YTJjZTg4M2RlYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaApAQCAtMzA1LDYgKzMw NSwxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgU3RyaW5nIHRleHRUcmFja05vTGFiZWxU ZXh0KCk7CiAgICAgU3RyaW5nIGF1ZGlvVHJhY2tOb0xhYmVsVGV4dCgpOwogI2lmIFBMQVRGT1JN KENPQ09BKSB8fCBQTEFURk9STShXSU4pCisgICAgU3RyaW5nIGNhcHRpb25zVGV4dFRyYWNrV2l0 aG91dExhYmVsTWVudUl0ZW1UZXh0KGNvbnN0IFN0cmluZyYpOworICAgIFN0cmluZyBkZXNjcmlw dGlvbnNUZXh0VHJhY2tXaXRob3V0TGFiZWxNZW51SXRlbVRleHQoY29uc3QgU3RyaW5nJik7Cisg ICAgU3RyaW5nIGNoYXB0ZXJzVGV4dFRyYWNrV2l0aG91dExhYmVsTWVudUl0ZW1UZXh0KGNvbnN0 IFN0cmluZyYpOworICAgIFN0cmluZyBtZXRhZGF0YVRleHRUcmFja1dpdGhvdXRMYWJlbE1lbnVJ dGVtVGV4dChjb25zdCBTdHJpbmcmKTsKICAgICBTdHJpbmcgdGV4dFRyYWNrQ291bnRyeUFuZExh bmd1YWdlTWVudUl0ZW1UZXh0KGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgY291 bnRyeSwgY29uc3QgU3RyaW5nJiBsYW5ndWFnZSk7CiAgICAgU3RyaW5nIHRleHRUcmFja0xhbmd1 YWdlTWVudUl0ZW1UZXh0KGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgbGFuZ3Vh Z2UpOwogICAgIFN0cmluZyBjbG9zZWRDYXB0aW9uVHJhY2tNZW51SXRlbVRleHQoY29uc3QgU3Ry aW5nJik7Cg==