Rebaseline media tests after http://trac.webkit.org/changeset/50063 .

The load event was changed to canplaythrough.

Review URL: http://codereview.chromium.org/345004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30294 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 63 insertions, 152 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-constructor-autobuffer-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-constructor-autobuffer-expected.txt
deleted file mode 100644
index efc10a3..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-constructor-autobuffer-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Test that Audio() sets 'autobuffer' attribute.
-
-RUN(mediaElement = new Audio())
-
-++ Test initial attribute value
-EXPECTED (mediaElement.getAttribute('autobuffer') != 'null') OK
-EXPECTED (mediaElement.autobuffer == 'true') OK
-
-RUN(mediaElement.src = 'content/test.oga')
-RUN(mediaElement.load())
-
-++ Test after 'load' event
-EXPECTED (mediaElement.getAttribute('autobuffer') != 'null') OK
-EXPECTED (mediaElement.autobuffer == 'true') OK
-END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-canvas-source-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-canvas-source-expected.txt
deleted file mode 100644
index 14fc33d..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-canvas-source-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Test to ensure we don't taint a canvas when drawing from a video the uses source elements rather than the src attribute
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
- 
-PASS !!ctx.getImageData(0, 0, width, height) is true
-RUN(var source = document.createElement('source'); source.src = 'content/counting.ogv'; video.appendChild(source))
-EVENT(load)
-END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-seekable-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-seekable-expected.txt
deleted file mode 100644
index a197e75..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-seekable-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-EXPECTED (video.seekable.length == '0') OK
-TEST(video.seekable.start(-1)) THROWS(DOMException.INDEX_SIZE_ERR) OK
-TEST(video.seekable.end(-1)) THROWS(DOMException.INDEX_SIZE_ERR) OK
-TEST(video.seekable.start(0)) THROWS(DOMException.INDEX_SIZE_ERR) OK
-TEST(video.seekable.end(0)) THROWS(DOMException.INDEX_SIZE_ERR) OK
-EVENT(load)
-EXPECTED (video.seekable.length == '1') OK
-EXPECTED (video.seekable.start(0) == '0') OK
-EXPECTED (video.seekable.end(0) > '0') OK
-TEST(video.seekable.start(-1)) THROWS(DOMException.INDEX_SIZE_ERR) OK
-TEST(video.seekable.end(-1)) THROWS(DOMException.INDEX_SIZE_ERR) OK
-TEST(video.seekable.start(1)) THROWS(DOMException.INDEX_SIZE_ERR) OK
-TEST(video.seekable.end(1)) THROWS(DOMException.INDEX_SIZE_ERR) OK
-END OF TEST
-
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-autobuffer-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-autobuffer-expected.txt
index efc10a3..d0de237 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-autobuffer-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-autobuffer-expected.txt
@@ -9,7 +9,7 @@ EXPECTED (mediaElement.autobuffer == 'true') OK
 RUN(mediaElement.src = 'content/test.oga')
 RUN(mediaElement.load())
 
-++ Test after 'load' event
+++ Test after 'canplaythrough' event
 EXPECTED (mediaElement.getAttribute('autobuffer') != 'null') OK
 EXPECTED (mediaElement.autobuffer == 'true') OK
 END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-expected.txt
index 08cc242..6a72b53 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-expected.txt
@@ -4,6 +4,5 @@ EXPECTED (audio instanceof HTMLAudioElement == 'true') OK
 RUN(audio.load())
 EVENT(loadstart)
 EXPECTED (relativeURL(audio.currentSrc) == 'content/test.oga') OK
-EVENT(load)
+EVENT(canplaythrough)
 END OF TEST
-
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-append-source-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-append-source-expected.txt
index 8abc557..603db05 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-append-source-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-append-source-expected.txt
@@ -1,6 +1,5 @@
 EXPECTED (video.currentSrc == '') OK
 EXPECTED (video.currentSrc == '') OK
-EVENT(load)
+EVENT(canplaythrough)
 EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
 END OF TEST
-
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-canvas-source-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-canvas-source-expected.txt
index 14fc33d..0b358a3 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-canvas-source-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-canvas-source-expected.txt
@@ -6,5 +6,5 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
  
 PASS !!ctx.getImageData(0, 0, width, height) is true
 RUN(var source = document.createElement('source'); source.src = 'content/counting.ogv'; video.appendChild(source))
-EVENT(load)
+EVENT(canplaythrough)
 END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-dom-src-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-dom-src-expected.txt
index 8abc557..603db05 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-dom-src-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-dom-src-expected.txt
@@ -1,6 +1,5 @@
 EXPECTED (video.currentSrc == '') OK
 EXPECTED (video.currentSrc == '') OK
-EVENT(load)
+EVENT(canplaythrough)
 EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
 END OF TEST
