Bug 1289296 - Assert |!IsShutdown()| in MediaDecoder::NetworkError(). r=kaku
authorJW Wang <jwwang@mozilla.com>
Tue, 26 Jul 2016 14:28:29 +0800
changeset 348978 277d6fc32922740a6324b11ab29b82939f5aca90
parent 348977 4d52a4c41a7754ef4c14f4f02b3273a5469de156
child 348979 72f738a49d10cb5db41b11483eead53af7b5384c
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskaku
bugs1289296
milestone50.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 1289296 - Assert |!IsShutdown()| in MediaDecoder::NetworkError(). r=kaku MozReview-Commit-ID: HL8piKSPU1B
dom/media/MediaDecoder.cpp
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -1034,19 +1034,17 @@ MediaDecoder::ResetConnectionState()
   // to play the Rtsp streaming next time.
   Shutdown();
 }
 
 void
 MediaDecoder::NetworkError()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (IsShutdown())
-    return;
-
+  MOZ_ASSERT(!IsShutdown());
   mOwner->NetworkError();
   Shutdown();
 }
 
 void
 MediaDecoder::DecodeError()
 {
   MOZ_ASSERT(NS_IsMainThread());