diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 19:39:21 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 19:39:21 +0000 |
| commit | 9b8d21246b55fcdb8117cce72e432b9b771f53db (patch) | |
| tree | d58a6be05c00f719e76ad9c4cd2835da9455af41 /webkit/data/layout_tests | |
| parent | d2ad262d31b75f74e9500500459e48724be599bc (diff) | |
| download | chromium_src-9b8d21246b55fcdb8117cce72e432b9b771f53db.zip chromium_src-9b8d21246b55fcdb8117cce72e432b9b771f53db.tar.gz chromium_src-9b8d21246b55fcdb8117cce72e432b9b771f53db.tar.bz2 | |
Rebaseline some media tests to reflect the upstream changes.
Media tests have been updated not to use 'load' event
in WebKit (http://trac.webkit.org/changeset/50063), and
the change needs to be reflected in chromium.
BUG=13907
TEST=none
Review URL: http://codereview.chromium.org/434114
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data/layout_tests')
6 files changed, 4 insertions, 33 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/media-load-event-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/media-load-event-expected.txt deleted file mode 100644 index 4e54bbf..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/media-load-event-expected.txt +++ /dev/null @@ -1,19 +0,0 @@ -Test that media file is not reloaded when an element is inserted into the DOM. - -RUN(mediaElement = document.createElement('audio')) -RUN(mediaElement.src = 'content/test.oga') -RUN(mediaElement.load()) - -EVENT(loadstart) -EVENT(durationchange) -EVENT(loadeddata) -EVENT(canplaythrough) - -RUN(document.getElementById('parent').appendChild(mediaElement)) -RUN(mediaElement.play()) - -EVENT(load) -EVENT(play) -EVENT(playing) - -END OF TEST diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-currentTime-set-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-currentTime-set-expected.txt deleted file mode 100644 index 6491f4f..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-currentTime-set-expected.txt +++ /dev/null @@ -1,10 +0,0 @@ -Test that setting currentTime changes the time, and that 'ended' event is fired in a reasonable amount of time - -EVENT(load) -EXPECTED (video.currentTime == '0') OK -RUN(video.currentTime = video.duration - 0.2) -EXPECTED (video.currentTime.toFixed(2) == '5.82') OK -RUN(video.play()) - -EVENT(ended) -END OF TEST diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/media-load-event-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/media-load-event-expected.txt index 4e54bbf..a1c3817 100644 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/media-load-event-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/media-load-event-expected.txt @@ -12,7 +12,7 @@ EVENT(canplaythrough) RUN(document.getElementById('parent').appendChild(mediaElement)) RUN(mediaElement.play()) -EVENT(load) +EVENT(canplaythrough) EVENT(play) EVENT(playing) diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-currentTime-set-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-currentTime-set-expected.txt index 6491f4f..4335c6d 100644 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-currentTime-set-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-currentTime-set-expected.txt @@ -1,6 +1,6 @@ Test that setting currentTime changes the time, and that 'ended' event is fired in a reasonable amount of time -EVENT(load) +EVENT(canplaythrough) EXPECTED (video.currentTime == '0') OK RUN(video.currentTime = video.duration - 0.2) EXPECTED (video.currentTime.toFixed(2) == '5.82') OK diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/media-load-event-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/media-load-event-expected.txt index 4e54bbf..a1c3817 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/media-load-event-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/media-load-event-expected.txt @@ -12,7 +12,7 @@ EVENT(canplaythrough) RUN(document.getElementById('parent').appendChild(mediaElement)) RUN(mediaElement.play()) -EVENT(load) +EVENT(canplaythrough) EVENT(play) EVENT(playing) diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-currentTime-set-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-currentTime-set-expected.txt index 6491f4f..4335c6d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-currentTime-set-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-currentTime-set-expected.txt @@ -1,6 +1,6 @@ Test that setting currentTime changes the time, and that 'ended' event is fired in a reasonable amount of time -EVENT(load) +EVENT(canplaythrough) EXPECTED (video.currentTime == '0') OK RUN(video.currentTime = video.duration - 0.2) EXPECTED (video.currentTime.toFixed(2) == '5.82') OK |