Bug 1208371 - Move FindTrack from SourceMediaStream to MediaStream. r=roc

MozReview-Commit-ID: 2BzGdGdbpy0

--HG--
extra : rebase_source : f011fe75b86e0db80443f0042866678d438d6d63

dom/media/MediaStreamGraph.cpp

@@ -1950,6 +1950,12 @@ MediaStream::FinishOnGraphThread()
   GraphImpl()->FinishStream(this);
 }
 
+StreamBuffer::Track*
+MediaStream::FindTrack(TrackID aID)
+{
+  return mBuffer.FindTrack(aID);
+}
+
 StreamBuffer::Track*
 MediaStream::EnsureTrack(TrackID aTrackId)
 {
@@ -2582,12 +2588,6 @@ SourceMediaStream::FinishAddTracks()
   }
 }
 
-StreamBuffer::Track*
-SourceMediaStream::FindTrack(TrackID aID)
-{
-  return mBuffer.FindTrack(aID);
-}
-
 void
 SourceMediaStream::ResampleAudioToGraphSampleRate(TrackData* aTrackData, MediaSegment* aSegment)
 {

dom/media/MediaStreamGraph.h

@@ -758,6 +758,11 @@ public:
 
   bool HasCurrentData() { return mHasCurrentData; }
 
+  /**
+   * Find track by track id.
+   */
+  StreamBuffer::Track* FindTrack(TrackID aID);
+
   StreamBuffer::Track* EnsureTrack(TrackID aTrack);
 
   virtual void ApplyTrackDisabling(TrackID aTrackID, MediaSegment* aSegment, MediaSegment* aRawSegment = nullptr);
@@ -1000,11 +1005,6 @@ public:
    */
   void FinishAddTracks();
 
-  /**
-   * Find track by track id.
-   */
-  StreamBuffer::Track* FindTrack(TrackID aID);
-
   /**
    * Append media data to a track. Ownership of aSegment remains with the caller,
    * but aSegment is emptied.