Bug 1289290 - Assert |!IsShutdown()| in MediaDecoder::DecodeError() r=kaku
authorJW Wang <jwwang@mozilla.com>
Tue, 26 Jul 2016 14:01:54 +0800
changeset 348742 4f2b848f4e5d64706920b21fd9a885822ad2803f
parent 348741 4a4de3609f4e76bbfb7653167abb035680ac67dc
child 348743 ef96936825b7c426ac04480ecf46605452409500
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
bugs1289290
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 1289290 - Assert |!IsShutdown()| in MediaDecoder::DecodeError() r=kaku MozReview-Commit-ID: EoUtle6quy
dom/media/MediaDecoder.cpp
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -1045,19 +1045,17 @@ MediaDecoder::NetworkError()
   mOwner->NetworkError();
   Shutdown();
 }
 
 void
 MediaDecoder::DecodeError()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (IsShutdown())
-    return;
-
+  MOZ_ASSERT(!IsShutdown());
   mOwner->DecodeError();
   Shutdown();
 }
 
 void
 MediaDecoder::UpdateSameOriginStatus(bool aSameOrigin)
 {
   MOZ_ASSERT(NS_IsMainThread());