From 9abbdbd8e553b9c70d9dc3e84b668bb9c0324698 Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Mon, 20 Jul 2015 15:20:56 +0800
Subject: [PATCH] Bug 1183518. Part 3 - early bailout from
 MediaDecoder::NotifyBytesConsumed when shutting down. r=jya.

---
 dom/media/MediaDecoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index 6b0acad44c0d..ba7bb30e86fd 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -976,12 +976,12 @@ void MediaDecoder::NotifyPrincipalChanged()
 void MediaDecoder::NotifyBytesConsumed(int64_t aBytes, int64_t aOffset)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(mDecoderStateMachine);
 
   if (mShuttingDown || mIgnoreProgressData) {
     return;
   }
 
+  MOZ_ASSERT(mDecoderStateMachine);
   ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
   if (aOffset >= mDecoderPosition) {
     mPlaybackStatistics->AddBytes(aBytes);