Backed out changeset 763cc804a25d (bug 1361944) for causing crashtest…

… perma failure on Android
dothq · May 5, 2017 · 541787d · 541787d
1 parent b5f09cc
commit 541787d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 63 deletions.
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
@@ -4580,8 +4580,8 @@ nsresult HTMLMediaElement::InitializeDecoderAsClone(MediaDecoder* aOriginal)
 nsresult HTMLMediaElement::InitializeDecoderForChannel(nsIChannel* aChannel,
                                                        nsIStreamListener** aListener)
 {
-  MOZ_DIAGNOSTIC_ASSERT(mLoadingSrc, "mLoadingSrc must already be set");
-  MOZ_DIAGNOSTIC_ASSERT(!mDecoder, "Shouldn't have a decoder");
+  NS_ASSERTION(mLoadingSrc, "mLoadingSrc must already be set");
+  NS_ASSERTION(mDecoder == nullptr, "Shouldn't have a decoder");
 
   nsAutoCString mimeType;
 

diff --git a/dom/media/test/crashtests/1361944.html b/dom/media/test/crashtests/1361944.html
diff --git a/dom/media/test/crashtests/bogus.ogv b/dom/media/test/crashtests/bogus.ogv
diff --git a/dom/media/test/crashtests/crashtests.list b/dom/media/test/crashtests/crashtests.list
@@ -100,4 +100,3 @@ skip-if(Android&&AndroidVersion=='22') load video-replay-after-audio-end.html #
 # This needs to run at the end to avoid leaking busted state into other tests.
 load 691096-1.html
 load 1236639.html
-load 1361944.html
diff --git a/dom/media/test/crashtests/small-shot.m4a b/dom/media/test/crashtests/small-shot.m4a