gecko: changeset 397122:96ef0f9907fa554c4304cb25a46907fe6b734757

Bug 1292449. Part 3 - Assert IsShutdown() is false in MediaDecoder::Shutdown(). Shutdown() should be only called once. draft

author	JW Wang <jwwang@mozilla.com>
	Mon, 01 Aug 2016 16:11:20 +0800
changeset 397122	96ef0f9907fa554c4304cb25a46907fe6b734757
parent 397121	f65ed4759fc43837d60ff6bbb46b52216bd5c917
child 397126	b08b7fb0894ba760d5c33f87cb93ec55be42e4d0
push id	25207
push user	jwwang@mozilla.com
push date	Fri, 05 Aug 2016 07:05:11 +0000
bugs	1292449
milestone	51.0a1

Bug 1292449. Part 3 - Assert IsShutdown() is false in MediaDecoder::Shutdown(). Shutdown() should be only called once. MozReview-Commit-ID: 6iFKkTTb7qD

--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -610,20 +610,17 @@ MediaDecoder::MediaDecoder(MediaDecoderO
 
   MediaShutdownManager::Instance().Register(this);
 }
 
 void
 MediaDecoder::Shutdown()
 {
   MOZ_ASSERT(NS_IsMainThread());
-
-  if (IsShutdown()) {
-    return;
-  }
+  MOZ_ASSERT(!IsShutdown());
 
   // Unwatch all watch targets to prevent further notifications.
   mWatchManager.Shutdown();
 
   mResourceCallback->Disconnect();
 
 #ifdef MOZ_EME
   mCDMProxyPromiseHolder.RejectIfExists(true, __func__);