Bug 1283394. Part 2 - remove some null-checks. r=kaku draft
authorJW Wang <jwwang@mozilla.com>
Thu, 30 Jun 2016 14:18:37 +0800
changeset 384319 f367fdc680b81c419b90f7aa6b03229d47707a62
parent 384318 acf0e0939b6f6016cfb0e04607ccc33fdc883211
child 384320 37e82c4dec1e4419b670c40eb0f3057e068ed02c
push id22239
push userjwwang@mozilla.com
push dateWed, 06 Jul 2016 02:16:20 +0000
reviewerskaku
bugs1283394
milestone50.0a1
Bug 1283394. Part 2 - remove some null-checks. r=kaku MozReview-Commit-ID: D8DkptoCNgK
dom/media/NextFrameSeekTask.cpp
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -293,19 +293,19 @@ NextFrameSeekTask::OnAudioDecoded(MediaD
 {
   AssertOwnerThread();
   MOZ_ASSERT(aAudioSample);
 
   // The MDSM::mDecodedAudioEndTime will be updated once the whole SeekTask is
   // resolved.
 
   SAMPLE_LOG("OnAudioDecoded [%lld,%lld] disc=%d",
-             (aAudioSample ? aAudioSample->mTime : -1),
-             (aAudioSample ? aAudioSample->GetEndTime() : -1),
-             (aAudioSample ? aAudioSample->mDiscontinuity : 0));
+             aAudioSample->mTime,
+             aAudioSample->GetEndTime(),
+             aAudioSample->mDiscontinuity);
 
   if (!Exists()) {
     // We've received a sample from a previous decode. Discard it.
     return;
   }
 
   // We accept any audio data here.
   mSeekedAudioData = aAudioSample;
@@ -336,19 +336,19 @@ NextFrameSeekTask::OnVideoDecoded(MediaD
 {
   AssertOwnerThread();
   MOZ_ASSERT(aVideoSample);
 
   // The MDSM::mDecodedVideoEndTime will be updated once the whole SeekTask is
   // resolved.
 
   SAMPLE_LOG("OnVideoDecoded [%lld,%lld] disc=%d",
-             (aVideoSample ? aVideoSample->mTime : -1),
-             (aVideoSample ? aVideoSample->GetEndTime() : -1),
-             (aVideoSample ? aVideoSample->mDiscontinuity : 0));
+             aVideoSample->mTime,
+             aVideoSample->GetEndTime(),
+             aVideoSample->mDiscontinuity);
 
   if (!Exists()) {
     // We've received a sample from a previous decode. Discard it.
     return;
   }
 
   if (aVideoSample->mTime > mCurrentTimeBeforeSeek) {
     mSeekedVideoData = aVideoSample;