Backed out changeset 763cc804a25d (bug 1361944) for causing crashtest perma failure on Android
authorIris Hsiao <ihsiao@mozilla.com>
Fri, 05 May 2017 15:12:51 +0800
changeset 356593 9316a48f009b758bc1f0fb76093c2cc9916eb5dd
parent 356592 4fa8134024ea8ebc35a20fbd9406f00a448b3ed3
child 356594 2febf984044a9332f7f66b000b59d2dcee0b5515
push id31767
push usercbook@mozilla.com
push dateFri, 05 May 2017 13:15:58 +0000
treeherdermozilla-central@8872ad4d52b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1361944
milestone55.0a1
backs out763cc804a25de70e277a81969d3de7e8ab655e48
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
Backed out changeset 763cc804a25d (bug 1361944) for causing crashtest perma failure on Android
dom/html/HTMLMediaElement.cpp
dom/media/test/crashtests/1361944.html
dom/media/test/crashtests/bogus.ogv
dom/media/test/crashtests/crashtests.list
dom/media/test/crashtests/small-shot.m4a
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -4575,18 +4575,18 @@ nsresult HTMLMediaElement::InitializeDec
   }
 
   return FinishDecoderSetup(decoder, resource, nullptr);
 }
 
 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;
 
   aChannel->GetContentType(mimeType);
   NS_ASSERTION(!mimeType.IsEmpty(), "We should have the Content-Type.");
 
   DecoderDoctorDiagnostics diagnostics;
   RefPtr<MediaDecoder> decoder =
deleted file mode 100644
--- a/dom/media/test/crashtests/1361944.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html class="reftest-wait">
-<body>
-
-<video id="v1">
-  <source src="bogus.ogv">
-  <source src="small-shot.m4a">
-</video>
-
-<script type="text/javascript">
-v1.onloadedmetadata = () => {
-  document.documentElement.removeAttribute("class");
-}
-</script>
-</body>
-</html>
\ No newline at end of file
deleted file mode 100644
--- a/dom/media/test/crashtests/bogus.ogv
+++ /dev/null
@@ -1,45 +0,0 @@
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
-bogus bogus bogus
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@@ -95,9 +95,8 @@ load doppler-1.html
 HTTP load media-element-source-seek-1.html
 load offline-buffer-source-ended-1.html
 load oscillator-ended-1.html
 load oscillator-ended-2.html
 skip-if(Android&&AndroidVersion=='22') load video-replay-after-audio-end.html # bug 1315125, bug 1358876
 # 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
\ No newline at end of file
deleted file mode 100644
index 51a23c5b490ac54af4eb7b9e66eacdc8c999d7ca..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001