Bug 1282658. Part 8 - remove asserting |mReader->IsWaitForDataSupported()| for mReader->WaitForData() will crash if the method has no override. r=kaku
authorJW Wang <jwwang@mozilla.com>
Tue, 28 Jun 2016 15:03:56 +0800
changeset 303765 c0910b20aefcbe2735ef153937621612faabc71f
parent 303764 cea92d10be95c8e41fe3d8269948b398e6a8f02e
child 303766 1668f3d274b73757f93f0c5c9dd26b031c369b00
push id30401
push usercbook@mozilla.com
push dateWed, 06 Jul 2016 09:40:34 +0000
treeherdermozilla-central@a7d6bb9e7d12 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskaku
bugs1282658
milestone50.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 1282658. Part 8 - remove asserting |mReader->IsWaitForDataSupported()| for mReader->WaitForData() will crash if the method has no override. r=kaku MozReview-Commit-ID: 2t1viejYHgh
dom/media/AccurateSeekTask.cpp
--- a/dom/media/AccurateSeekTask.cpp
+++ b/dom/media/AccurateSeekTask.cpp
@@ -428,18 +428,16 @@ AccurateSeekTask::OnAudioNotDecoded(Medi
     // If this is a decode error, delegate to the generic error path.
     RejectIfExist(__func__);
     return;
   }
 
   // If the decoder is waiting for data, we tell it to call us back when the
   // data arrives.
   if (aReason == MediaDecoderReader::WAITING_FOR_DATA) {
-    MOZ_ASSERT(mReader->IsWaitForDataSupported(),
-               "Readers that send WAITING_FOR_DATA need to implement WaitForData");
     mReader->WaitForData(MediaData::AUDIO_DATA);
     return;
   }
 
   if (aReason == MediaDecoderReader::CANCELED) {
     EnsureAudioDecodeTaskQueued();
     return;
   }
@@ -514,18 +512,16 @@ AccurateSeekTask::OnVideoNotDecoded(Medi
     // If this is a decode error, delegate to the generic error path.
     RejectIfExist(__func__);
     return;
   }
 
   // If the decoder is waiting for data, we tell it to call us back when the
   // data arrives.
   if (aReason == MediaDecoderReader::WAITING_FOR_DATA) {
-    MOZ_ASSERT(mReader->IsWaitForDataSupported(),
-               "Readers that send WAITING_FOR_DATA need to implement WaitForData");
     mReader->WaitForData(MediaData::VIDEO_DATA);
     return;
   }
 
   if (aReason == MediaDecoderReader::CANCELED) {
     EnsureVideoDecodeTaskQueued();
     return;
   }