Bug 1371515. P2 - remove the check from DecodeError(). r=kaku
authorJW Wang <jwwang@mozilla.com>
Fri, 09 Jun 2017 11:42:59 +0800
changeset 363446 a12ce07a8154626a61eb958088e4569116ed23bc
parent 363445 e10c8efbb0fe265a2fe251e92e5f09c497f1bc10
child 363447 6266b3ba9d2356c9521e2bdaaf305b37ba58ac89
push id91321
push usercbook@mozilla.com
push dateMon, 12 Jun 2017 13:43:51 +0000
treeherdermozilla-inbound@11e60eaf3f13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskaku
bugs1371515
milestone55.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 1371515. P2 - remove the check from DecodeError(). r=kaku 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
@@ -3492,17 +3492,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()
 {