Backed out changeset decfe1d8c927 (bug 1242774) for causing leaks
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 16 Feb 2016 08:34:14 +0100
changeset 331236 53029769feefdb9e01b239c9c9e7bb3b089b1019
parent 331235 03fc467e100217768a96fb5adeb0feda7a21ccfb
child 331237 6ea654cad929c9bedd8a4161a182b6189fbeae6a
child 331279 e98b77de3d8f0efc8444298126fee719529e25ed
push id10938
push userBogdan.Postelnicu@softvision.ro
push dateTue, 16 Feb 2016 15:52:05 +0000
bugs1242774
milestone47.0a1
backs outdecfe1d8c927d13abaf5105492eb3477f574da6b
Backed out changeset decfe1d8c927 (bug 1242774) for causing leaks
dom/media/test/crashtests/crashtests.list
dom/media/test/crashtests/video-crash.webm
dom/media/test/crashtests/video-replay-after-audio-end.html
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@@ -87,12 +87,11 @@ load audiocontext-double-suspend.html
 load buffer-source-duration-1.html
 load buffer-source-ended-1.html
 load buffer-source-resampling-start-1.html
 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(winWidget || xulRuntime.OS=="Linux") load video-replay-after-audio-end.html
 
 # This needs to run at the end to avoid leaking busted state into other tests.
 skip-if(B2G) load 691096-1.html # bug 852821
deleted file mode 100644
index 9532113d87ae59497ab5e9482615c57cc51c8672..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/media/test/crashtests/video-replay-after-audio-end.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<html class="reftest-wait">
-<head>
-  <title> Bug 1242774 : video crashed if pause and play again after audio track ends </title>
-</head>
-<body>
-<script type="text/javascript">
-function assert(value, msg) {
-  if (!value) {
-    dump("### Error : " + msg + "\n");
-  }
-}
-
-var AUDIO_END_TIME = 4.5;
-var video = document.createElement('video');
-video.src = "video-crash.webm";
-video.play();
-
-video.ontimeupdate = function () {
-  assert(AUDIO_END_TIME < video.duration,
-         "AUDIO_END_TIME should be smaller than the duration!");
-
-  if (video.currentTime > AUDIO_END_TIME) {
-    dump("### Pause video during silent part.\n");
-    video.ontimeupdate = null;
-    video.pause();
-  }
-
-  video.onpause = function () {
-    video.onpause = null;
-    setTimeout(function() {
-      dump("### Re-play after pausing during silent part.\n");
-      video.play();
-      video.onended = function () {
-        video.onended = null;
-        dump("### Video is ended.\n");
-        document.documentElement.removeAttribute("class");
-      }
-    }, 1000);
-  }
-}
-</script>
-</body>
-</html>
\ No newline at end of file