221939 2021-02-15 17:22:16 -0800 [iOS] don't "promote" media controls contextmenu items if they are the only item being shown 2021-02-17 09:36:15 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi eric.carlson ews-watchlist glenn hi jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1729475 0 hi 2021-02-15 17:22:16 -0800 if a video only has subtitles and not any other languages, don't make the "Subtitles" menu top-level when tapping the tracks button 1729477 1 420402 hi 2021-02-15 17:24:12 -0800 Created attachment 420402 Patch 1730318 2 ews-feeder 2021-02-17 09:35:56 -0800 Committed r273006: <https://commits.webkit.org/r273006> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420402. 1730319 3 webkit-bug-importer 2021-02-17 09:36:15 -0800 <rdar://problem/74437028> 420402 2021-02-15 17:24:12 -0800 2021-02-17 09:35:56 -0800 Patch 221939.diff text/plain 7473 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOWJjZWU1YTZkNTU5Li4zYzBmY2M2MWY1OTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTMgQEAKKzIwMjEtMDItMTUgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgor CisgICAgICAgIFtpT1NdIGRvbid0ICJwcm9tb3RlIiBtZWRpYSBjb250cm9scyBjb250ZXh0bWVu dSBpdGVtcyBpZiB0aGV5IGFyZSB0aGUgb25seSBpdGVtIGJlaW5nIHNob3duCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE5MzkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tB Y3Rpb25TaGVldEFzc2lzdGFudC5tbToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFu dCBzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51Oml0ZW1zOmNvbXBsZXRpb25IYW5kbGVyOl0p OgorCiAyMDIxLTAyLTExICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29t PgogCiAgICAgICAgIFtXUEVdIGV2ZW50LmN0cmxLZXkgYW5kIG90aGVyIGFyZSBmYWxzZSBpbiBr ZXlkb3duIGV2ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tB Y3Rpb25TaGVldEFzc2lzdGFudC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Fj dGlvblNoZWV0QXNzaXN0YW50Lm1tCmluZGV4IDI1MjE0MjZhNzZiNC4uYTI4MTExODRlNjhmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lz dGFudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFz c2lzdGFudC5tbQpAQCAtODIxLDE4ICs4MjEsMTIgQEAgLSAodm9pZClzaG93TWVkaWFDb250cm9s c0NvbnRleHRNZW51OihXZWJDb3JlOjpGbG9hdFJlY3QmJil0YXJnZXRGcmFtZSBpdGVtczooVmUK ICAgICBBU1NFUlQoIV9tZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUpOwogICAgIEFTU0VSVCghX21l ZGlhQ29udHJvbHNDb250ZXh0TWVudUNhbGxiYWNrKTsKIAotICAgIFN0cmluZyBtZW51VGl0bGU7 Ci0gICAgaWYgKGl0ZW1zLnNpemUoKSA9PSAxKSB7Ci0gICAgICAgIG1lbnVUaXRsZSA9IFdURk1v dmUoaXRlbXNbMF0udGl0bGUpOwotICAgICAgICBpdGVtcyA9IFdURk1vdmUoaXRlbXNbMF0uY2hp bGRyZW4pOwotICAgIH0KLQogICAgIGlmIChpdGVtcy5pc0VtcHR5KCkpIHsKICAgICAgICAgY29t cGxldGlvbkhhbmRsZXIoV2ViQ29yZTo6TWVkaWFDb250cm9sc0NvbnRleHRNZW51SXRlbTo6aW52 YWxpZElEKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIF9tZWRpYUNvbnRyb2xzQ29u dGV4dE1lbnUgPSBbVUlNZW51IG1lbnVXaXRoVGl0bGU6V1RGTW92ZShtZW51VGl0bGUpIGltYWdl Om5pbCBpZGVudGlmaWVyOm5pbCBvcHRpb25zOjAgY2hpbGRyZW46W3NlbGYgX3VpTWVudUVsZW1l bnRzRm9yTWVkaWFDb250cm9sQ29udGV4dE1lbnVJdGVtczpXVEZNb3ZlKGl0ZW1zKV1dOworICAg IF9tZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUgPSBbVUlNZW51IG1lbnVXaXRoVGl0bGU6QCIiIGNo aWxkcmVuOltzZWxmIF91aU1lbnVFbGVtZW50c0Zvck1lZGlhQ29udHJvbENvbnRleHRNZW51SXRl bXM6V1RGTW92ZShpdGVtcyldXTsKICAgICBfbWVkaWFDb250cm9sc0NvbnRleHRNZW51VGFyZ2V0 RnJhbWUgPSBXVEZNb3ZlKHRhcmdldEZyYW1lKTsKICAgICBfbWVkaWFDb250cm9sc0NvbnRleHRN ZW51Q2FsbGJhY2sgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKTsKIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDcyZjJj ZTY1ZmYyNS4uNzg3YmUwNjM2OWFiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDItMTUg IERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIGRvbid0 ICJwcm9tb3RlIiBtZWRpYSBjb250cm9scyBjb250ZXh0bWVudSBpdGVtcyBpZiB0aGV5IGFyZSB0 aGUgb25seSBpdGVtIGJlaW5nIHNob3duCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjE5MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3Vw cG9ydC9pb3MvdHJhY2tzLXN1cHBvcnQtY2xpY2stdHJhY2staW4tY29udGV4dG1lbnUuaHRtbDoK KyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvaW9z L3RyYWNrcy1zdXBwb3J0LXRleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS5odG1sOgor ICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9pb3Mv dHJhY2tzLXN1cHBvcnQtdGV4dC10cmFjay1zZWxlY3RlZC12aWEtbWVkaWEtYXBpLWV4cGVjdGVk LnR4dDoKKwogMjAyMS0wMi0xMSAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlh LmNvbT4KIAogICAgICAgICBbV1BFXSBldmVudC5jdHJsS2V5IGFuZCBvdGhlciBhcmUgZmFsc2Ug aW4ga2V5ZG93biBldmVudApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2lvcy90cmFja3Mtc3VwcG9ydC1jbGljay10cmFj ay1pbi1jb250ZXh0bWVudS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL3RyYWNrcy1zdXBwb3J0L2lvcy90cmFja3Mtc3VwcG9ydC1jbGljay10cmFjay1pbi1j b250ZXh0bWVudS5odG1sCmluZGV4IGNhMDk1M2Y0ZGM1NC4uN2ZlZWI2ZGEyZjgwIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBv cnQvaW9zL3RyYWNrcy1zdXBwb3J0LWNsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWwKKysr IGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0 L2lvcy90cmFja3Mtc3VwcG9ydC1jbGljay10cmFjay1pbi1jb250ZXh0bWVudS5odG1sCkBAIC00 MSwxNCArNDEsMjAgQEAgYXN5bmMgZnVuY3Rpb24gY2xpY2tPblNlY29uZEF1ZGlvVHJhY2soKQog ewogICAgIGRlYnVnKCJTZWxlY3Rpbmcgc2Vjb25kIGF1ZGlvIHRyYWNrLi4uIik7CiAgICAgbGV0 IGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKTsKLSAgICBhd2FpdCBV SUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKGNvbnRleHRtZW51WzBdLmNoaWxkcmVuWzFdLnRpdGxl KTsKKyAgICBsZXQgbGFuZ3VhZ2VzTWVudSA9IGNvbnRleHRtZW51WzBdLmNoaWxkcmVuWzBdOwor ICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24obGFuZ3VhZ2VzTWVudS50aXRsZSk7 CisgICAgYXdhaXQgVUlIZWxwZXIuZGVsYXlGb3IoNTAwKTsgLy8gZ2l2ZSB0aW1lIGZvciB0aGUg VUlNZW51IHRvIGFuaW1hdGUKKyAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKGxh bmd1YWdlc01lbnUuY2hpbGRyZW5bMV0udGl0bGUpOwogfQogCiBhc3luYyBmdW5jdGlvbiBjbGlj a09uVGhpcmRBdWRpb1RyYWNrKCkKIHsKICAgICBkZWJ1ZygiU2VsZWN0aW5nIHRoaXJkIGF1ZGlv IHRyYWNrLi4uIik7CiAgICAgbGV0IGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4 dE1lbnUoKTsKLSAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKGNvbnRleHRtZW51 WzBdLmNoaWxkcmVuWzJdLnRpdGxlKTsKKyAgICBsZXQgbGFuZ3VhZ2VzTWVudSA9IGNvbnRleHRt ZW51WzBdLmNoaWxkcmVuWzBdOworICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24o bGFuZ3VhZ2VzTWVudS50aXRsZSk7CisgICAgYXdhaXQgVUlIZWxwZXIuZGVsYXlGb3IoNTAwKTsg Ly8gZ2l2ZSB0aW1lIGZvciB0aGUgVUlNZW51IHRvIGFuaW1hdGUKKyAgICBhd2FpdCBVSUhlbHBl ci5jaG9vc2VNZW51QWN0aW9uKGxhbmd1YWdlc01lbnUuY2hpbGRyZW5bMl0udGl0bGUpOwogfQog CiBhc3luYyBmdW5jdGlvbiBoYW5kbGVBdWRpb1RyYWNrc0NoYW5nZSgpCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvaW9z L3RyYWNrcy1zdXBwb3J0LXRleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1 cHBvcnQvaW9zL3RyYWNrcy1zdXBwb3J0LXRleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFw aS1leHBlY3RlZC50eHQKaW5kZXggMGE3Zjc5NTA3YTM4Li41NzBjOGI1ZmQ1YmMgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9y dC9pb3MvdHJhY2tzLXN1cHBvcnQtdGV4dC10cmFjay1zZWxlY3RlZC12aWEtbWVkaWEtYXBpLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMv dHJhY2tzLXN1cHBvcnQvaW9zL3RyYWNrcy1zdXBwb3J0LXRleHQtdHJhY2stc2VsZWN0ZWQtdmlh LW1lZGlhLWFwaS1leHBlY3RlZC50eHQKQEAgLTksMjAgKzksMjQgQEAgU2V0dGluZyBtb2RlIHRv ICdzaG93aW5nJyBmb3IgZmlyc3QgdGV4dCB0cmFjayB2aWEgSmF2YVNjcmlwdC4uLgogVGFwcGlu ZyB0cmFja3MgYnV0dG9uLi4uCiBbCiAgIHsKLSAgICAidGl0bGUiOiAiU3VidGl0bGVzIiwKICAg ICAiY2hpbGRyZW4iOiBbCiAgICAgICB7Ci0gICAgICAgICJ0aXRsZSI6ICJPZmYiCi0gICAgICB9 LAotICAgICAgewotICAgICAgICAidGl0bGUiOiAiQXV0byAoUmVjb21tZW5kZWQpIgotICAgICAg fSwKLSAgICAgIHsKLSAgICAgICAgInRpdGxlIjogIkVuZ2xpc2giLAotICAgICAgICAiY2hlY2tl ZCI6IHRydWUKLSAgICAgIH0sCi0gICAgICB7Ci0gICAgICAgICJ0aXRsZSI6ICJGcmVuY2giCisg ICAgICAgICJ0aXRsZSI6ICJTdWJ0aXRsZXMiLAorICAgICAgICAiY2hpbGRyZW4iOiBbCisgICAg ICAgICAgeworICAgICAgICAgICAgInRpdGxlIjogIk9mZiIKKyAgICAgICAgICB9LAorICAgICAg ICAgIHsKKyAgICAgICAgICAgICJ0aXRsZSI6ICJBdXRvIChSZWNvbW1lbmRlZCkiCisgICAgICAg ICAgfSwKKyAgICAgICAgICB7CisgICAgICAgICAgICAidGl0bGUiOiAiRW5nbGlzaCIsCisgICAg ICAgICAgICAiY2hlY2tlZCI6IHRydWUKKyAgICAgICAgICB9LAorICAgICAgICAgIHsKKyAgICAg ICAgICAgICJ0aXRsZSI6ICJGcmVuY2giCisgICAgICAgICAgfQorICAgICAgICBdCiAgICAgICB9 CiAgICAgXQogICB9CkBAIC0zMywyMCArMzcsMjQgQEAgUEFTUyBtZWRpYS50ZXh0VHJhY2tzWzFd Lm1vZGUgaXMgJ3Nob3dpbmcnCiBUYXBwaW5nIHRyYWNrcyBidXR0b24uLi4KIFsKICAgewotICAg ICJ0aXRsZSI6ICJTdWJ0aXRsZXMiLAogICAgICJjaGlsZHJlbiI6IFsKICAgICAgIHsKLSAgICAg ICAgInRpdGxlIjogIk9mZiIKLSAgICAgIH0sCi0gICAgICB7Ci0gICAgICAgICJ0aXRsZSI6ICJB dXRvIChSZWNvbW1lbmRlZCkiLAotICAgICAgICAiY2hlY2tlZCI6IHRydWUKLSAgICAgIH0sCi0g ICAgICB7Ci0gICAgICAgICJ0aXRsZSI6ICJFbmdsaXNoIgotICAgICAgfSwKLSAgICAgIHsKLSAg ICAgICAgInRpdGxlIjogIkZyZW5jaCIKKyAgICAgICAgInRpdGxlIjogIlN1YnRpdGxlcyIsCisg ICAgICAgICJjaGlsZHJlbiI6IFsKKyAgICAgICAgICB7CisgICAgICAgICAgICAidGl0bGUiOiAi T2ZmIgorICAgICAgICAgIH0sCisgICAgICAgICAgeworICAgICAgICAgICAgInRpdGxlIjogIkF1 dG8gKFJlY29tbWVuZGVkKSIsCisgICAgICAgICAgICAiY2hlY2tlZCI6IHRydWUKKyAgICAgICAg ICB9LAorICAgICAgICAgIHsKKyAgICAgICAgICAgICJ0aXRsZSI6ICJFbmdsaXNoIgorICAgICAg ICAgIH0sCisgICAgICAgICAgeworICAgICAgICAgICAgInRpdGxlIjogIkZyZW5jaCIKKyAgICAg ICAgICB9CisgICAgICAgIF0KICAgICAgIH0KICAgICBdCiAgIH0KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9pb3MvdHJh Y2tzLXN1cHBvcnQtdGV4dC10cmFjay1zZWxlY3RlZC12aWEtbWVkaWEtYXBpLmh0bWwgYi9MYXlv dXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvaW9zL3Ry YWNrcy1zdXBwb3J0LXRleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS5odG1sCmluZGV4 IDA2ODhjNzIxYzUxOC4uMWRiYWU5M2MwN2Y5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRp YS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvaW9zL3RyYWNrcy1zdXBwb3J0 LXRleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS5odG1sCisrKyBiL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9pb3MvdHJhY2tzLXN1 cHBvcnQtdGV4dC10cmFjay1zZWxlY3RlZC12aWEtbWVkaWEtYXBpLmh0bWwKQEAgLTMxLDcgKzMx LDEwIEBAIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoInBsYXkiLCAoKSA9PiB7CiAgICAgICAgICAg ICAgICAgZGVidWcoSlNPTi5zdHJpbmdpZnkoY29udGV4dG1lbnUsIG51bGwsIDIpKTsKIAogICAg ICAgICAgICAgICAgIGRlYnVnKCJTZWxlY3RpbmcgZmlyc3QgdGV4dCB0cmFjay4uLiIpOwotICAg ICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24oY29udGV4dG1lbnVb MF0uY2hpbGRyZW5bMV0udGl0bGUpOworICAgICAgICAgICAgICAgIGxldCBzdWJ0aXRsZXNNZW51 ID0gY29udGV4dG1lbnVbMF0uY2hpbGRyZW5bMF07CisgICAgICAgICAgICAgICAgYXdhaXQgVUlI ZWxwZXIuY2hvb3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsKKyAgICAgICAgICAg ICAgICBhd2FpdCBVSUhlbHBlci5kZWxheUZvcig1MDApOyAvLyBnaXZlIHRpbWUgZm9yIHRoZSBV SU1lbnUgdG8gYW5pbWF0ZQorICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1l bnVBY3Rpb24oc3VidGl0bGVzTWVudS5jaGlsZHJlblsxXS50aXRsZSk7CiAgICAgICAgICAgICAg ICAgYXdhaXQgVUlIZWxwZXIud2FpdEZvckNvbnRleHRNZW51VG9IaWRlKCk7CiAgICAgICAgICAg ICB9CiAK