80873 2012-03-12 13:02:31 -0700 Removing HTMLTrackElement does not delete TextTrack 2012-03-21 11:29:35 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 43668 1 eric.carlson eric.carlson vcarbune webkit-bug-importer oldest_to_newest 576422 0 eric.carlson 2012-03-12 13:02:31 -0700 r105434 introduced a bug which causes a HTMLTrackElement's TextTrack to not be removed from the HTMLMediaElement's tracks collection. 576428 1 webkit-bug-importer 2012-03-12 13:03:49 -0700 <rdar://problem/11031795> 576512 2 131408 eric.carlson 2012-03-12 14:19:52 -0700 Created attachment 131408 Proposed patch 578641 3 vcarbune 2012-03-14 12:23:39 -0700 I believe I can't review+ it, but nice catch and the patch looks good to me. 583047 4 131408 koivisto 2012-03-20 07:21:03 -0700 Comment on attachment 131408 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=131408&action=review r=me > Source/WebCore/html/HTMLMediaElement.h:208 > virtual void trackWasAdded(HTMLTrackElement*); > - virtual void trackWasRemoved(HTMLTrackElement*); > + virtual void trackWillBeRemoved(HTMLTrackElement*); I think the usual naming pattern is didAddTrack/willRemoveTrack 584404 5 eric.carlson 2012-03-21 11:29:35 -0700 http://trac.webkit.org/changeset/111581 131408 2012-03-12 14:19:52 -0700 2012-03-20 07:21:03 -0700 Proposed patch add_remove_track_8.txt text/plain 7120 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMDQ2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAzLTEyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92aW5nIEhUTUxU cmFja0VsZW1lbnQgZG9lcyBub3QgZGVsZXRlIFRleHRUcmFjaworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA4NzMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGJ1dCBtZWRpYS90cmFj ay90cmFjay1sYW5ndWFnZS1wcmVmZXJlbmNlLmh0bWwgaGFzIGJlZW4gdXBkYXRlZAorICAgICAg ICB0byB0ZXN0IHRoaXMgZml4LgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnRyYWNrV2lsbEJlUmVtb3Zl ZCk6IFJlbmFtZWQgZnJvbSB0cmFja1dhc1JlbW92ZWQgYmVjYXVzZSBpdCBpcworICAgICAgICBj YWxsZWQgYmVmb3JlIHRoZSB0cmFjayBpcyByZW1vdmVkLCB0byBhbGxvdyB0aGUgVGV4dFRyYWNr IHRvIGJlIHJlbW92ZWQuCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisKKyAg ICAgICAgKiBodG1sL0hUTUxUcmFja0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRN TFRyYWNrRWxlbWVudDo6aW5zZXJ0ZWRJbnRvVHJlZSk6IFJlbmFtZWQgZnJvbSBpbnNlcnRlZElu dG9Eb2N1bWVudAorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyYWNrRWxlbWVudDo6d2lsbFJlbW92 ZSk6IFJlbmFtZWQgZnJvbSByZW1vdmVkRnJvbURvY3VtZW50LgorICAgICAgICAqIGh0bWwvSFRN TFRyYWNrRWxlbWVudC5oOgorCisgICAgICAgICogaHRtbC90cmFjay9Mb2FkYWJsZVRleHRUcmFj ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMb2FkYWJsZVRleHRUcmFjazo6dHJhY2tFbGVtZW50 SW5kZXgpOiBEb24ndCBpbmNsdWRlIHRyYWNrcyB0aGF0IGFyZSBub3QgaW4gdGhlCisgICAgICAg IGRvY3VtZW50IGluIHRoZSBjYWxjdWFsdGlvbi4KKwogMjAxMi0wMy0xMiAgQWRhbSBLbGVpbiAg PGFkYW1rQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbTXV0YXRpb25PYnNlcnZlcnNdIEVuZm9y Y2UgYSBjb25zaXN0ZW50IG9yZGVyIG9mIE11dGF0aW9uUmVjb3JkIGRlbGl2ZXJ5CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDExMDQ1NCkK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI1MTMsNyArMjUxMyw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dHJhY2tXYXNB ZGRlZChIVE0KICAgICAgICAgc2NoZWR1bGVMb2FkKFRleHRUcmFja1Jlc291cmNlKTsKIH0KIAot dm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp0cmFja1dhc1JlbW92ZWQoSFRNTFRyYWNrRWxlbWVudCog dHJhY2tFbGVtZW50KQordm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp0cmFja1dpbGxCZVJlbW92ZWQo SFRNTFRyYWNrRWxlbWVudCogdHJhY2tFbGVtZW50KQogewogICAgIEFTU0VSVCh0cmFja0VsZW1l bnQtPmhhc1RhZ05hbWUodHJhY2tUYWcpKTsKIApAQCAtMjUyMyw3ICsyNTIzLDcgQEAgdm9pZCBI VE1MTWVkaWFFbGVtZW50Ojp0cmFja1dhc1JlbW92ZWQoSAogI2lmICFMT0dfRElTQUJMRUQKICAg ICBpZiAodHJhY2tFbGVtZW50LT5oYXNUYWdOYW1lKHRyYWNrVGFnKSkgewogICAgICAgICBLVVJM IHVybCA9IHRyYWNrRWxlbWVudC0+Z2V0Tm9uRW1wdHlVUkxBdHRyaWJ1dGUoc3JjQXR0cik7Ci0g ICAgICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnRyYWNrV2FzUmVtb3ZlZCAtICdz cmMnIGlzICVzIiwgdXJsRm9yTG9nZ2luZyh1cmwpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBM T0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50Ojp0cmFja1dpbGxCZVJlbW92ZWQgLSAnc3JjJyBp cyAlcyIsIHVybEZvckxvZ2dpbmcodXJsKS51dGY4KCkuZGF0YSgpKTsKICAgICB9CiAjZW5kaWYK IApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgJKHJldmlzaW9uIDEx MDQ1NCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCSh3b3JraW5n IGNvcHkpCkBAIC0yMDUsNyArMjA1LDcgQEAgcHVibGljOgogICAgIEN1ZUxpc3QgY3VycmVudGx5 QWN0aXZlQ3VlcygpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudGx5QWN0aXZlQ3VlczsgfQogCiAg ICAgdmlydHVhbCB2b2lkIHRyYWNrV2FzQWRkZWQoSFRNTFRyYWNrRWxlbWVudCopOwotICAgIHZp cnR1YWwgdm9pZCB0cmFja1dhc1JlbW92ZWQoSFRNTFRyYWNrRWxlbWVudCopOworICAgIHZpcnR1 YWwgdm9pZCB0cmFja1dpbGxCZVJlbW92ZWQoSFRNTFRyYWNrRWxlbWVudCopOwogCiAgICAgc3Ry dWN0IFRyYWNrR3JvdXAgewogICAgICAgICBlbnVtIEdyb3VwS2luZCB7IENhcHRpb25zQW5kU3Vi dGl0bGVzLCBEZXNjcmlwdGlvbiwgQ2hhcHRlciwgTWV0YWRhdGEsIE90aGVyIH07CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUcmFja0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRyYWNrRWxlbWVudC5jcHAJKHJldmlzaW9uIDExMDQ1NCkK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRyYWNrRWxlbWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTcyLDIwICs3MiwyMCBAQCBQYXNzUmVmUHRyPEhUTUxUcmFja0VsZW1lbnQ+IEhUTUxU cmFja0VsCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBIVE1MVHJhY2tFbGVtZW50KHRhZ05hbWUs IGRvY3VtZW50KSk7CiB9CiAKLXZvaWQgSFRNTFRyYWNrRWxlbWVudDo6aW5zZXJ0ZWRJbnRvRG9j dW1lbnQoKQordm9pZCBIVE1MVHJhY2tFbGVtZW50OjppbnNlcnRlZEludG9UcmVlKGJvb2wgZGVl cCkKIHsKLSAgICBIVE1MRWxlbWVudDo6aW5zZXJ0ZWRJbnRvRG9jdW1lbnQoKTsKKyAgICBIVE1M RWxlbWVudDo6aW5zZXJ0ZWRJbnRvVHJlZShkZWVwKTsKIAogICAgIGlmIChIVE1MTWVkaWFFbGVt ZW50KiBwYXJlbnQgPSBtZWRpYUVsZW1lbnQoKSkKICAgICAgICAgcGFyZW50LT50cmFja1dhc0Fk ZGVkKHRoaXMpOwogfQogCi12b2lkIEhUTUxUcmFja0VsZW1lbnQ6OnJlbW92ZWRGcm9tRG9jdW1l bnQoKQordm9pZCBIVE1MVHJhY2tFbGVtZW50Ojp3aWxsUmVtb3ZlKCkKIHsKICAgICBpZiAoSFRN TE1lZGlhRWxlbWVudCogcGFyZW50ID0gbWVkaWFFbGVtZW50KCkpCi0gICAgICAgIHBhcmVudC0+ dHJhY2tXYXNSZW1vdmVkKHRoaXMpOworICAgICAgICBwYXJlbnQtPnRyYWNrV2lsbEJlUmVtb3Zl ZCh0aGlzKTsKIAotICAgIEhUTUxFbGVtZW50OjpyZW1vdmVkRnJvbURvY3VtZW50KCk7CisgICAg SFRNTEVsZW1lbnQ6OndpbGxSZW1vdmUoKTsKIH0KIAogdm9pZCBIVE1MVHJhY2tFbGVtZW50Ojpw YXJzZUF0dHJpYnV0ZShBdHRyaWJ1dGUqIGF0dHJpYnV0ZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFRyYWNrRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFRyYWNrRWxlbWVudC5oCShyZXZpc2lvbiAxMTA0NTQpCisrKyBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxUcmFja0VsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNzcsOCArNzcsOCBA QCBwcml2YXRlOgogCiAgICAgdmlydHVhbCB2b2lkIHBhcnNlQXR0cmlidXRlKEF0dHJpYnV0ZSop IE9WRVJSSURFOwogCi0gICAgdmlydHVhbCB2b2lkIGluc2VydGVkSW50b0RvY3VtZW50KCkgT1ZF UlJJREU7Ci0gICAgdmlydHVhbCB2b2lkIHJlbW92ZWRGcm9tRG9jdW1lbnQoKSBPVkVSUklERTsK KyAgICB2aXJ0dWFsIHZvaWQgaW5zZXJ0ZWRJbnRvVHJlZShib29sKSBPVkVSUklERTsKKyAgICB2 aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZSgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCBpc1VS TEF0dHJpYnV0ZShBdHRyaWJ1dGUqKSBjb25zdDsKIAogI2lmIEVOQUJMRShNSUNST0RBVEEpCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0xvYWRhYmxlVGV4dFRyYWNrLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0xvYWRhYmxlVGV4dFRyYWNrLmNw cAkocmV2aXNpb24gMTEwNDU0KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9Mb2FkYWJs ZVRleHRUcmFjay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNSwxMCArMTM1LDExIEBAIHNpemVf dCBMb2FkYWJsZVRleHRUcmFjazo6dHJhY2tFbGVtZW50SW4KIHsKICAgICBBU1NFUlQobV90cmFj a0VsZW1lbnQpOwogICAgIEFTU0VSVChtX3RyYWNrRWxlbWVudC0+cGFyZW50Tm9kZSgpKTsKKyAg ICBBU1NFUlQobV90cmFja0VsZW1lbnQtPmluRG9jdW1lbnQoKSk7CiAKICAgICBzaXplX3QgaW5k ZXggPSAwOwogICAgIGZvciAoTm9kZSogbm9kZSA9IG1fdHJhY2tFbGVtZW50LT5wYXJlbnROb2Rl KCktPmZpcnN0Q2hpbGQoKTsgbm9kZTsgbm9kZSA9IG5vZGUtPm5leHRTaWJsaW5nKCkpIHsKLSAg ICAgICAgaWYgKCFub2RlLT5oYXNUYWdOYW1lKHRyYWNrVGFnKSkKKyAgICAgICAgaWYgKCFub2Rl LT5oYXNUYWdOYW1lKHRyYWNrVGFnKSB8fCAhbm9kZS0+aW5Eb2N1bWVudCgpKQogICAgICAgICAg ICAgY29udGludWU7CiAgICAgICAgIGlmIChub2RlID09IG1fdHJhY2tFbGVtZW50KQogICAgICAg ICAgICAgcmV0dXJuIGluZGV4OwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTEwNDY1KQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDMt MTIgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVt b3ZpbmcgSFRNTFRyYWNrRWxlbWVudCBkb2VzIG5vdCBkZWxldGUgVGV4dFRyYWNrCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDg3MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbWVkaWEvdHJhY2svdHJh Y2stbGFuZ3VhZ2UtcHJlZmVyZW5jZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogbWVkaWEvdHJh Y2svdHJhY2stbGFuZ3VhZ2UtcHJlZmVyZW5jZS5odG1sOgorCiAyMDEyLTAzLTEyICBBZGFtIEts ZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtNdXRhdGlvbk9ic2VydmVyc10g RW5mb3JjZSBhIGNvbnNpc3RlbnQgb3JkZXIgb2YgTXV0YXRpb25SZWNvcmQgZGVsaXZlcnkKSW5k ZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWxhbmd1YWdlLXByZWZlcmVuY2UtZXhw ZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWxh bmd1YWdlLXByZWZlcmVuY2UtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxMTA0NTQpCisrKyBMYXlv dXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1sYW5ndWFnZS1wcmVmZXJlbmNlLWV4cGVjdGVkLnR4 dAkod29ya2luZyBjb3B5KQpAQCAtMjgsNSArMjgsNiBAQCBFVkVOVChsb2FkKQogRVhQRUNURUQg KHRyYWNrLnJlYWR5U3RhdGUgPT0gJzInKSBPSwogRVhQRUNURUQgKHRyYWNrLnNyY2xhbmcgPT0g J2ZhJykgT0sKIAorRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3MubGVuZ3RoID09ICczJykgT0sK IEVORCBPRiBURVNUCiAKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWxhbmd1 YWdlLXByZWZlcmVuY2UuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFj ay90cmFjay1sYW5ndWFnZS1wcmVmZXJlbmNlLmh0bWwJKHJldmlzaW9uIDExMDQ1NCkKKysrIExh eW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWxhbmd1YWdlLXByZWZlcmVuY2UuaHRtbAkod29y a2luZyBjb3B5KQpAQCAtNDUsNiArNDUsOCBAQAogICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0 ZSgiIik7CiAgICAgICAgICAgICAgICAgdGVzdExpc3QuY3VycmVudCsrOwogICAgICAgICAgICAg ICAgIGlmICh0ZXN0TGlzdC5jdXJyZW50ID49IHRlc3RMaXN0LnRlc3RzLmxlbmd0aCkgeworICAg ICAgICAgICAgICAgICAgICB2YXIgdHJhY2tzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgn dHJhY2snKTsKKyAgICAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJh Y2tzLmxlbmd0aCIsIHRyYWNrcy5sZW5ndGgpOwogICAgICAgICAgICAgICAgICAgICBlbmRUZXN0 KCk7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9Cg==