From 727ebe7fcf6b22e8d81b750443aa9b15b26b074e Mon Sep 17 00:00:00 2001 From: bechen Date: Mon, 27 Jun 2016 10:41:20 +0800 Subject: [PATCH] Bug 1277192 - Correct the association between Cue and TextTrack. r=rillian MozReview-Commit-ID: 2B2swKL4iM2 --HG-- extra : transplant_source : %C9%C2%EE%A9%2A%FA%80v%7D%B2s%01%B4%A5%B4%98%F2z%06%D0 --- dom/media/TextTrack.cpp | 1 + .../media-elements/interfaces/TextTrack/addCue.html.ini | 5 ----- .../media-elements/interfaces/TextTrackCue/track.html.ini | 8 -------- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 testing/web-platform/meta/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html.ini delete mode 100644 testing/web-platform/meta/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html.ini diff --git a/dom/media/TextTrack.cpp b/dom/media/TextTrack.cpp index 5dff4551dd75..6337d2b7da9a 100644 --- a/dom/media/TextTrack.cpp +++ b/dom/media/TextTrack.cpp @@ -153,6 +153,7 @@ TextTrack::RemoveCue(TextTrackCue& aCue, ErrorResult& aRv) aCue.SetActive(false); mCueList->RemoveCue(aCue, aRv); + aCue.SetTrack(nullptr); if (mTextTrackList) { HTMLMediaElement* mediaElement = mTextTrackList->GetMediaElement(); if (mediaElement) { diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html.ini deleted file mode 100644 index 9e2ec10ceeca..000000000000 --- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[addCue.html] - type: testharness - [TextTrack.addCue(), adding a removed cue to a different track] - expected: FAIL - diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html.ini deleted file mode 100644 index 9fcb7b29a93f..000000000000 --- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[track.html] - type: testharness - [TextTrackCue.track, script-created cue] - expected: FAIL - - [TextTrackCue.track, parsed cue] - expected: FAIL -