Bug 1189506. Use GraphTimeToStreamTime in PrepareUpdatesToMainThreadState. r=karlt
authorRobert O'Callahan <robert@ocallahan.org>
Tue, 08 Sep 2015 17:12:01 +1200
changeset 295525 1c0b08207de93d30676d49264509e8096cc7d5d7
parent 295524 c1d36f0caeae24b5aab3f4492632a64f4f436e53
child 295526 a4bfb4017c00886fed3bb7e52e1afb5afedba8f7
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs1189506
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1189506. Use GraphTimeToStreamTime in PrepareUpdatesToMainThreadState. r=karlt
dom/media/MediaStreamGraph.cpp
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -943,18 +943,20 @@ MediaStreamGraphImpl::PrepareUpdatesToMa
     mStreamUpdates.SetCapacity(mStreamUpdates.Length() + mStreams.Length() +
         mSuspendedStreams.Length());
     for (MediaStream* stream : AllStreams()) {
       if (!stream->MainThreadNeedsUpdates()) {
         continue;
       }
       StreamUpdate* update = mStreamUpdates.AppendElement();
       update->mStream = stream;
+      // No blocking to worry about here, since we've passed
+      // UpdateCurrentTimeForStreams.
       update->mNextMainThreadCurrentTime =
-        GraphTimeToStreamTimeWithBlocking(stream, mProcessedTime);
+        stream->GraphTimeToStreamTime(mProcessedTime);
       update->mNextMainThreadFinished = stream->mNotifiedFinished;
     }
     if (!mPendingUpdateRunnables.IsEmpty()) {
       mUpdateRunnables.AppendElements(Move(mPendingUpdateRunnables));
     }
   }
 
   // Don't send the message to the main thread if it's not going to have