82906 2012-04-02 08:56:35 -0700 Suppress HTMLMediaElement's text track code when !webkitVideoTrackEnabled() 2012-04-02 10:16:24 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 fischman fischman annacc eric.carlson vcarbune webkit.review.bot oldest_to_newest 593506 0 fischman 2012-04-02 08:56:35 -0700 HTMLMediaElement used to double-guard text track code with both an ENABLE(VIDEO_TRACK) and a RuntimeEnabledFeatures::webkitVideoTrackEnabled() check. But various more-recent CLs (99984, 100064, 102968, 107831, 108241) appear to only use the ENABLE check, effectively turning on a bunch of text track code (visible e.g. with --webcore-log-channels=Media in chromium). 593507 1 135111 fischman 2012-04-02 08:57:46 -0700 Created attachment 135111 Patch 593568 2 135111 webkit.review.bot 2012-04-02 10:16:19 -0700 Comment on attachment 135111 Patch Clearing flags on attachment: 135111 Committed r112900: <http://trac.webkit.org/changeset/112900> 593569 3 webkit.review.bot 2012-04-02 10:16:24 -0700 All reviewed patches have been landed. Closing bug. 135111 2012-04-02 08:57:46 -0700 2012-04-02 10:16:19 -0700 Patch bug-82906-20120402085745.patch text/plain 5317 fischman U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTJhNTZkYjg4MzdhNmFm OGI3YmM4NTNhMGUwYWM0OWUzYTBiOGMxNi4uNjk0ZjMzNjkwMmZkZjBjMTUyOTcwZDQ4NTAxYzI4 OWFiMDkxMWJmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTAyICBBbWkg RmlzY2htYW4gIDxmaXNjaG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU3VwcHJlc3MgSFRN TE1lZGlhRWxlbWVudCdzIHRleHQgdHJhY2sgY29kZSB3aGVuICF3ZWJraXRWaWRlb1RyYWNrRW5h YmxlZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 MjkwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVs ZW1lbnQ6OnNjaGVkdWxlTG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50 Ojpsb2FkVGltZXJGaXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpw cmVwYXJlRm9yTG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpsb2Fk SW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0UmVhZHlT dGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpwbGF5YmFja1Byb2dy ZXNzVGltZXJGaXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRp YVBsYXllclRpbWVDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6 OnVzZXJDYW5jZWxsZWRMb2FkKToKKwogMjAxMi0wMy0yOCAgR2F2aW4gQmFycmFjbG91Z2ggIDxi YXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgWWFycjogaWYgd2UncmUgbm90IHVzaW5n IHRoZSBvdXRwdXQgYXJyYXksIGRvbid0IHBvcHVsYXRlIGl0IQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggOWM3ZjNjZWVkZWRmOTE4NjRjYTk0NzE1ZDk2ZTE3 NmVjMTBlYmQ2Ni4uZDY4N2UwYWExMDdkNjYwOTdlODBkYzdiNjU0NzBhMTg3ZjEyYjU1MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC01MjcsNyArNTI3LDcg QEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzY2hlZHVsZUxvYWQoTG9hZFR5cGUgbG9hZFR5cGUp CiAgICAgfQogCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQotICAgIGlmIChsb2FkVHlwZSAmIFRl eHRUcmFja1Jlc291cmNlKQorICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjp3ZWJraXRW aWRlb1RyYWNrRW5hYmxlZCgpICYmIChsb2FkVHlwZSAmIFRleHRUcmFja1Jlc291cmNlKSkKICAg ICAgICAgbV9wZW5kaW5nTG9hZEZsYWdzIHw9IFRleHRUcmFja1Jlc291cmNlOwogI2VuZGlmCiAK QEAgLTU1OCw3ICs1NTgsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmxvYWRUaW1lckZpcmVk KFRpbWVyPEhUTUxNZWRpYUVsZW1lbnQ+KikKICAgICBSZWZQdHI8SFRNTE1lZGlhRWxlbWVudD4g cHJvdGVjdCh0aGlzKTsgLy8gbG9hZE5leHRTb3VyY2VDaGlsZCBtYXkgZmlyZSAnYmVmb3JlbG9h ZCcsIHdoaWNoIGNhbiBtYWtlIGFyYml0cmFyeSBET00gbXV0YXRpb25zLgogCiAjaWYgRU5BQkxF KFZJREVPX1RSQUNLKQotICAgIGlmIChtX3BlbmRpbmdMb2FkRmxhZ3MgJiBUZXh0VHJhY2tSZXNv dXJjZSkKKyAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6d2Via2l0VmlkZW9UcmFja0Vu YWJsZWQoKSAmJiAobV9wZW5kaW5nTG9hZEZsYWdzICYgVGV4dFRyYWNrUmVzb3VyY2UpKQogICAg ICAgICBjb25maWd1cmVOZXdUZXh0VHJhY2tzKCk7CiAjZW5kaWYKIApAQCAtNjgyLDcgKzY4Miw4 IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cHJlcGFyZUZvckxvYWQoKQogICAgICAgICBzY2hl ZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS5lbXB0aWVkRXZlbnQpOwogICAgICAgICB1cGRhdGVNZWRp YUNvbnRyb2xsZXIoKTsKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCi0gICAgICAgIHVwZGF0ZUFj dGl2ZVRleHRUcmFja0N1ZXMoMCk7CisgICAgICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVz Ojp3ZWJraXRWaWRlb1RyYWNrRW5hYmxlZCgpKQorICAgICAgICAgICAgdXBkYXRlQWN0aXZlVGV4 dFRyYWNrQ3VlcygwKTsKICNlbmRpZgogICAgIH0KIApAQCAtNzQwLDEyICs3NDEsMTQgQEAgdm9p ZCBIVE1MTWVkaWFFbGVtZW50Ojpsb2FkSW50ZXJuYWwoKQogI2lmIEVOQUJMRShWSURFT19UUkFD SykKICAgICAvLyBIVE1MTWVkaWFFbGVtZW50Ojp0ZXh0VHJhY2tzQXJlUmVhZHkgd2lsbCBuZWVk ICIuLi4gdGhlIHRleHQgdHJhY2tzIHdob3NlIG1vZGUgd2FzIG5vdCBpbiB0aGUKICAgICAvLyBk aXNhYmxlZCBzdGF0ZSB3aGVuIHRoZSBlbGVtZW50J3MgcmVzb3VyY2Ugc2VsZWN0aW9uIGFsZ29y aXRobSBsYXN0IHN0YXJ0ZWQiLgotICAgIG1fdGV4dFRyYWNrc1doZW5SZXNvdXJjZVNlbGVjdGlv bkJlZ2FuLmNsZWFyKCk7Ci0gICAgaWYgKG1fdGV4dFRyYWNrcykgewotICAgICAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgbV90ZXh0VHJhY2tzLT5sZW5ndGgoKTsgKytpKSB7Ci0gICAgICAg ICAgICBUZXh0VHJhY2sqIHRyYWNrID0gbV90ZXh0VHJhY2tzLT5pdGVtKGkpOwotICAgICAgICAg ICAgaWYgKHRyYWNrLT5tb2RlKCkgIT0gVGV4dFRyYWNrOjpESVNBQkxFRCkKLSAgICAgICAgICAg ICAgICBtX3RleHRUcmFja3NXaGVuUmVzb3VyY2VTZWxlY3Rpb25CZWdhbi5hcHBlbmQodHJhY2sp OworICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjp3ZWJraXRWaWRlb1RyYWNrRW5hYmxl ZCgpKSB7CisgICAgICAgIG1fdGV4dFRyYWNrc1doZW5SZXNvdXJjZVNlbGVjdGlvbkJlZ2FuLmNs ZWFyKCk7CisgICAgICAgIGlmIChtX3RleHRUcmFja3MpIHsKKyAgICAgICAgICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBtX3RleHRUcmFja3MtPmxlbmd0aCgpOyArK2kpIHsKKyAgICAgICAg ICAgICAgICBUZXh0VHJhY2sqIHRyYWNrID0gbV90ZXh0VHJhY2tzLT5pdGVtKGkpOworICAgICAg ICAgICAgICAgIGlmICh0cmFjay0+bW9kZSgpICE9IFRleHRUcmFjazo6RElTQUJMRUQpCisgICAg ICAgICAgICAgICAgICAgIG1fdGV4dFRyYWNrc1doZW5SZXNvdXJjZVNlbGVjdGlvbkJlZ2FuLmFw cGVuZCh0cmFjayk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAjZW5kaWYKQEAg LTE1MzUsNyArMTUzOCw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0UmVhZHlTdGF0ZShN ZWRpYVBsYXllcjo6UmVhZHlTdGF0ZSBzdGF0ZSkKICAgICBSZWFkeVN0YXRlIG5ld1N0YXRlID0g c3RhdGljX2Nhc3Q8UmVhZHlTdGF0ZT4oc3RhdGUpOwogCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNL KQotICAgIGJvb2wgdHJhY2tzQXJlUmVhZHkgPSB0ZXh0VHJhY2tzQXJlUmVhZHkoKTsKKyAgICBi b29sIHRyYWNrc0FyZVJlYWR5ID0gIVJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OndlYmtpdFZpZGVv VHJhY2tFbmFibGVkKCkgfHwgdGV4dFRyYWNrc0FyZVJlYWR5KCk7CiAKICAgICBpZiAobmV3U3Rh dGUgPT0gb2xkU3RhdGUgJiYgbV90cmFja3NBcmVSZWFkeSA9PSB0cmFja3NBcmVSZWFkeSkKICAg ICAgICAgcmV0dXJuOwpAQCAtMTYzNiw3ICsxNjM5LDggQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50 OjpzZXRSZWFkeVN0YXRlKE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlIHN0YXRlKQogICAgIHVwZGF0 ZVBsYXlTdGF0ZSgpOwogICAgIHVwZGF0ZU1lZGlhQ29udHJvbGxlcigpOwogI2lmIEVOQUJMRShW SURFT19UUkFDSykKLSAgICB1cGRhdGVBY3RpdmVUZXh0VHJhY2tDdWVzKGN1cnJlbnRUaW1lKCkp OworICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjp3ZWJraXRWaWRlb1RyYWNrRW5hYmxl ZCgpKQorICAgICAgICB1cGRhdGVBY3RpdmVUZXh0VHJhY2tDdWVzKGN1cnJlbnRUaW1lKCkpOwog I2VuZGlmCiB9CiAKQEAgLTIzOTIsNyArMjM5Niw4IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 cGxheWJhY2tQcm9ncmVzc1RpbWVyRmlyZWQoVGltZXI8SFRNTE1lZGlhRWxlbWVudD4qKQogICAg ICAgICBtZWRpYUNvbnRyb2xzKCktPnBsYXliYWNrUHJvZ3Jlc3NlZCgpOwogICAgIAogI2lmIEVO QUJMRShWSURFT19UUkFDSykKLSAgICB1cGRhdGVBY3RpdmVUZXh0VHJhY2tDdWVzKGN1cnJlbnRU aW1lKCkpOworICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjp3ZWJraXRWaWRlb1RyYWNr RW5hYmxlZCgpKQorICAgICAgICB1cGRhdGVBY3RpdmVUZXh0VHJhY2tDdWVzKGN1cnJlbnRUaW1l KCkpOwogI2VuZGlmCiB9CiAKQEAgLTI5MzUsNyArMjk0MCw4IEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6bWVkaWFQbGF5ZXJUaW1lQ2hhbmdlZChNZWRpYVBsYXllciopCiAgICAgTE9HKE1lZGlh LCAiSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJUaW1lQ2hhbmdlZCIpOwogCiAjaWYgRU5B QkxFKFZJREVPX1RSQUNLKQotICAgIHVwZGF0ZUFjdGl2ZVRleHRUcmFja0N1ZXMoY3VycmVudFRp bWUoKSk7CisgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OndlYmtpdFZpZGVvVHJhY2tF bmFibGVkKCkpCisgICAgICAgIHVwZGF0ZUFjdGl2ZVRleHRUcmFja0N1ZXMoY3VycmVudFRpbWUo KSk7CiAjZW5kaWYKIAogICAgIGJlZ2luUHJvY2Vzc2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsK QEAgLTMzOTksNyArMzQwNSw4IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXNlckNhbmNlbGxl ZExvYWQoKQogICAgIG1fcmVhZHlTdGF0ZSA9IEhBVkVfTk9USElORzsKICAgICB1cGRhdGVNZWRp YUNvbnRyb2xsZXIoKTsKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCi0gICAgdXBkYXRlQWN0aXZl VGV4dFRyYWNrQ3VlcygwKTsKKyAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6d2Via2l0 VmlkZW9UcmFja0VuYWJsZWQoKSkKKyAgICAgICAgdXBkYXRlQWN0aXZlVGV4dFRyYWNrQ3Vlcygw KTsKICNlbmRpZgogfQogCg==