Backed out changeset 453431d7a2c8 (bug 882718) for crashing in track.html with nsXBLPrototypeBinding::GetRuleProcessor(). r=backout

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

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

dom/media/TextTrack.h

@@ -118,8 +118,6 @@ public:
     return mTextTrackSource;
   }
 
-  void SetCuesInactive();
-
 private:
   ~TextTrack();
 

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,

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<nsIWebVTTParserWrapper> sParserWrapper;
 };
 

dom/media/TextTrackCueList.cpp

@@ -117,13 +117,5 @@ TextTrackCueList::GetArray(nsTArray<RefPtr<TextTrackCue> >& aCues)
 }
 
 
-void
-TextTrackCueList::SetCuesInactive()
-{
-  for(uint32_t i = 0; i < mList.Length(); ++i) {
-    mList[i]->SetActive(false);
-  }
-}
-
 } // namespace dom
 } // namespace mozilla

dom/media/TextTrackCueList.h

@@ -54,8 +54,6 @@ public:
   void RemoveAll();
   void GetArray(nsTArray<RefPtr<TextTrackCue> >& aCues);
 
-  void SetCuesInactive();
-
 private:
   ~TextTrackCueList();
 

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

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)