Bug 1304948 - Check the target cue belongs to corresponding TextTrack. r=rillian draft
authorbechen <bechen@mozilla.com>
Thu, 29 Sep 2016 17:47:35 +0800
changeset 418941 52c8b4bb15dae82cc7bac9fe9db87010f6a47397
parent 418940 a508c37d244f16146ed01fba6bc4702f5b11c4f7
child 532457 0f6165cb48048711cc601b979cf0adbafcc9f64e
push id30806
push userbechen@mozilla.com
push dateThu, 29 Sep 2016 09:48:00 +0000
reviewersrillian
bugs1304948
milestone52.0a1
Bug 1304948 - Check the target cue belongs to corresponding TextTrack. r=rillian MozReview-Commit-ID: 3X3FjYw2p26
dom/media/TextTrack.cpp
--- a/dom/media/TextTrack.cpp
+++ b/dom/media/TextTrack.cpp
@@ -145,19 +145,22 @@ TextTrack::AddCue(TextTrackCue& aCue)
     }
   }
   SetDirty();
 }
 
 void
 TextTrack::RemoveCue(TextTrackCue& aCue, ErrorResult& aRv)
 {
+  // Bug1304948, check the aCue belongs to the TextTrack.
+  mCueList->RemoveCue(aCue, aRv);
+  if (aRv.Failed()) {
+    return;
+  }
   aCue.SetActive(false);
-
-  mCueList->RemoveCue(aCue, aRv);
   aCue.SetTrack(nullptr);
   if (mTextTrackList) {
     HTMLMediaElement* mediaElement = mTextTrackList->GetMediaElement();
     if (mediaElement) {
       mediaElement->NotifyCueRemoved(aCue);
     }
   }
   SetDirty();