author | Iris Hsiao <ihsiao@mozilla.com> |
Fri, 05 May 2017 15:12:51 +0800 | |
changeset 356593 | 9316a48f009b758bc1f0fb76093c2cc9916eb5dd |
parent 356592 | 4fa8134024ea8ebc35a20fbd9406f00a448b3ed3 |
child 356594 | 2febf984044a9332f7f66b000b59d2dcee0b5515 |
push id | 31767 |
push user | cbook@mozilla.com |
push date | Fri, 05 May 2017 13:15:58 +0000 |
treeherder | mozilla-central@8872ad4d52b6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1361944 |
milestone | 55.0a1 |
backs out | 763cc804a25de70e277a81969d3de7e8ab655e48 |
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
|
dom/html/HTMLMediaElement.cpp | file | annotate | diff | comparison | revisions | |
dom/media/test/crashtests/1361944.html | file | annotate | diff | comparison | revisions | |
dom/media/test/crashtests/bogus.ogv | file | annotate | diff | comparison | revisions | |
dom/media/test/crashtests/crashtests.list | file | annotate | diff | comparison | revisions | |
dom/media/test/crashtests/small-shot.m4a | file | annotate | diff | comparison | revisions |
--- 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