Bug 1284399. Part 4 - move |mSeekJob.RejectIfExists(__func__)| out of SeekTask::Discard(). r=kaku
MozReview-Commit-ID: C0kmdNkCpk3
--- 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;
}