158573 2016-06-09 11:44:16 -0700 Don't show the caption menu if a video has only forced tracks 2016-06-09 14:29:08 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue oldest_to_newest 1200906 0 eric.carlson 2016-06-09 11:44:16 -0700 Forced caption tracks are not shown in the track menu, so we should not show the menu at all if a file has only forced tracks. 1200945 1 eric.carlson 2016-06-09 13:17:15 -0700 <rdar://problem/24632384> 1200970 2 280945 eric.carlson 2016-06-09 14:02:43 -0700 Created attachment 280945 Proposed patch 1200978 3 280945 commit-queue 2016-06-09 14:29:05 -0700 Comment on attachment 280945 Proposed patch Clearing flags on attachment: 280945 Committed r201883: <http://trac.webkit.org/changeset/201883> 1200979 4 commit-queue 2016-06-09 14:29:08 -0700 All reviewed patches have been landed. Closing bug. 280945 2016-06-09 14:02:43 -0700 2016-06-09 14:29:05 -0700 Proposed patch menu_only_forced_patch_2.txt text/plain 6387 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMTg4MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA2LTA5ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IHNob3cgdGhl IGNhcHRpb24gbWVudSBpZiBhIHZpZGVvIGhhcyBvbmx5IGZvcmNlZCB0cmFja3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODU3MworICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMjQ2MzIzODQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGVzdDogbWVkaWEvY29udHJvbHMvZm9yY2VkLXRyYWNrcy1vbmx5 Lmh0bWwKKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBw bGUuanM6CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS51cGRhdGVDYXB0aW9uQnV0dG9u KTogRG9uJ3Qgc2hvdyB0aGUgYnV0dG9uIG9mIHRoZXJlIGFyZSBubyB1c2VyLXNlbGVjdGFibGUK KyAgICAgICAgICB0ZXh0IG9yIGF1ZGlvIHRyYWNrcy4KKworICAgICAgICAqIHBhZ2UvQ2FwdGlv blVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FwdGlvblVz ZXJQcmVmZXJlbmNlc01lZGlhQUY6OnNvcnRlZFRyYWNrTGlzdEZvck1lbnUpOiBSZXR1cm4gYW4g ZW1wdHkgVmVjdG9yIGlmCisgICAgICAgICAgdGhlcmUgYXJlIG5vIHVzZXItc2VsZWN0YWJsZSB0 cmFja3MuCisKIDIwMTYtMDYtMDkgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAK ICAgICAgICAgUGFzcyB0aHJvdWdoIHBsYXkgc3RhdGUgYW5kIHRvZ2dsZSBzdGF0ZSB0byB0aGUg V2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qcwkocmV2 aXNpb24gMjAxODgwKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNBcHBsZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMTc0MSw3ICsxNzQxLDEwIEBA IENvbnRyb2xsZXIucHJvdG90eXBlID0gewogCiAgICAgdXBkYXRlQ2FwdGlvbkJ1dHRvbjogZnVu Y3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMudmlkZW8ud2Via2l0SGFzQ2xvc2VkQ2Fw dGlvbnMgfHwgdGhpcy52aWRlby5hdWRpb1RyYWNrcy5sZW5ndGggPiAxKQorICAgICAgICB2YXIg YXVkaW9UcmFja3MgPSB0aGlzLmhvc3Quc29ydGVkVHJhY2tMaXN0Rm9yTWVudSh0aGlzLnZpZGVv LmF1ZGlvVHJhY2tzKTsKKyAgICAgICAgdmFyIHRleHRUcmFja3MgPSB0aGlzLmhvc3Quc29ydGVk VHJhY2tMaXN0Rm9yTWVudSh0aGlzLnZpZGVvLnRleHRUcmFja3MpOworCisgICAgICAgIGlmICgo dGV4dFRyYWNrcyAmJiB0ZXh0VHJhY2tzLmxlbmd0aCkgfHwgKGF1ZGlvVHJhY2tzICYmIGF1ZGlv VHJhY2tzLmxlbmd0aCA+IDEpKQogICAgICAgICAgICAgdGhpcy5jb250cm9scy5jYXB0aW9uQnV0 dG9uLmNsYXNzTGlzdC5yZW1vdmUodGhpcy5DbGFzc05hbWVzLmhpZGRlbik7CiAgICAgICAgIGVs c2UKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMuY2FwdGlvbkJ1dHRvbi5jbGFzc0xpc3QuYWRk KHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0 aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAJKHJldmlzaW9uIDIwMTg4 MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NDQsNiArOTQ0LDkgQEAgVmVjdG9yPFJlZlB0cjxUZXh0 VHJhY2s+PiBDYXB0aW9uVXNlclByZQogICAgICAgICB9CiAgICAgfQogCisgICAgaWYgKHRyYWNr c0Zvck1lbnUuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gdHJhY2tzRm9yTWVudTsKKwogICAg IHN0ZDo6c29ydCh0cmFja3NGb3JNZW51LmJlZ2luKCksIHRyYWNrc0Zvck1lbnUuZW5kKCksIHRl eHRUcmFja0NvbXBhcmUpOwogCiAgICAgdHJhY2tzRm9yTWVudS5pbnNlcnQoMCwgVGV4dFRyYWNr OjpjYXB0aW9uTWVudU9mZkl0ZW0oKSk7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMDE4ODApCisrKyBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAx Ni0wNi0wOSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAg ICBEb24ndCBzaG93IHRoZSBjYXB0aW9uIG1lbnUgaWYgYSB2aWRlbyBoYXMgb25seSBmb3JjZWQg dHJhY2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTg1NzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI0NjMyMzg0PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbWVkaWEvY29udHJvbHMvZm9yY2Vk LXRyYWNrcy1vbmx5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvY29udHJv bHMvZm9yY2VkLXRyYWNrcy1vbmx5Lmh0bWw6IEFkZGVkLgorCiAyMDE2LTA2LTA5ICBDaHJpcyBE dW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgV29ya2VyR2xvYmFsU2NvcGUgYXR0 cmlidXRlcyAvIG9wZXJhdGlvbnMgc2hvdWxkIGJlIG9uIHRoZSBwcm90b3R5cGUKSW5kZXg6IExh eW91dFRlc3RzL21lZGlhL2NvbnRyb2xzL2ZvcmNlZC10cmFja3Mtb25seS1leHBlY3RlZC50eHQK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMvZm9yY2VkLXRyYWNrcy1v bmx5LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL21lZGlhL2NvbnRy b2xzL2ZvcmNlZC10cmFja3Mtb25seS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAs MCArMSwxNSBAQAorVGhpcyB2ZXJpZmllcyB0aGF0IHRoZSB0cmFjayBtZW51IGlzIG5vdCB2aXNp YmxlIHdoZW4gYSBmaWxlIGhhcyBvbmx5IGZvcmNlZCB0cmFja3MuCisKK1RoaXMgdGVzdCBvbmx5 IHJ1bnMgaW4gRFJUIQorCisKK0VWRU5UOiBjYW5wbGF5dGhyb3VnaAorUEFTUzogV2UgYXJlIHVz aW5nIHRoZSBhcHBsZSBpZGlvbQorUEFTUzogQWxsIHRleHQgdHJhY2tzIGFjY291bnRlZCBmb3IK K1BBU1M6IFRleHQgdHJhY2sgMSBub3QgdmlzaWJsZQorUEFTUzogVGV4dCB0cmFjayAyIG5vdCB2 aXNpYmxlCitQQVNTOiBNZW51IG5hbWUgaXMgJ1RyYWNrIE1lbnUnCitQQVNTOiBNZW51IGRvZXMg bm90IGV4aXN0CisKK1Rlc3RpbmcgZmluaXNoZWQuCisKSW5kZXg6IExheW91dFRlc3RzL21lZGlh L2NvbnRyb2xzL2ZvcmNlZC10cmFja3Mtb25seS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL21lZGlhL2NvbnRyb2xzL2ZvcmNlZC10cmFja3Mtb25seS5odG1sCShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMvZm9yY2VkLXRyYWNrcy1vbmx5Lmh0bWwJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSw1OSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAg ICA8aGVhZD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uL3ZpZGVvLXRlc3QuanMiPjwvc2NyaXB0 PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vbWVkaWEtZmlsZS5qcyI+PC9zY3JpcHQ+CisgICAg ICAgIDxzY3JpcHQgc3JjPSIuLi90cmFja21lbnUtdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgICAg IDxzY3JpcHQgc3JjPSIuLi9tZWRpYS1jb250cm9scy5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxz Y3JpcHQgc3JjPSJjb250cm9scy10ZXN0LWhlbHBlcnMuanMiPjwvc2NyaXB0PgorICAgICAgICA8 c2NyaXB0PgorICAgICAgICAgICAgdmFyIHRlc3RlciA9IG5ldyBDb250cm9sc1Rlc3QoKQorICAg ICAgICAgICAgICAgIC53aGVuUmVhZHkodGVzdFNldHVwKQorICAgICAgICAgICAgICAgIC5zdGFy dCgpOworCisgICAgICAgICAgICBmdW5jdGlvbiB0ZXN0U2V0dXAoKQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKKworICAgICAgICAgICAgICAgIHZh ciBjdXJyZW50U3RhdGUgPSB0ZXN0ZXIuY3VycmVudFN0YXRlOworICAgICAgICAgICAgICAgIHRl c3Rlci50ZXN0KCJXZSBhcmUgdXNpbmcgdGhlIGFwcGxlIGlkaW9tIikKKyAgICAgICAgICAgICAg ICAgICAgLnZhbHVlKGN1cnJlbnRTdGF0ZS5pZGlvbSkKKyAgICAgICAgICAgICAgICAgICAgLmlz RXF1YWxUbygiYXBwbGUiKTsKKworICAgICAgICAgICAgICAgIHRlc3Rlci50ZXN0KCJBbGwgdGV4 dCB0cmFja3MgYWNjb3VudGVkIGZvciIpCisgICAgICAgICAgICAgICAgICAgIC52YWx1ZSh0ZXN0 ZXIudmlkZW8udGV4dFRyYWNrcy5sZW5ndGgpCisgICAgICAgICAgICAgICAgICAgIC5pc0VxdWFs VG8oIjIiKTsKKworICAgICAgICAgICAgICAgIHRlc3Rlci50ZXN0KCJUZXh0IHRyYWNrIDEgbm90 IHZpc2libGUiKQorICAgICAgICAgICAgICAgICAgICAudmFsdWUodGVzdGVyLnZpZGVvLnRleHRU cmFja3NbMF0ubW9kZSkKKyAgICAgICAgICAgICAgICAgICAgLmlzRXF1YWxUbygiZGlzYWJsZWQi KTsKKworICAgICAgICAgICAgICAgIHRlc3Rlci50ZXN0KCJUZXh0IHRyYWNrIDIgbm90IHZpc2li bGUiKQorICAgICAgICAgICAgICAgICAgICAudmFsdWUodGVzdGVyLnZpZGVvLnRleHRUcmFja3Nb MV0ubW9kZSkKKyAgICAgICAgICAgICAgICAgICAgLmlzRXF1YWxUbygiZGlzYWJsZWQiKTsKKwor ICAgICAgICAgICAgICAgIHZhciBzdGF0dXNTdGF0ZSA9IHRlc3Rlci5zdGF0ZUZvckNvbnRyb2xz RWxlbWVudCgiVHJhY2sgTWVudSIsIHRydWUpOworCisgICAgICAgICAgICAgICAgdGVzdGVyLnRl c3QoIk1lbnUgbmFtZSBpcyAnVHJhY2sgTWVudSciKQorICAgICAgICAgICAgICAgICAgICAudmFs dWUoc3RhdHVzU3RhdGUubmFtZSkKKyAgICAgICAgICAgICAgICAgICAgLmlzRXF1YWxUbygiVHJh Y2sgTWVudSIpOworCisgICAgICAgICAgICAgICAgdmFyIGNhcHRpb25NZW51ID0gZ2V0VHJhY2tM aXN0RWxlbWVudCgpOworICAgICAgICAgICAgICAgIHRlc3Rlci50ZXN0KCJNZW51IGRvZXMgbm90 IGV4aXN0IikKKyAgICAgICAgICAgICAgICAgICAgLnZhbHVlKGNhcHRpb25NZW51KQorICAgICAg ICAgICAgICAgICAgICAuaXNFcXVhbFRvKG51bGwpOworCisgICAgICAgICAgICAgICAgdGVzdGVy LmVuZCgpOworICAgICAgICAgICAgfQorCisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4K KyAgICA8Ym9keT4KKyAgICAgICAgPHA+VGhpcyB2ZXJpZmllcyB0aGF0IHRoZSB0cmFjayBtZW51 IGlzIG5vdCB2aXNpYmxlIHdoZW4gYSBmaWxlIGhhcyBvbmx5IGZvcmNlZCB0cmFja3MuPC9wPgor ICAgICAgICA8cD5UaGlzIHRlc3Qgb25seSBydW5zIGluIERSVCE8L3A+CisgICAgICAgIDx2aWRl byB3aWR0aD0iNTAwIiBoZWlnaHQ9IjMwMCIgY29udHJvbHM+CisgICAgICAgICAgICA8dHJhY2sg bGFiZWw9InoiIGtpbmQ9ImZvcmNlZCIgc3JjPSJ0cmFjay9jYXB0aW9ucy13ZWJ2dHQvY2FwdGlv bnMtZmFzdC52dHQiIHNyY2xhbmc9ImphIj4KKyAgICAgICAgICAgIDx0cmFjayBsYWJlbD0ieSIg a2luZD0iZm9yY2VkIiBzcmM9InRyYWNrL2NhcHRpb25zLXdlYnZ0dC9jYXB0aW9ucy1mYXN0LnZ0 dCIgc3JjbGFuZz0iZW4tYXUiPgorICAgICAgICA8L3ZpZGVvPgorICAgIDwvYm9keT4KKzwvaHRt bD4K