-
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-error-abort-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-error-abort-expected.txt
deleted file mode 100644
index 18d6bc3..0000000
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-error-abort-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-EXPECTED (video.error == 'null') OK
-EVENT(loadstart)
-EVENT(abort)
-EXPECTED (video.error.code == '1') OK
-EVENT(loadstart)
-EVENT(load)
-EXPECTED (video.error == 'null') OK
-END OF TEST
-
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-seek-past-end-paused-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-seek-past-end-paused-expected.txt
index d4240c5..f8d8f7e 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-seek-past-end-paused-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-seek-past-end-paused-expected.txt
@@ -3,7 +3,7 @@ Test that seeking paused video past it's duration time sets currentTime to durat
 RUN(video.src = 'content/test.ogv')
 RUN(video.load())
 
-EVENT(load)
+EVENT(canplaythrough)
 EXPECTED (video.paused == 'true') OK
 EXPECTED (video.ended == 'false') OK
 RUN(video.play())
@@ -15,4 +15,3 @@ EXPECTED (mediaElement.currentTime == 'mediaElement.duration') OK
 EXPECTED (video.ended == 'true') OK
 
 END OF TEST
-
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-change-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-change-expected.txt
index d43e688..d17441f 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-change-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-change-expected.txt
@@ -1,6 +1,6 @@
 1. Test that an invalid src attribute fires an error when the file fails to load.
 2. Test that changing src attribute triggers load after a load fails.
-3. Test that changing src does not trigger load once a file is loaded.
+3. Test that changing src does not trigger load once a file is known to be valid.
 
 
 EVENT(error)
@@ -17,4 +17,3 @@ EXPECTED (isNaN(video.duration) == 'false') OK
 RUN(video.setAttribute('src', 'content/silence.mpg'))
 
 END OF TEST
-
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-autobuffer-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-autobuffer-expected.txt
index efc10a3..d0de237 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-autobuffer-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-autobuffer-expected.txt
@@ -9,7 +9,7 @@ EXPECTED (mediaElement.autobuffer == 'true') OK
 RUN(mediaElement.src = 'content/test.oga')
 RUN(mediaElement.load())
 
-++ Test after 'load' event
+++ Test after 'canplaythrough' event
 EXPECTED (mediaElement.getAttribute('autobuffer') != 'null') OK
 EXPECTED (mediaElement.autobuffer == 'true') OK
 END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-expected.txt
index f4752e5..6a72b53 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-expected.txt
@@ -1,9 +1,8 @@
-Test that Audio() object loads the resource after src attribute is set and load() is called.

-

-EXPECTED (audio instanceof HTMLAudioElement == 'true') OK

-RUN(audio.load())

-EVENT(loadstart)

-EXPECTED (relativeURL(audio.currentSrc) == 'content/test.oga') OK

-EVENT(load)

-END OF TEST

-

+Test that Audio() object loads the resource after src attribute is set and load() is called.
+
+EXPECTED (audio instanceof HTMLAudioElement == 'true') OK
+RUN(audio.load())
+EVENT(loadstart)
+EXPECTED (relativeURL(audio.currentSrc) == 'content/test.oga') OK
+EVENT(canplaythrough)
+END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-append-source-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-append-source-expected.txt
index b8da28a..603db05 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-append-source-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-append-source-expected.txt
@@ -1,6 +1,5 @@
-EXPECTED (video.currentSrc == '') OK

-EXPECTED (video.currentSrc == '') OK

-EVENT(load)

-EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK

-END OF TEST

-

+EXPECTED (video.currentSrc == '') OK
+EXPECTED (video.currentSrc == '') OK
+EVENT(canplaythrough)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-canvas-source-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-canvas-source-expected.txt
index 14fc33d..0b358a3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-canvas-source-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-canvas-source-expected.txt
@@ -6,5 +6,5 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
  
 PASS !!ctx.getImageData(0, 0, width, height) is true
 RUN(var source = document.createElement('source'); source.src = 'content/counting.ogv'; video.appendChild(source))
-EVENT(load)
+EVENT(canplaythrough)
 END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-expected.txt
deleted file mode 100644
index 1d7bdb0..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Test 'controls' attribute

-

-EXPECTED (video.controls != 'null') OK

-EVENT(load)

-EXPECTED (video.controls != 'null') OK

-RUN(video.removeAttribute('controls'))

-EXPECTED (video.controls == 'false') OK

-RUN(video.controls = true)

-EXPECTED (video.getAttribute('controls') == 'controls') OK

-RUN(video.controls = false)

-EXPECTED (video.controls == 'false') OK

-RUN(video.setAttribute('controls','controls'))

-EXPECTED (video.controls != 'null') OK

-END OF TEST

-

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-dom-src-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-dom-src-expected.txt
index b8da28a..603db05 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-dom-src-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-dom-src-expected.txt
@@ -1,6 +1,5 @@
-EXPECTED (video.currentSrc == '') OK

-EXPECTED (video.currentSrc == '') OK

-EVENT(load)

-EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK

-END OF TEST

-

