Index: chrome/test/data/media/html/media_basic_playback.html |
diff --git a/chrome/test/data/media/html/media_basic_playback.html b/chrome/test/data/media/html/media_basic_playback.html |
index f5df358f0e90cd146080c819b0707720d96c53d4..e09263985cf087bea2e76b95c8c5685ed534f2f3 100644 |
--- a/chrome/test/data/media/html/media_basic_playback.html |
+++ b/chrome/test/data/media/html/media_basic_playback.html |
@@ -16,10 +16,18 @@ |
// Used to keep track of events. |
var events = []; |
Ami GONE FROM CHROMIUM
2012/01/31 20:26:16
Init unnecessary since startTest() does it anyway.
DaleCurtis
2012/01/31 22:31:55
Done.
|
+ // List of events to log. |
Ami GONE FROM CHROMIUM
2012/01/31 20:26:16
I worry this will be flaky b/c it's overly specifi
DaleCurtis
2012/01/31 22:31:55
Discussed offline. Events in this list are those w
|
+ var eventsToLog = [ |
+ 'abort', 'emptied', 'error', 'playing', 'stalled', 'suspend', |
Ami GONE FROM CHROMIUM
2012/01/31 20:26:16
2-space indent
DaleCurtis
2012/01/31 22:31:55
Done.
|
+ 'waiting']; |
+ |
function logEvent(evt) { |
events.push(evt.type); |
} |
+ for(var i = 0; i < eventsToLog.length; i++) |
+ video.addEventListener(eventsToLog[i], logEvent, false); |
+ |
video.addEventListener('ended', function(event) { |
firstEndedEvent = events.indexOf('ended') < 0; |
logEvent(event); |
@@ -27,11 +35,7 @@ |
// At the end of the first playback, seek near end and replay. |
if (firstEndedEvent) { |
video.currentTime = 0.8 * video.duration; |
- video.play(); |
} else { |
- // PyAuto has trouble with arrays, so convert to string. |
- events = events.join(','); |
- |
// Notify PyAuto that we've completed testing. Send test of currentTime |
// at the same time for efficiency. |
window.domAutomationController.send( |
@@ -39,13 +43,14 @@ |
} |
}, false); |
- video.addEventListener('playing', logEvent, false); |
- video.addEventListener('error', logEvent, false); |
- video.addEventListener('abort', logEvent, false); |
- video.addEventListener('seeked', logEvent, false); |
+ video.addEventListener('seeked', function(event) { |
+ logEvent(event); |
+ video.play(); |
+ }, false); |
- // Retrieve video file name from URL query parameters. See utils.js. |
- video.src = '../' + QueryString.media; |
- video.play(); |
+ function startTest(media) { |
+ events = []; |
+ video.src = '../' + media; |
+ } |
</script> |
</html> |