Bug 782876 - Remove unnecessary returns from event handlers in media tests. r=doublec

content/media/test/fragment_noplay.js

@@ -1,7 +1,5 @@
 function test_fragment_noplay(v, start, end, is, ok, finish) {
 
-var completed = false;
-
 function onLoadedMetadata() {
   var s = start == null ? 0 : start;
   var e = end == null ? v.duration : end;
@@ -10,9 +8,7 @@ function onLoadedMetadata() {
   ok(v.currentTime >= a && v.currentTime <= b, "loadedmetadata currentTime is " + a + " < " + v.currentTime + " < " + b);
   ok(v.initialTime == s, "initialTime (" + v.initialTime + ") == start Time (" + s + ")");
   ok(v.mozFragmentEnd == e, "mozFragmentEnd (" + v.mozFragmentEnd + ") == end Time (" + e + ")");
-  completed = true;
   finish();
-  return false;
 }
 
 v.addEventListener("loadedmetadata", onLoadedMetadata, false);

content/media/test/fragment_play.js

@@ -13,32 +13,28 @@ function onLoadedMetadata() {
   ok(v.mozFragmentEnd == e, "mozFragmentEnd (" + v.mozFragmentEnd + ") == end Time (" + e + ")");
   loadedMetadataRaised = true; 
   v.play();
-  return false;
 }
 
 function onSeeked() {
   if (completed)
-    return false;
+    return;
 
   var s = start == null ? 0 : start;
   ok(v.currentTime == s, "seeked currentTime is " + v.currentTime + " != " + s);
 
   seekedRaised = true;
-  return false;
 }
 
 function onTimeUpdate() {
   if (completed)
-    return false;
+    return;
 
   v._lastTimeUpdate = v.currentTime;
-  return false;
 }
 
-
 function onPause() {
   if (completed)
-    return false;
+    return;
 
   var e = end == null ? v.duration : end;
   var a = e - 0.05;
@@ -46,13 +42,12 @@ function onPause() {
   ok(v.currentTime >= a && v.currentTime <= b, "paused currentTime is " + a + " < " + v.currentTime + " < " + b + " ? " + v._lastTimeUpdate);
   pausedRaised = true;
   v.play();
-  return false;
 }
 
 
 function onEnded() {
   if (completed)
-    return false;
+    return;
 
   completed = true;
   ok(loadedMetadataRaised, "loadedmetadata event");
@@ -63,7 +58,6 @@ function onEnded() {
     ok(pausedRaised, "paused event: " + end + " " + v.duration);
   }
   finish();
-  return false;
 }
 
 v.addEventListener("ended", onEnded, false);

content/media/test/seek1.js

@@ -9,7 +9,7 @@ var completed = false;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
   ok(!v.seeking, "seeking should default to false");
   try {
     v.seeking = true;
@@ -23,22 +23,20 @@ function startTest() {
   v.play();
   v.currentTime=seekTime;
   seekFlagStart = v.seeking;
-  return false;
 }
 
 function seekStarted() {
   if (completed)
-    return false;
+    return;
   ok(v.currentTime >= seekTime - 0.1,
      "Video currentTime should be around " + seekTime + ": " + v.currentTime + " (seeking)");
   v.pause();
   startPassed = true;
-  return false;
 }
 
 function seekEnded() {
   if (completed)
-    return false;
+    return;
 
   var t = v.currentTime;
   // Since we were playing, and we only paused asynchronously, we can't be
@@ -48,12 +46,11 @@ function seekEnded() {
   v.play();
   endPassed = true;
   seekFlagEnd = v.seeking;
-  return false;
 }
 
 function playbackEnded() {
   if (completed)
-    return false;
+    return;
 
   completed = true;
   ok(startPassed, "seeking event");
@@ -61,7 +58,6 @@ function playbackEnded() {
   ok(seekFlagStart, "seeking flag on start should be true");
   ok(!seekFlagEnd, "seeking flag on end should be false");
   finish();
-  return false;
 }
 
 v.addEventListener("ended", playbackEnded, false);

content/media/test/seek11.js

@@ -8,12 +8,11 @@ var target = 0;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
   target = v.duration / 2;
   v.currentTime = target;
   v.currentTime = target;
   v._seekTarget = target;
-  return false;
 }
 
 function startSeeking() {
@@ -28,7 +27,7 @@ function startSeeking() {
 
 function seekEnded() {
   if (completed)
-    return false;
+    return;
 
   if (v.currentTime > 0) {
     ok(v.currentTime > target - 0.1 && v.currentTime < target + 0.1,
@@ -41,8 +40,6 @@ function seekEnded() {
     completed = true;
     finish();
   }
-
-  return false;
 }
 
 v.addEventListener("loadedmetadata", startTest, false);

content/media/test/seek12.js

@@ -3,31 +3,28 @@ var completed = false;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
   ok(!v.seeking, "seeking should default to false");
   v.currentTime = seekTime;
   is(v.currentTime, seekTime, "currentTime must report seek target immediately");
   is(v.seeking, true, "seeking flag on start should be true");
-  return false;
 }
 
 function seekStarted() {
   if (completed)
-    return false;
+    return;
   //is(v.currentTime, seekTime, "seeking: currentTime must be seekTime");
   ok(Math.abs(v.currentTime - seekTime) < 0.01, "seeking: currentTime must be seekTime");
-  return false;
 }
 
 function seekEnded() {
   if (completed)
-    return false;
+    return;
   completed = true;
   //is(v.currentTime, seekTime, "seeked: currentTime must be seekTime");
   ok(Math.abs(v.currentTime - seekTime) < 0.01, "seeked: currentTime must be seekTime");
   is(v.seeking, false, "seeking flag on end should be false");
   finish();
-  return false;
 }
 
 v.addEventListener("loadedmetadata", startTest, false);

content/media/test/seek13.js

@@ -3,41 +3,37 @@ var completed = false;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
   ok(!v.seeking, "seeking should default to false");
   v.currentTime = v.duration;
   is(v.currentTime, v.duration, "currentTime must report seek target immediately");
   is(v.seeking, true, "seeking flag on start should be true");
-  return false;
 }
 
 function seekStarted() {
   if (completed)
-    return false;
+    return;
   //is(v.currentTime, v.duration, "seeking: currentTime must be duration");
   ok(Math.abs(v.currentTime - v.duration) < 0.01, "seeking: currentTime must be duration");
-  return false;
 }
 
 function seekEnded() {
   if (completed)
-    return false;
+    return;
   //is(v.currentTime, v.duration, "seeked: currentTime must be duration");
   ok(Math.abs(v.currentTime - v.duration) < 0.01, "seeked: currentTime must be duration");
   is(v.seeking, false, "seeking flag on end should be false");
-  return false;
 }
 
 function playbackEnded() {
   if (completed)
-    return false;
+    return;
   completed = true;
   //is(v.currentTime, v.duration, "ended: currentTime must be duration");
   ok(Math.abs(v.currentTime - v.duration) < 0.01, "ended: currentTime must be duration");
   is(v.seeking, false, "seeking flag on end should be false");
   is(v.ended, true, "ended must be true");
   finish();
-  return false;
 }
 
 v.addEventListener("loadedmetadata", startTest, false);

content/media/test/seek2.js

@@ -8,33 +8,30 @@ var completed = false;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
 
   v.currentTime=seekTime;
   v.play();
-  return false;
 }
 
 function seekStarted() {
   if (completed)
-    return false;
+    return;
 
   ok(v.currentTime >= seekTime - 0.1, "Video currentTime should be around " + seekTime + ": " + v.currentTime);
   startPassed = true;
-  return false;
 }
 
 function seekEnded() {
   if (completed)
-    return false;
+    return;
 
   endPassed = true;
-  return false;
 }
 
 function playbackEnded() {
   if (completed)
-    return false
+    return;
 
   completed = true;
   ok(startPassed, "send seeking event");
@@ -42,7 +39,6 @@ function playbackEnded() {
   ok(v.ended, "Checking playback has ended");
   ok(Math.abs(v.currentTime - v.duration) <= 0.1, "Checking currentTime at end: " + v.currentTime);
   finish();
-  return false;
 }
 
 v.addEventListener("ended", playbackEnded, false);

content/media/test/seek3.js

@@ -7,10 +7,9 @@ var gotTimeupdate = false;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
 
   v.currentTime=seekTime;
-  return false;
 }
 
 function timeupdate() {
@@ -20,24 +19,22 @@ function timeupdate() {
 
 function seekStarted() {
   if (completed)
-    return false;
+    return;
 
   ok(v.currentTime >= seekTime - 0.1, "Video currentTime should be around " + seekTime + ": " + v.currentTime);
   v.addEventListener("timeupdate", timeupdate, false);
   startPassed = true;
-  return false;
 }
 
 function seekEnded() {
   if (completed)
-    return false;
+    return;
 
   var t = v.currentTime;
   ok(Math.abs(t - seekTime) <= 0.1, "Video currentTime should be around " + seekTime + ": " + t);
   ok(gotTimeupdate, "Should have got timeupdate between seeking and seekended");
   completed = true;
   finish();
-  return false;
 }
 
 v.addEventListener("loadedmetadata", startTest, false);

content/media/test/seek4.js

@@ -6,16 +6,15 @@ var completed = false;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
 
   v.currentTime=seekTime;
   v._seekTarget=seekTime;
-  return false;
 }
 
 function seekStarted() {
   if (completed)
-    return false;
+    return;
 
   seekCount += 1;
 
@@ -25,20 +24,17 @@ function seekStarted() {
     v.currentTime=seekTime/2;
     v._seekTarget=seekTime/2;
   }
-  return false;
 }
 
 function seekEnded() {
   if (completed)
-    return false;
+    return;
 
   if (seekCount == 2) {
     ok(Math.abs(v.currentTime - seekTime/2) <= 0.1, "seek on target: " + v.currentTime);
     completed = true;
     finish();
   }
-
-  return false;
 }
 
 v.addEventListener("loadedmetadata", startTest, false);

content/media/test/seek5.js

@@ -7,36 +7,32 @@ var completed = false;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
 
   v.currentTime=seekTime;
-  return false;
 }
 
 function seekStarted() {
   if (completed)
-    return false;
+    return;
   ok(v.currentTime >= seekTime - 0.1, "Video currentTime should be around " + seekTime + ": " + v.currentTime);
   startPassed = true;
   v.play();
-  return false;
 }
 
 function seekEnded() {
   if (completed)
-    return false;
+    return;
   endPassed = true;
-  return false;
 }
 
 function playbackEnded() {
   if (completed)
-    return false;
+    return;
   ok(startPassed, "Got seeking event");
   ok(endPassed, "Got seeked event");
   completed = true;
   finish();
-  return false;
 }
 
 v.addEventListener("ended", playbackEnded, false);

content/media/test/seek6.js

@@ -13,15 +13,14 @@ function poll() {
 
 function startTest() {
   if (completed)
-    return false;
+    return;
   interval = setInterval(poll, 10);
   v.currentTime = Math.random() * v.duration;
-  return false;
 }
 
 function seekEnded() {
   if (completed)
-    return false;
+    return;
 
   seekCount++;
   ok(true, "Seek " + seekCount);
@@ -32,7 +31,6 @@ function seekEnded() {
   } else {
     v.currentTime = Math.random() * v.duration;
   }
-  return false;
 }
 
 v.addEventListener("loadedmetadata", startTest, false);

content/media/test/seek7.js

@@ -9,7 +9,7 @@ var thrown3 = false;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
 
   try {
     v.currentTime = NaN;
@@ -27,7 +27,6 @@ function startTest() {
   ok(thrown1, "Setting currentTime to invalid value of NaN");
   ok(thrown3, "Setting currentTime to invalid value of a function");
   finish();
-  return false;
 }
 
 v.addEventListener("loadedmetadata", startTest, false);

content/media/test/seek8.js

@@ -1,15 +1,10 @@
 function test_seek8(v, seekTime, is, ok, finish) {
 
-var completed = false;
-
 function startTest() {
   v.currentTime = 1000;
 }
 
 function seekEnded() {
-  if (completed)
-    return false;
-
   ok(Math.abs(v.currentTime - v.duration) < 0.2,
      "currentTime " + v.currentTime + " close to " + v.duration);
   finish();

content/media/test/seek9.js

@@ -1,15 +1,10 @@
 function test_seek9(v, seekTime, is, ok, finish) {
 
-var completed = false;
-
 function startTest() {
   v.currentTime = -1000;
 }
 
 function seekEnded() {
-  if (completed)
-    return false;
-
   is(v.currentTime, 0, "currentTime clamped to 0");
   finish();
 }

content/media/test/test_buffered.html

@@ -69,8 +69,6 @@ function ended(e) {
   v.src = "";
   v.parentNode.removeChild(v);
   manager.finished(v.token);
-
-  return false;
 }
 
 function startTest(test, token) {

content/media/test/test_bug448534.html

@@ -20,29 +20,26 @@ var manager = new MediaTestManager;
 function loaded(event) {
   var v = event.target;
   if (v._finished)
-    return false;
+    return;
   v.play();
-  return false;
 }
 
 function started(event) {
   var v = event.target;
   if (v._finished)
-    return false;
+    return;
   ok(!v.paused, "Video should not be paused while playing");
   v.parentNode.removeChild(v);
   v._played = true;
-  return false;
 }
 
 function stopped(event) {
   var v = event.target;
   if (v._finished)
-    return false;
+    return;
   v._finished = true;
   ok(v.paused, "Video should be paused after removing from the Document");
   manager.finished(v.token);
-  return false;
 }
 
 

content/media/test/test_bug686942.html

@@ -20,7 +20,7 @@ var manager = new MediaTestManager;
 function onloaded(event) {
   var v = event.target;
   v.currentTime = v.duration;
-  return false;
+  return;
 }
 
 function checkNotPlaying(v) {
@@ -32,16 +32,14 @@ function checkNotPlaying(v) {
 function onseeked(event) {
   var v = event.target;
   setTimeout(function() { checkNotPlaying(v); }, 500);
-  return false;
 }
 
 function onended(event) {
   var v = event.target;
   if (v._finished)
-    return false;
+    return;
   v.addEventListener("seeked", onseeked, false);
   v.currentTime = 0;
-  return false;
 }
 
 function startTest(test, token) {

content/media/test/test_replay_metadata.html

@@ -47,7 +47,6 @@ function loadedMetaData(evt) {
   ok(v._loadedMetaDataCount <= 1, "No more than 1 onloadedmetadata event for " + v._name);
   checkMetadata(v._name, v, v._test);
   v.play();
-  return false;
 }
 
 function playing(evt) {
@@ -76,7 +75,6 @@ function playbackEnded(evt) {
     v.parentNode.removeChild(v);
     manager.finished(v.token);
   }  
-  return false;
 }
 
 function startTest(test, token) {

content/media/test/test_video_to_canvas.html

@@ -37,7 +37,6 @@ function loaded(e) {
   v._finished = true;
   v.parentNode.removeChild(v);
   manager.finished(v.token);
-  return false;
 }
 
 function startTest(test, token) {

content/media/test/test_wav_ended1.html

@@ -14,15 +14,14 @@ var completed = false;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
   var v = document.getElementById('v');
   v.play();
-  return false;
 }
 
 function playbackEnded() {
   if (completed)
-    return false
+    return;
 
   var v = document.getElementById('v');
   completed = true;
@@ -30,7 +29,6 @@ function playbackEnded() {
      "Checking currentTime at end: " + v.currentTime);
   ok(v.ended, "Checking playback has ended");
   SimpleTest.finish();
-  return false;
 }
 
 SimpleTest.waitForExplicitFinish();

content/media/test/test_wav_ended2.html

@@ -16,23 +16,22 @@ var endCount = 0;
 
 function startTest() {
   if (completed)
-    return false;
+    return;
 
   var v = document.getElementById('v');
   v.play();
-  return false;
 }
 
 function playbackStarted() {
   if (completed)
-    return false;
+    return;
 
   playingCount++;
 }
 
 function playbackEnded() {
   if (completed)
-    return false
+    return;
 
   endCount++;
   var v = document.getElementById('v');
@@ -48,7 +47,6 @@ function playbackEnded() {
     completed = true;
     SimpleTest.finish();
   }
-  return false;
 }
 
 SimpleTest.waitForExplicitFinish();

content/media/test/test_wave_data_s16.html

@@ -14,7 +14,7 @@ var completed = false;
 
 function audioavailable(e) {
   if (completed)
-    return false;
+    return;
 
   completed = true;
   var samples = e.frameBuffer;
@@ -29,16 +29,14 @@ function audioavailable(e) {
 
   // Only care about the first few samples
   SimpleTest.finish();
-  return false;
 }
 
 function startTest() {
   if (completed)
-    return false;
+    return;
   var v = document.getElementById('v');
   v.addEventListener('MozAudioAvailable', audioavailable, false);
   v.play();
-  return false;
 }
 
 SimpleTest.waitForExplicitFinish();

content/media/test/test_wave_data_u8.html

@@ -14,7 +14,7 @@ var completed = false;
 
 function audioavailable(e) {
   if (completed)
-    return false;
+    return;
 
   completed = true;
   var samples = e.frameBuffer;
@@ -29,16 +29,14 @@ function audioavailable(e) {
 
   // Only care about the first few samples
   SimpleTest.finish();
-  return false;
 }
 
 function startTest() {
   if (completed)
-    return false;
+    return;
   var v = document.getElementById('v');
   v.addEventListener('MozAudioAvailable', audioavailable, false);
   v.play();
-  return false;
 }
 
 SimpleTest.waitForExplicitFinish();