diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 61a6339e5846..734a85148ba7 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -776,11 +776,6 @@ void HTMLMediaElement::AbortExistingLoads() ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY); ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING); - //TODO: Apply the rules for text track cue rendering Bug 865407 - if (mTextTrackManager) { - mTextTrackManager->GetTextTracks()->SetCuesInactive(); - } - if (fireTimeUpdate) { // Since we destroyed the decoder above, the current playback position // will now be reported as 0. The playback position was non-zero when diff --git a/dom/media/TextTrack.cpp b/dom/media/TextTrack.cpp index 6dded2583ff7..12f63580dbb0 100644 --- a/dom/media/TextTrack.cpp +++ b/dom/media/TextTrack.cpp @@ -92,10 +92,6 @@ TextTrack::SetMode(TextTrackMode aValue) { if (mMode != aValue) { mMode = aValue; - if (aValue == TextTrackMode::Disabled) { - SetCuesInactive(); - //TODO: Apply the rules for text track cue rendering Bug 865407 - } if (mTextTrackList) { mTextTrackList->CreateAndDispatchChangeEvent(); } @@ -129,9 +125,6 @@ TextTrack::AddCue(TextTrackCue& aCue) void TextTrack::RemoveCue(TextTrackCue& aCue, ErrorResult& aRv) { - //TODO: Apply the rules for text track cue rendering Bug 865407 - aCue.SetActive(false); - mCueList->RemoveCue(aCue, aRv); SetDirty(); } @@ -270,11 +263,5 @@ TextTrack::SetTrackElement(HTMLTrackElement* aTrackElement) { mTrackElement = aTrackElement; } -void -TextTrack::SetCuesInactive() -{ - mCueList->SetCuesInactive(); -} - } // namespace dom } // namespace mozilla diff --git a/dom/media/TextTrack.h b/dom/media/TextTrack.h index 7eaeeacb1293..a9725c2fc2cc 100644 --- a/dom/media/TextTrack.h +++ b/dom/media/TextTrack.h @@ -118,8 +118,6 @@ public: return mTextTrackSource; } - void SetCuesInactive(); - private: ~TextTrack(); diff --git a/dom/media/TextTrackCue.cpp b/dom/media/TextTrackCue.cpp index 970b61772852..44d2babae553 100644 --- a/dom/media/TextTrackCue.cpp +++ b/dom/media/TextTrackCue.cpp @@ -41,7 +41,6 @@ TextTrackCue::SetDefaultCueSettings() mAlign = AlignSetting::Middle; mLineAlign = AlignSetting::Start; mVertical = DirectionSetting::_empty; - mActive = false; } TextTrackCue::TextTrackCue(nsPIDOMWindowInner* aOwnerWindow, diff --git a/dom/media/TextTrackCue.h b/dom/media/TextTrackCue.h index 103cb36b1fb1..d4b83ab6b1e7 100644 --- a/dom/media/TextTrackCue.h +++ b/dom/media/TextTrackCue.h @@ -332,16 +332,6 @@ public: void SetTrackElement(HTMLTrackElement* aTrackElement); - void SetActive(bool aActive) - { - mActive = aActive; - } - - bool GetActive() - { - return mActive; - } - private: ~TextTrackCue(); @@ -376,8 +366,6 @@ private: // changed. bool mReset; - bool mActive; - static StaticRefPtr sParserWrapper; }; diff --git a/dom/media/TextTrackCueList.cpp b/dom/media/TextTrackCueList.cpp index 09d09f9eb297..0a54ed654445 100644 --- a/dom/media/TextTrackCueList.cpp +++ b/dom/media/TextTrackCueList.cpp @@ -117,13 +117,5 @@ TextTrackCueList::GetArray(nsTArray >& aCues) } -void -TextTrackCueList::SetCuesInactive() -{ - for(uint32_t i = 0; i < mList.Length(); ++i) { - mList[i]->SetActive(false); - } -} - } // namespace dom } // namespace mozilla diff --git a/dom/media/TextTrackCueList.h b/dom/media/TextTrackCueList.h index 5220cbb2a281..0fe435bb98cb 100644 --- a/dom/media/TextTrackCueList.h +++ b/dom/media/TextTrackCueList.h @@ -54,8 +54,6 @@ public: void RemoveAll(); void GetArray(nsTArray >& aCues); - void SetCuesInactive(); - private: ~TextTrackCueList(); diff --git a/dom/media/TextTrackList.cpp b/dom/media/TextTrackList.cpp index 259475a3b880..14fb2b6d6e00 100644 --- a/dom/media/TextTrackList.cpp +++ b/dom/media/TextTrackList.cpp @@ -211,13 +211,5 @@ TextTrackList::SetTextTrackManager(TextTrackManager* aTextTrackManager) mTextTrackManager = aTextTrackManager; } -void -TextTrackList::SetCuesInactive() -{ - for (uint32_t i = 0; i < Length(); i++) { - mTextTracks[i]->SetCuesInactive(); - } -} - } // namespace dom } // namespace mozilla diff --git a/dom/media/TextTrackList.h b/dom/media/TextTrackList.h index dc470b1634ba..b05dc7b1efe6 100644 --- a/dom/media/TextTrackList.h +++ b/dom/media/TextTrackList.h @@ -61,7 +61,6 @@ public: nsresult DispatchTrackEvent(nsIDOMEvent* aEvent); void CreateAndDispatchChangeEvent(); - void SetCuesInactive(); IMPL_EVENT_HANDLER(change) IMPL_EVENT_HANDLER(addtrack)