Bug 1330889. Part 1 - remove the assertion in MDSM::FinishShutdown. draft
authorJW Wang <jwwang@mozilla.com>
Fri, 13 Jan 2017 15:04:11 +0800
changeset 460624 e5925682a233283dae1c2d55175b90e75ab43d64
parent 460623 570d9dba3ea16ffc467aedc0e471320b786f8221
child 460625 9c131399b706912e3981e7d7fdc402606eedfb2a
push id41429
push userjwwang@mozilla.com
push dateFri, 13 Jan 2017 10:13:13 +0000
bugs1330889
milestone53.0a1
Bug 1330889. Part 1 - remove the assertion in MDSM::FinishShutdown. http://searchfox.org/mozilla-central/rev/3f614bdf91a2379a3e2c822da84e524f5e742121/dom/media/MediaDecoderStateMachine.cpp#1825 This assertion ensures we never escape the SHTUDOWN state. MozReview-Commit-ID: 6jPgVQuiPZf
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -3290,18 +3290,16 @@ MediaDecoderStateMachine::BeginShutdown(
   return InvokeAsync(OwnerThread(), this, __func__,
                      &MediaDecoderStateMachine::Shutdown);
 }
 
 RefPtr<ShutdownPromise>
 MediaDecoderStateMachine::FinishShutdown()
 {
   MOZ_ASSERT(OnTaskQueue());
-  MOZ_ASSERT(mState == DECODER_STATE_SHUTDOWN,
-             "How did we escape from the shutdown state?");
   DECODER_LOG("Shutting down state machine task queue");
   return OwnerThread()->BeginShutdown();
 }
 
 void
 MediaDecoderStateMachine::RunStateMachine()
 {
   MOZ_ASSERT(OnTaskQueue());