+EXPECTED (video.currentSrc == '') OK
+EXPECTED (video.currentSrc == '') OK
+EVENT(canplaythrough)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-seek-past-end-paused-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-seek-past-end-paused-expected.txt
index 641ec41..f8d8f7e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-seek-past-end-paused-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-seek-past-end-paused-expected.txt
@@ -1,18 +1,17 @@
-Test that seeking paused video past it's duration time sets currentTime to duration and leaves video paused.

-

-RUN(video.src = 'content/test.ogv')

-RUN(video.load())

-

-EVENT(load)

-EXPECTED (video.paused == 'true') OK

-EXPECTED (video.ended == 'false') OK

-RUN(video.play())

-

-EXPECTED (video.paused == 'false') OK

-EXPECTED (mediaElement.currentTime > '0') OK

-

-EXPECTED (mediaElement.currentTime == 'mediaElement.duration') OK

-EXPECTED (video.ended == 'true') OK

-

-END OF TEST

-

+Test that seeking paused video past it's duration time sets currentTime to duration and leaves video paused.
+
+RUN(video.src = 'content/test.ogv')
+RUN(video.load())
+
+EVENT(canplaythrough)
+EXPECTED (video.paused == 'true') OK
+EXPECTED (video.ended == 'false') OK
+RUN(video.play())
+
+EXPECTED (video.paused == 'false') OK
+EXPECTED (mediaElement.currentTime > '0') OK
+
+EXPECTED (mediaElement.currentTime == 'mediaElement.duration') OK
+EXPECTED (video.ended == 'true') OK
+
+END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-change-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-change-expected.txt
index 2f5faab..d17441f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-change-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-change-expected.txt
@@ -1,20 +1,19 @@
-1. Test that an invalid src attribute fires an error when the file fails to load.

-2. Test that changing src attribute triggers load after a load fails.

-3. Test that changing src does not trigger load once a file is loaded.

-

-

-EVENT(error)

-EXPECTED (relativeURL(video.currentSrc) == 'bogus') OK

-EXPECTED (video.networkState == '4') OK

-EXPECTED (video.error.code == '4') OK

-

-RUN(video.setAttribute('src', 'content/test.ogv'))

-

-EVENT(loadedmetadata)

-EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK

-EXPECTED (isNaN(video.duration) == 'false') OK

-

-RUN(video.setAttribute('src', 'content/silence.mpg'))

-

-END OF TEST

-

+1. Test that an invalid src attribute fires an error when the file fails to load.
+2. Test that changing src attribute triggers load after a load fails.
+3. Test that changing src does not trigger load once a file is known to be valid.
+
+
+EVENT(error)
+EXPECTED (relativeURL(video.currentSrc) == 'bogus') OK
+EXPECTED (video.networkState == '4') OK
+EXPECTED (video.error.code == '4') OK
+
+RUN(video.setAttribute('src', 'content/test.ogv'))
+
+EVENT(loadedmetadata)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+EXPECTED (isNaN(video.duration) == 'false') OK
+
+RUN(video.setAttribute('src', 'content/silence.mpg'))
+
+END OF TEST
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index de79814..ab59928 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3218,27 +3218,12 @@ BUG_TONY LINUX DEBUG : LayoutTests/media/controls-drag-timebar.html = CRASH FAIL
 // WebKit roll 49992:49997
 // hclam to add expected results.
 BUG_HCLAM SKIP : LayoutTests/media/video-volume-slider.html = FAIL
-// scherkus to add expected results.
-BUG_SCHERKUS : LayoutTests/media/video-pause-immediately.html = FAIL
 
 // New flaky crashing tests
 BUG25747 WIN : LayoutTests/fast/xmlhttprequest/xmlhttprequest-invalid-values.html = CRASH PASS
 BUG25747 MAC : LayoutTests/fast/forms/tabbing-input-iframe.html = CRASH PASS
 BUG25747 LINUX : LayoutTests/fast/overflow/scroll-vertical-not-horizontal.html = CRASH PASS
 
-// WebKit roll 50027:50073
-// HTML5 media element 'load' removed: http://trac.webkit.org/changeset/50063
-BUG_TONY : LayoutTests/media/audio-constructor-autobuffer.html = FAIL
-BUG_TONY : LayoutTests/media/audio-constructor.html = FAIL
-BUG_TONY : LayoutTests/media/video-append-source.html = FAIL
-BUG_TONY : LayoutTests/media/video-canvas-source.html = FAIL
-BUG_TONY : LayoutTests/media/video-controls.html = FAIL
-BUG_TONY : LayoutTests/media/video-dom-src.html = FAIL
-BUG_TONY : LayoutTests/media/video-seek-past-end-paused.html = FAIL
-BUG_TONY : LayoutTests/media/video-src-change.html = FAIL
-BUG_TONY LINUX : LayoutTests/media/video-seekable.html = FAIL
-BUG_TONY MAC : LayoutTests/media/video-error-abort.html = FAIL
-
 // WebKit roll 50073:50101
 // jorlow to add expected results.
 BUG_JORLOW : LayoutTests/storage/domstorage/documentURI.html = FAIL