Bug 1330889. Part 1 - remove the assertion in MDSM::FinishShutdown. r=kikuo
authorJW Wang <jwwang@mozilla.com>
Fri, 13 Jan 2017 15:04:11 +0800
changeset 357589 359372e06f84b0ccd8f028929d1407c202f3d4b9
parent 357566 8f52299c4c6366e7d1edfdd4f93aa3f7cfc4eb76
child 357590 befabe73c225a9b2e7ed205063010ac402c6d57b
push id10621
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 16:02:43 +0000
treeherdermozilla-aurora@dca7b42e6c67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskikuo
bugs1330889
milestone53.0a1
Bug 1330889. Part 1 - remove the assertion in MDSM::FinishShutdown. r=kikuo 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());