113406 2013-03-27 07:11:56 -0700 [Mac] Text track menu items sometimes labeled incorrectly 2013-03-27 11:32:10 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson dino feature-media-reviews jer.noble webkit-bug-importer webkit.review.bot oldest_to_newest 864506 0 eric.carlson 2013-03-27 07:11:56 -0700 Text track menu items with both 'label' and 'srclang' attributes are not correct. 864514 1 195311 eric.carlson 2013-03-27 07:15:37 -0700 Created attachment 195311 Proposed patch 864515 2 webkit-bug-importer 2013-03-27 07:15:58 -0700 <rdar://problem/13515337> 864633 3 195311 jer.noble 2013-03-27 09:48:22 -0700 Comment on attachment 195311 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=195311&action=review r+, with nit: > Source/WebCore/page/CaptionUserPreferencesMac.mm:541 > + if (language.isEmpty() || label.contains(language)) { > + displayName.append(label); > + } else { Unnecessary braces. 864732 4 eric.carlson 2013-03-27 11:32:03 -0700 https://trac.webkit.org/r147000 195311 2013-03-27 07:15:37 -0700 2013-03-27 11:32:10 -0700 Proposed patch patch_1.txt text/plain 5341 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0Njk3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAzLTI3ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIFRleHQgdHJh Y2sgbWVudSBpdGVtcyBzb21ldGltZXMgbGFiZWxlZCBpbmNvcnJlY3RseQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNDA2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbWVkaWEvdmlkZW8tY29udHJvbHMt Y2FwdGlvbnMtdHJhY2ttZW51LWxvY2FsaXplZC5odG1sIHdhcyB1cGRhdGVkIHRvIHRlc3QgdGhp cy4KKworICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYy5tbToKKyAgICAg ICAgKFdlYkNvcmU6OnRyYWNrRGlzcGxheU5hbWUpOiBVc2UgdGhlICdsYWJlbCcgYXR0cmlidXRl IGZvciB0aGUgbWVudSB0ZXh0IHdoZW4gbmVjZXNzYXJ5LgorCiAyMDEzLTAzLTI3ICBLZW50IFRh bXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW5hbWUgSFRNTEZvcm1Db250 cm9sRWxlbWVudDo6cmVhZE9ubHkgdG8gaXNSZWFkT25seQpJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYy5tbQkocmV2aXNpb24gMTQ2NzMw KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC01MzYsNyArNTM2LDkgQEAgc3RhdGljIFN0cmluZyB0cmFja0Rpc3Bs YXlOYW1lKFRleHRUcmFjawogICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gbGFuZ3VhZ2VDRihB ZG9wdENGLCBDRkxvY2FsZUNvcHlEaXNwbGF5TmFtZUZvclByb3BlcnR5VmFsdWUoY3VycmVudExv Y2FsZS5nZXQoKSwga0NGTG9jYWxlTGFuZ3VhZ2VDb2RlLCBsb2NhbGVJZGVudGlmaWVyLmdldCgp KSk7CiAgICAgU3RyaW5nIGxhbmd1YWdlID0gbGFuZ3VhZ2VDRi5nZXQoKTsKICAgICBpZiAoIWxh YmVsLmlzRW1wdHkoKSkgewotICAgICAgICBpZiAoIWxhbmd1YWdlLmlzRW1wdHkoKSAmJiAhbGFi ZWwuY29udGFpbnMobGFuZ3VhZ2UpKSB7CisgICAgICAgIGlmIChsYW5ndWFnZS5pc0VtcHR5KCkg fHwgbGFiZWwuY29udGFpbnMobGFuZ3VhZ2UpKSB7CisgICAgICAgICAgICBkaXNwbGF5TmFtZS5h cHBlbmQobGFiZWwpOworICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgUmV0YWluUHRyPENG RGljdGlvbmFyeVJlZj4gbG9jYWxlRGljdChBZG9wdENGLCBDRkxvY2FsZUNyZWF0ZUNvbXBvbmVu dHNGcm9tTG9jYWxlSWRlbnRpZmllcihrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBsb2NhbGVJZGVudGlm aWVyLmdldCgpKSk7CiAgICAgICAgICAgICBpZiAobG9jYWxlRGljdCkgewogICAgICAgICAgICAg ICAgIENGU3RyaW5nUmVmIGNvdW50cnlDb2RlID0gMDsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0Njk3 OCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEz IEBACisyMDEzLTAzLTI3ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgor CisgICAgICAgIFtNYWNdIFRleHQgdHJhY2sgbWVudSBpdGVtcyBzb21ldGltZXMgbGFiZWxlZCBp bmNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTEzNDA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBtZWRpYS92aWRlby1jb250cm9scy1jYXB0aW9ucy10cmFja21lbnUtbG9jYWxpemVkLmh0 bWw6CisgICAgICAgICogcGxhdGZvcm0vbWFjL21lZGlhL3ZpZGVvLWNvbnRyb2xzLWNhcHRpb25z LXRyYWNrbWVudS1sb2NhbGl6ZWQtZXhwZWN0ZWQudHh0OgorCiAyMDEzLTAzLTI3ICBTZW9ranUg S3dvbiAgPHNlb2tqdS5rd29uQGdtYWlsLmNvbT4KIAogICAgICAgICBbRUZMXSBSZW1vdmUgYSBk dXBsaWNhdGVkIHRlc3QgZnJvbSBUZXN0RXhwZWN0YXRpb25zCkluZGV4OiBMYXlvdXRUZXN0cy9t ZWRpYS92aWRlby1jb250cm9scy1jYXB0aW9ucy10cmFja21lbnUtbG9jYWxpemVkLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtY2FwdGlvbnMtdHJh Y2ttZW51LWxvY2FsaXplZC5odG1sCShyZXZpc2lvbiAxNDY3MzApCisrKyBMYXlvdXRUZXN0cy9t ZWRpYS92aWRlby1jb250cm9scy1jYXB0aW9ucy10cmFja21lbnUtbG9jYWxpemVkLmh0bWwJKHdv cmtpbmcgY29weSkKQEAgLTQ0LDEyICs0NCwxMiBAQAogICAgICAgICAgICAgdGVzdEV4cGVjdGVk KCJpdGVtLnRleHRDb250ZW50IiwgIkVuZ2xpc2ggQ0MiKTsKIAogICAgICAgICAgICAgaXRlbSA9 IGNhcHRpb25zRW50cmllc1syXTsKLSAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPlRoaXJk IGl0ZW0gaW4gY2FwdGlvbnMgbWVudSBzaG91bGQgYmUgbGFiZWxsZWQgJ1Vua25vd24gU0RIJyIp OwotICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJpdGVtLnRleHRDb250ZW50IiwgIlVua25vd24g U0RIIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj5UaGlyZCBpdGVtIGluIGNhcHRp b25zIG1lbnUgc2hvdWxkIGJlIGxhYmVsbGVkICdMYXVnaCBUcmFjayAoRW5nbGlzaC1Vbml0ZWQg U3RhdGVzKSciKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiaXRlbS50ZXh0Q29udGVudCIs ICJMYXVnaCBUcmFjayAoRW5nbGlzaC1Vbml0ZWQgU3RhdGVzKSIpOwogCiAgICAgICAgICAgICBp dGVtID0gY2FwdGlvbnNFbnRyaWVzWzNdOwotICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+ Rm91cnRoIGl0ZW0gaW4gY2FwdGlvbnMgbWVudSBzaG91bGQgYmUgbGFiZWxsZWQgJ1Vua25vd24n Iik7Ci0gICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoIml0ZW0udGV4dENvbnRlbnQiLCAiVW5rbm93 biIpOworICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+Rm91cnRoIGl0ZW0gaW4gY2FwdGlv bnMgbWVudSBzaG91bGQgYmUgbGFiZWxsZWQgJ1Vua25vd24gU0RIJyIpOworICAgICAgICAgICAg dGVzdEV4cGVjdGVkKCJpdGVtLnRleHRDb250ZW50IiwgIlVua25vd24gU0RIIik7CiAKICAgICAg ICAgICAgIGVuZFRlc3QoKTsKICAgICAgICAgfQpAQCAtNjcsNyArNjcsNyBAQAogICAgICAgICA8 cD5UZXN0IHRoYXQgY2FwdGlvbnMgYW5kIHN1YnRpdGxlcyBtZW51IGl0ZW1zIGFyZSBsb2NhbGl6 ZWQuPC9wPgogICAgICAgICA8dmlkZW8gd2lkdGg9IjUwMCIgaGVpZ2h0PSIzMDAiIGNvbnRyb2xz PgogICAgICAgICAgICAgPHRyYWNrIGtpbmQ9ImNhcHRpb25zIiBzcmM9InRyYWNrL2NhcHRpb25z LXdlYnZ0dC9jYXB0aW9ucy1mYXN0LnZ0dCI+Ci0gICAgICAgICAgICA8dHJhY2sga2luZD0ic3Vi dGl0bGVzIiBzcmM9InRyYWNrL2NhcHRpb25zLXdlYnZ0dC9jYXB0aW9ucy1mYXN0LnZ0dCI+Cisg ICAgICAgICAgICA8dHJhY2sga2luZD0ic3VidGl0bGVzIiBzcmM9InRyYWNrL2NhcHRpb25zLXdl YnZ0dC9jYXB0aW9ucy1mYXN0LnZ0dCIgbGFiZWw9IkxhdWdoIFRyYWNrIiBzcmNsYW5nPSJlbi1V UyI+CiAgICAgICAgIDwvdmlkZW8+CiAgICAgPC9ib2R5PgogPC9odG1sPgpJbmRleDogTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL21lZGlhL3ZpZGVvLWNvbnRyb2xzLWNhcHRpb25zLXRyYWNrbWVu dS1sb2NhbGl6ZWQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRm b3JtL21hYy9tZWRpYS92aWRlby1jb250cm9scy1jYXB0aW9ucy10cmFja21lbnUtbG9jYWxpemVk LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTQ2NzMwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL21lZGlhL3ZpZGVvLWNvbnRyb2xzLWNhcHRpb25zLXRyYWNrbWVudS1sb2NhbGl6ZWQtZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xMSwxMiArMTEsMTIgQEAgRmlyc3QgaXRlbSBp biBjYXB0aW9ucyBtZW51IHNob3VsZCBiZSBsYQogRVhQRUNURUQgKGl0ZW0udGV4dENvbnRlbnQg PT0gJ09mZicpIE9LCiAKIFNlY29uZCBpdGVtIGluIGNhcHRpb25zIG1lbnUgc2hvdWxkIGJlIGxh YmVsbGVkICdFbmdsaXNoIENDJwotRVhQRUNURUQgKGl0ZW0udGV4dENvbnRlbnQgPT0gJ0VuZ2xp c2ggQ0MnKSwgT0JTRVJWRUQgJ1Vua25vd24gU0RIJyBGQUlMCitFWFBFQ1RFRCAoaXRlbS50ZXh0 Q29udGVudCA9PSAnRW5nbGlzaCBDQycpLCBPQlNFUlZFRCAnTGF1Z2ggVHJhY2sgKEVuZ2xpc2gt VW5pdGVkIFN0YXRlcyknIEZBSUwKIAotVGhpcmQgaXRlbSBpbiBjYXB0aW9ucyBtZW51IHNob3Vs ZCBiZSBsYWJlbGxlZCAnVW5rbm93biBTREgnCi1FWFBFQ1RFRCAoaXRlbS50ZXh0Q29udGVudCA9 PSAnVW5rbm93biBTREgnKSwgT0JTRVJWRUQgJ1Vua25vd24nIEZBSUwKK1RoaXJkIGl0ZW0gaW4g Y2FwdGlvbnMgbWVudSBzaG91bGQgYmUgbGFiZWxsZWQgJ0xhdWdoIFRyYWNrIChFbmdsaXNoLVVu aXRlZCBTdGF0ZXMpJworRVhQRUNURUQgKGl0ZW0udGV4dENvbnRlbnQgPT0gJ0xhdWdoIFRyYWNr IChFbmdsaXNoLVVuaXRlZCBTdGF0ZXMpJyksIE9CU0VSVkVEICdVbmtub3duIFNESCcgRkFJTAog Ci1Gb3VydGggaXRlbSBpbiBjYXB0aW9ucyBtZW51IHNob3VsZCBiZSBsYWJlbGxlZCAnVW5rbm93 bicKK0ZvdXJ0aCBpdGVtIGluIGNhcHRpb25zIG1lbnUgc2hvdWxkIGJlIGxhYmVsbGVkICdVbmtu b3duIFNESCcKIFR5cGVFcnJvcjogJ3VuZGVmaW5lZCcgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVh dGluZyAnaXRlbS50ZXh0Q29udGVudCcpCiBFTkQgT0YgVEVTVAogCg==