Bug 1371515. P2 - remove the check from DecodeError(). draft
authorJW Wang <jwwang@mozilla.com>
Fri, 09 Jun 2017 11:42:59 +0800
changeset 591501 fadda4c8064495d1831413fe8002ed91401a8ac8
parent 591500 b6449e3cc0060e9b11b2a0625da80886b6172acd
child 591502 98931436137fbcf9d4e74f843342094f6c5c0a51
child 592331 71da73f5a6a36605c08414bf7c750309ac9231b8
push id63063
push userjwwang@mozilla.com
push dateFri, 09 Jun 2017 03:55:15 +0000
bugs1371515
milestone55.0a1
Bug 1371515. P2 - remove the check from DecodeError(). The same reason as P1. ShutdownState::Enter() disconnects callbacks to prevent DecodeError() from being called during shutdown. MozReview-Commit-ID: EFZiE2zkcUZ
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -3498,17 +3498,16 @@ MediaDecoderStateMachine::HasLowBuffered
   media::TimeInterval interval(start, end);
   return !mBuffered.Ref().Contains(interval);
 }
 
 void
 MediaDecoderStateMachine::DecodeError(const MediaResult& aError)
 {
   MOZ_ASSERT(OnTaskQueue());
-  MOZ_ASSERT(!IsShutdown());
   LOGW("Decode error");
   // Notify the decode error and MediaDecoder will shut down MDSM.
   mOnPlaybackErrorEvent.Notify(aError);
 }
 
 void
 MediaDecoderStateMachine::EnqueueFirstFrameLoadedEvent()
 {