Bug 1143971: Rebase bustage fix. r=bustage ON A CLOSED TREE
authorJean-Yves Avenard <jyavenard@mozilla.com>
Mon, 23 Mar 2015 21:26:16 +1100
changeset 263899 ab5aa8850e25684b8164180ec2fd2bf5a68b8331
parent 263898 a80cf2d5395414920b1f5c8aef837aad85111e2b
child 263900 a635ffc071d051fd6901d436e562e95c90e95012
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1143971
milestone39.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 1143971: Rebase bustage fix. r=bustage ON A CLOSED TREE
dom/media/mediasource/MediaSourceReader.cpp
--- a/dom/media/mediasource/MediaSourceReader.cpp
+++ b/dom/media/mediasource/MediaSourceReader.cpp
@@ -1036,23 +1036,23 @@ MediaSourceReader::MaybeNotifyHaveData()
   bool haveAudio = false, haveVideo = false;
   bool ended = IsEnded();
   // If we are in ended mode, we will resolve any pending wait promises.
   // The next Request*Data will handle END_OF_STREAM or going back into waiting
   // mode.
   if (!IsSeeking() && mAudioTrack) {
     haveAudio = HaveData(mLastAudioTime, MediaData::AUDIO_DATA);
     if (ended || haveAudio) {
-      WaitPromise(MediaData::AUDIO_DATA).ResolveIfExists(MediaData::AUDIO_DATA __func__);
+      WaitPromise(MediaData::AUDIO_DATA).ResolveIfExists(MediaData::AUDIO_DATA, __func__);
     }
   }
   if (!IsSeeking() && mVideoTrack) {
     haveVideo = HaveData(mLastVideoTime, MediaData::VIDEO_DATA);
     if (ended || haveVideo) {
-      WaitPromise(MediaData::VIDEO_DATA).ResolveIfExists(MediaData::VIDEO_DATA __func__);
+      WaitPromise(MediaData::VIDEO_DATA).ResolveIfExists(MediaData::VIDEO_DATA, __func__);
     }
   }
   MSE_DEBUG("isSeeking=%d haveAudio=%d, haveVideo=%d ended=%d",
             IsSeeking(), haveAudio, haveVideo, ended);
 }
 
 static void
 CombineEncryptionData(EncryptionInfo& aTo, const EncryptionInfo& aFrom)