Bug 1284399. Part 4 - move |mSeekJob.RejectIfExists(__func__)| out of SeekTask::Discard(). r=kaku draft
authorJW Wang <jwwang@mozilla.com>
Tue, 05 Jul 2016 13:55:32 +0800
changeset 386928 0ed92f1b6fd88f94fac1049fa403f926ded3c0ce
parent 386927 bd705aabccf60f9d0afcebdf31080e947d854d71
child 386929 7bec5865ef850beaaed12e7f55c4dd0888939675
push id22850
push userjwwang@mozilla.com
push dateWed, 13 Jul 2016 02:19:16 +0000
reviewerskaku
bugs1284399
milestone50.0a1
Bug 1284399. Part 4 - move |mSeekJob.RejectIfExists(__func__)| out of SeekTask::Discard(). r=kaku MozReview-Commit-ID: C0kmdNkCpk3
dom/media/AccurateSeekTask.cpp
dom/media/MediaDecoderStateMachine.cpp
dom/media/NextFrameSeekTask.cpp
--- a/dom/media/AccurateSeekTask.cpp
+++ b/dom/media/AccurateSeekTask.cpp
@@ -64,19 +64,16 @@ AccurateSeekTask::~AccurateSeekTask()
   MOZ_ASSERT(mIsDiscarded);
 }
 
 void
 AccurateSeekTask::Discard()
 {
   AssertOwnerThread();
 
-  // Disconnect MediaDecoder.
-  mSeekJob.RejectIfExists(__func__);
-
   // Disconnect MDSM.
   RejectIfExist(__func__);
 
   // Disconnect MediaDecoderReaderWrapper.
   mSeekRequest.DisconnectIfExists();
   CancelCallbacks();
 
   mIsDiscarded = true;
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1746,16 +1746,17 @@ MediaDecoderStateMachine::OnSeekTaskReje
 
   DiscardSeekTaskIfExist();
 }
 
 void
 MediaDecoderStateMachine::DiscardSeekTaskIfExist()
 {
   if (mSeekTask) {
+    mCurrentSeek.RejectIfExists(__func__);
     mSeekTask->Discard();
     mSeekTask = nullptr;
 
     // Reset the MediaDecoderReaderWrapper's callbask.
     SetMediaDecoderReaderWrapperCallback();
   }
 }
 
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -47,19 +47,16 @@ NextFrameSeekTask::~NextFrameSeekTask()
   MOZ_ASSERT(mIsDiscarded);
 }
 
 void
 NextFrameSeekTask::Discard()
 {
   AssertOwnerThread();
 
-  // Disconnect MediaDecoder.
-  mSeekJob.RejectIfExists(__func__);
-
   // Disconnect MDSM.
   RejectIfExist(__func__);
 
   // Disconnect MediaDecoderReader.
   CancelCallbacks();
 
   mIsDiscarded = true;
 }