summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 18:22:40 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 18:22:40 +0000
commit0f613db3a659bba8cc7b4b9f1df228cc9fb2fdea (patch)
treefdba930533b47de270093945ded18bbc3e379d7e /content/test
parent91f107cc2636343662a67d15fbb29f91076f90b2 (diff)
downloadchromium_src-0f613db3a659bba8cc7b4b9f1df228cc9fb2fdea.zip
chromium_src-0f613db3a659bba8cc7b4b9f1df228cc9fb2fdea.tar.gz
chromium_src-0f613db3a659bba8cc7b4b9f1df228cc9fb2fdea.tar.bz2
Remove transition to INITIALIZED & clearing of end_of_stream_ on seek.
BUG=165304 TEST=ChunkDemuxerTest.TestEndOfStreamDuringCanceledSeek, ChunkDemuxerTest.TestEndOfStreamStillSetAfterSeek Review URL: https://chromiumcodereview.appspot.com/11511011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/data/media/encrypted_frame_size_change.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/test/data/media/encrypted_frame_size_change.html b/content/test/data/media/encrypted_frame_size_change.html
index 3c2e7ec..e098bb2 100644
--- a/content/test/data/media/encrypted_frame_size_change.html
+++ b/content/test/data/media/encrypted_frame_size_change.html
@@ -30,7 +30,8 @@
video.addEventListener('pause', function() {
video.addEventListener('seeked', function() {
- mediaSource.endOfStream();
+ if (mediaSource.readyState != "ended")
+ mediaSource.endOfStream();
if (!firstVideoSeek) {
setDocTitle('One video seeked.');
firstVideoSeek = true;