Bug 1189506. Call StreamTimeToGraphTime in MediaStreamGraphImpl::UpdateCurrentTimeForStreams, since we know blocking has been taken account of already there. r=karlt

--HG--
extra : commitid : YABaL6h9O0
extra : rebase_source : 3032e3a04a14f2d203ea29c501d8ebc08f531365

dom/media/MediaStreamGraph.cpp

@@ -302,7 +302,7 @@ MediaStreamGraphImpl::UpdateCurrentTimeForStreams(GraphTime aPrevCurrentTime)
     // out.
     if (stream->mFinished && !stream->mNotifiedFinished &&
         mProcessedTime >=
-          stream->StreamTimeToGraphTimeWithBlocking(stream->GetStreamBuffer().GetAllTracksEnd()))  {
+          stream->StreamTimeToGraphTime(stream->GetStreamBuffer().GetAllTracksEnd())) {
       stream->mNotifiedFinished = true;
       SetStreamOrderDirty();
       for (uint32_t j = 0; j < stream->mListeners.Length(); ++j) {
@@ -1709,12 +1709,6 @@ MediaStream::GraphTimeToStreamTimeWithBlocking(GraphTime aTime)
   return GraphImpl()->GraphTimeToStreamTimeWithBlocking(this, aTime);
 }
 
-GraphTime
-MediaStream::StreamTimeToGraphTimeWithBlocking(StreamTime aTime)
-{
-  return GraphImpl()->StreamTimeToGraphTimeWithBlocking(this, aTime);
-}
-
 void
 MediaStream::FinishOnGraphThread()
 {

dom/media/MediaStreamGraph.h

@@ -516,12 +516,6 @@ public:
    * taken account of in UpdateCurrentTimeForStreams.
    */
   GraphTime StreamTimeToGraphTime(StreamTime aTime);
-  /**
-   * Convert stream time to graph time. The result can be > mStateComputedTime,
-   * in which case we did the conversion optimistically assuming the stream
-   * will not be blocked after mStateComputedTime.
-   */
-  GraphTime StreamTimeToGraphTimeWithBlocking(StreamTime aTime);
 
   bool IsFinishedOnGraphThread() { return mFinished; }
   void FinishOnGraphThread();