Bug 1185931 - Add assert(mDecoderStateMachine). r=jwwang
authorBenjamin Chen <bechen@mozilla.com>
Thu, 25 Feb 2016 14:32:19 +0800
changeset 322623 6c5033cf85742e903e9679729adae6be70fb1633
parent 322622 1bbd0cd10f766916115b5d68d388bc3fe78b2b4c
child 322624 ea033695b10495a9a4e70d519f1e1c7a37699751
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwwang
bugs1185931
milestone47.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 1185931 - Add assert(mDecoderStateMachine). r=jwwang MozReview-Commit-ID: 2c6AF3iu0TD
dom/media/omx/MediaOmxCommonDecoder.cpp
--- a/dom/media/omx/MediaOmxCommonDecoder.cpp
+++ b/dom/media/omx/MediaOmxCommonDecoder.cpp
@@ -122,23 +122,17 @@ MediaOmxCommonDecoder::FirstFrameLoaded(
 }
 
 void
 MediaOmxCommonDecoder::PauseStateMachine()
 {
   MOZ_ASSERT(NS_IsMainThread());
   DECODER_LOG(LogLevel::Debug, ("%s", __PRETTY_FUNCTION__));
 
-  if (mShuttingDown) {
-    return;
-  }
-
-  if (!GetStateMachine()) {
-    return;
-  }
+  MOZ_ASSERT(GetStateMachine());
   // enter dormant state
   GetStateMachine()->DispatchSetDormant(true);
 }
 
 void
 MediaOmxCommonDecoder::ResumeStateMachine()
 {
   MOZ_ASSERT(NS_IsMainThread());