[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric.carlson at apple.com
eric.carlson at apple.com
Thu Oct 29 20:52:05 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 08d7d4886a08ced8e18ad1203ad04bf22677aab3
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 26 15:27:57 2009 +0000
2009-10-26 Eric Carlson <eric.carlson at apple.com>
Reviewed by Eric Seidel.
Remove HTML5 media element 'load' event
https://bugs.webkit.org/show_bug.cgi?id=30464
Part 1, change layout tests to not use the event.
* media/audio-constructor-autobuffer-expected.txt:
* media/audio-constructor-autobuffer.html:
* media/audio-constructor-expected.txt:
* media/audio-constructor-src-expected.txt:
* media/audio-constructor-src.html:
* media/audio-constructor.html:
* media/audio-controls-rendering.html:
* media/audio-data-url-expected.txt:
* media/audio-data-url.html:
* media/audio-mpeg-supported-expected.txt:
* media/audio-mpeg-supported.html:
* media/media-load-event-expected.txt:
* media/media-load-event.html:
* media/progress-event-expected.txt:
* media/progress-event-total-expected.txt:
* media/progress-event-total.html:
* media/progress-event.html:
* media/remove-from-document-expected.txt:
* media/remove-from-document-no-load-expected.txt:
* media/remove-from-document-no-load.html:
* media/remove-from-document.html:
* media/restore-from-page-cache-expected.txt:
* media/restore-from-page-cache.html:
* media/video-append-source-expected.txt:
* media/video-append-source.html:
* media/video-buffered-expected.txt:
* media/video-buffered.html:
* media/video-canvas-source-expected.txt:
* media/video-canvas-source.html:
* media/video-controls-expected.txt:
* media/video-controls-transformed-expected.txt:
* media/video-controls-transformed.html:
* media/video-controls-zoomed-expected.txt:
* media/video-controls-zoomed.html:
* media/video-controls.html:
* media/video-currentTime-expected.txt:
* media/video-currentTime-set-expected.txt:
* media/video-currentTime-set.html:
* media/video-currentTime-set2-expected.txt:
* media/video-currentTime-set2.html:
* media/video-currentTime.html:
* media/video-dom-src-expected.txt:
* media/video-dom-src.html:
* media/video-error-abort-expected.txt:
* media/video-error-abort.html:
* media/video-error-does-not-exist.html:
* media/video-muted-expected.txt:
* media/video-muted.html:
* media/video-no-autoplay-expected.txt:
* media/video-no-autoplay.html:
* media/video-seek-past-end-paused-expected.txt:
* media/video-seek-past-end-paused.html:
* media/video-seek-past-end-playing-expected.txt:
* media/video-seek-past-end-playing.html:
* media/video-seekable-expected.txt:
* media/video-seekable.html:
* media/video-seeking-expected.txt:
* media/video-seeking.html:
* media/video-src-change-expected.txt:
* media/video-src-change.html:
* media/video-volume-expected.txt:
* media/video-volume.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50063 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b11fc99..46f4d06 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,75 @@
+2009-10-26 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Eric Seidel.
+
+ Remove HTML5 media element 'load' event
+ https://bugs.webkit.org/show_bug.cgi?id=30464
+
+ Part 1, change layout tests to not use the event.
+
+ * media/audio-constructor-autobuffer-expected.txt:
+ * media/audio-constructor-autobuffer.html:
+ * media/audio-constructor-expected.txt:
+ * media/audio-constructor-src-expected.txt:
+ * media/audio-constructor-src.html:
+ * media/audio-constructor.html:
+ * media/audio-controls-rendering.html:
+ * media/audio-data-url-expected.txt:
+ * media/audio-data-url.html:
+ * media/audio-mpeg-supported-expected.txt:
+ * media/audio-mpeg-supported.html:
+ * media/media-load-event-expected.txt:
+ * media/media-load-event.html:
+ * media/progress-event-expected.txt:
+ * media/progress-event-total-expected.txt:
+ * media/progress-event-total.html:
+ * media/progress-event.html:
+ * media/remove-from-document-expected.txt:
+ * media/remove-from-document-no-load-expected.txt:
+ * media/remove-from-document-no-load.html:
+ * media/remove-from-document.html:
+ * media/restore-from-page-cache-expected.txt:
+ * media/restore-from-page-cache.html:
+ * media/video-append-source-expected.txt:
+ * media/video-append-source.html:
+ * media/video-buffered-expected.txt:
+ * media/video-buffered.html:
+ * media/video-canvas-source-expected.txt:
+ * media/video-canvas-source.html:
+ * media/video-controls-expected.txt:
+ * media/video-controls-transformed-expected.txt:
+ * media/video-controls-transformed.html:
+ * media/video-controls-zoomed-expected.txt:
+ * media/video-controls-zoomed.html:
+ * media/video-controls.html:
+ * media/video-currentTime-expected.txt:
+ * media/video-currentTime-set-expected.txt:
+ * media/video-currentTime-set.html:
+ * media/video-currentTime-set2-expected.txt:
+ * media/video-currentTime-set2.html:
+ * media/video-currentTime.html:
+ * media/video-dom-src-expected.txt:
+ * media/video-dom-src.html:
+ * media/video-error-abort-expected.txt:
+ * media/video-error-abort.html:
+ * media/video-error-does-not-exist.html:
+ * media/video-muted-expected.txt:
+ * media/video-muted.html:
+ * media/video-no-autoplay-expected.txt:
+ * media/video-no-autoplay.html:
+ * media/video-seek-past-end-paused-expected.txt:
+ * media/video-seek-past-end-paused.html:
+ * media/video-seek-past-end-playing-expected.txt:
+ * media/video-seek-past-end-playing.html:
+ * media/video-seekable-expected.txt:
+ * media/video-seekable.html:
+ * media/video-seeking-expected.txt:
+ * media/video-seeking.html:
+ * media/video-src-change-expected.txt:
+ * media/video-src-change.html:
+ * media/video-volume-expected.txt:
+ * media/video-volume.html:
+
2009-10-26 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/media/audio-constructor-autobuffer-expected.txt b/LayoutTests/media/audio-constructor-autobuffer-expected.txt
index ab6a13e..92a0f3a 100644
--- a/LayoutTests/media/audio-constructor-autobuffer-expected.txt
+++ b/LayoutTests/media/audio-constructor-autobuffer-expected.txt
@@ -9,7 +9,7 @@ EXPECTED (mediaElement.autobuffer == 'true') OK
RUN(mediaElement.src = 'content/test.wav')
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/LayoutTests/media/audio-constructor-autobuffer.html b/LayoutTests/media/audio-constructor-autobuffer.html
index ef8272f..40fd10a 100644
--- a/LayoutTests/media/audio-constructor-autobuffer.html
+++ b/LayoutTests/media/audio-constructor-autobuffer.html
@@ -5,9 +5,9 @@
<script>
- function loaded()
+ function canplaythrough()
{
- consoleWrite("++ Test after 'load' event");
+ consoleWrite("++ Test after 'canplaythrough' event");
testExpected("mediaElement.getAttribute('autobuffer')", null, "!=");
testExpected("mediaElement.autobuffer", true);
endTest();
@@ -23,7 +23,7 @@
testExpected("mediaElement.autobuffer", true);
consoleWrite("");
- mediaElement.onload = loaded;
+ mediaElement.addEventListener("canplaythrough", canplaythrough);
run("mediaElement.src = '" + findMediaFile("audio", "content/test") + "'");
run("mediaElement.load()");
diff --git a/LayoutTests/media/audio-constructor-expected.txt b/LayoutTests/media/audio-constructor-expected.txt
index 1656c57..341b32c 100644
--- a/LayoutTests/media/audio-constructor-expected.txt
+++ b/LayoutTests/media/audio-constructor-expected.txt
@@ -4,6 +4,6 @@ EXPECTED (audio instanceof HTMLAudioElement == 'true') OK
RUN(audio.load())
EVENT(loadstart)
EXPECTED (relativeURL(audio.currentSrc) == 'content/test.wav') OK
-EVENT(load)
+EVENT(canplaythrough)
END OF TEST
diff --git a/LayoutTests/media/audio-constructor-src-expected.txt b/LayoutTests/media/audio-constructor-src-expected.txt
index cbf074f..1378bb4 100644
--- a/LayoutTests/media/audio-constructor-src-expected.txt
+++ b/LayoutTests/media/audio-constructor-src-expected.txt
@@ -3,6 +3,6 @@ Test that Audio("url") constructor loads the specified resource.
EXPECTED (audio instanceof HTMLAudioElement == 'true') OK
EVENT(loadstart)
EXPECTED (relativeURL(audio.currentSrc) == 'content/test.wav') OK
-EVENT(load)
+EVENT(canplaythrough)
END OF TEST
diff --git a/LayoutTests/media/audio-constructor-src.html b/LayoutTests/media/audio-constructor-src.html
index cfb652a..c5657ee 100644
--- a/LayoutTests/media/audio-constructor-src.html
+++ b/LayoutTests/media/audio-constructor-src.html
@@ -10,5 +10,5 @@
waitForEvent("loadstart", function () { testExpected("relativeURL(audio.currentSrc)", "content/test.wav"); });
- waitForEventAndEnd("load");
+ waitForEventAndEnd("canplaythrough");
</script>
diff --git a/LayoutTests/media/audio-constructor.html b/LayoutTests/media/audio-constructor.html
index fd39425..5c13e26 100644
--- a/LayoutTests/media/audio-constructor.html
+++ b/LayoutTests/media/audio-constructor.html
@@ -13,7 +13,7 @@
var mediaFile = findMediaFile("audio", "content/test");
waitForEvent("loadstart", function () { testExpected("relativeURL(audio.currentSrc)", mediaFile); });
- waitForEventAndEnd("load");
+ waitForEventAndEnd("canplaythrough");
audio.src = mediaFile;
run("audio.load()");
diff --git a/LayoutTests/media/audio-controls-rendering.html b/LayoutTests/media/audio-controls-rendering.html
index b3e538f..43e0c1d 100644
--- a/LayoutTests/media/audio-controls-rendering.html
+++ b/LayoutTests/media/audio-controls-rendering.html
@@ -18,7 +18,7 @@
} , 8000);
}
var count = document.getElementsByTagName('audio').length;
- document.addEventListener("load", function () {
+ document.addEventListener("canplaythrough", function () {
if (!--count) {
document.body.offsetLeft;
if (window.layoutTestController)
diff --git a/LayoutTests/media/audio-data-url-expected.txt b/LayoutTests/media/audio-data-url-expected.txt
index cf55489..e2c2076 100644
--- a/LayoutTests/media/audio-data-url-expected.txt
+++ b/LayoutTests/media/audio-data-url-expected.txt
@@ -6,7 +6,6 @@ EVENT(loadedmetadata)
EVENT(loadeddata)
EVENT(canplay)
EVENT(canplaythrough)
-EVENT(load)
EXPECTED (mediaElement.duration.toFixed(2) == '2.94') OK
END OF TEST
diff --git a/LayoutTests/media/audio-data-url.html b/LayoutTests/media/audio-data-url.html
index 62453ad..9dd2b37 100644
--- a/LayoutTests/media/audio-data-url.html
+++ b/LayoutTests/media/audio-data-url.html
@@ -6,7 +6,7 @@
var data = "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";
- function loaded()
+ function canplaythrough()
{
testExpected("mediaElement.duration.toFixed(2)", 2.94);
endTest();
@@ -24,10 +24,8 @@
waitForEvent("loadedmetadata");
waitForEvent("loadeddata");
waitForEvent("canplay");
- waitForEvent("canplaythrough");
- waitForEvent("load");
+ waitForEvent("canplaythrough", canplaythrough);
- mediaElement.onload = loaded;
mediaElement.src = 'data:audio/3gpp;base64,' + data;
mediaElement.load();
}
diff --git a/LayoutTests/media/audio-mpeg-supported-expected.txt b/LayoutTests/media/audio-mpeg-supported-expected.txt
index f2aed5f..3888d05 100644
--- a/LayoutTests/media/audio-mpeg-supported-expected.txt
+++ b/LayoutTests/media/audio-mpeg-supported-expected.txt
@@ -1,6 +1,6 @@
Test that the audio element supports MPEG files.
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (mediaElement.currentTime == '0') OK
EVENT(play)
EXPECTED (mediaElement.currentTime > '0') OK
diff --git a/LayoutTests/media/audio-mpeg-supported.html b/LayoutTests/media/audio-mpeg-supported.html
index ea529d4..d412261 100644
--- a/LayoutTests/media/audio-mpeg-supported.html
+++ b/LayoutTests/media/audio-mpeg-supported.html
@@ -14,8 +14,8 @@
endTest();
});
- mediaElement.addEventListener('load', function() {
- consoleWrite("EVENT(load)");
+ mediaElement.addEventListener('canplaythrough', function() {
+ consoleWrite("EVENT(canplaythrough)");
testExpected("mediaElement.currentTime", 0);
mediaElement.play();
setTimeout(testCurrentTime, 500)
diff --git a/LayoutTests/media/media-load-event-expected.txt b/LayoutTests/media/media-load-event-expected.txt
index 27bb18c..189daeb 100644
--- a/LayoutTests/media/media-load-event-expected.txt
+++ b/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/LayoutTests/media/media-load-event.html b/LayoutTests/media/media-load-event.html
index aa7423b..e8382bd 100644
--- a/LayoutTests/media/media-load-event.html
+++ b/LayoutTests/media/media-load-event.html
@@ -28,12 +28,12 @@
mediaElement.setAttribute('onplaying', "playing()");
waitForEvent("loadstart");
- waitForEvent("load");
waitForEvent("waiting");
waitForEvent("ratechange");
waitForEvent("durationchange");
waitForEvent("pause");
waitForEvent("play");
+ waitForEvent("canplaythrough");
waitForEvent('loadeddata');
var mediaFile = findMediaFile("audio", "content/test");
diff --git a/LayoutTests/media/progress-event-expected.txt b/LayoutTests/media/progress-event-expected.txt
index eda87f4..72c0b26 100644
--- a/LayoutTests/media/progress-event-expected.txt
+++ b/LayoutTests/media/progress-event-expected.txt
@@ -2,9 +2,5 @@ EVENT(loadstart)
EXPECTED (!event.lengthComputable == 'true') OK
EXPECTED (event.total == '0') OK
EXPECTED (event.loaded == '0') OK
-EVENT(load)
-EXPECTED (event.lengthComputable == 'true') OK
-EXPECTED (event.loaded > '0') OK
-EXPECTED (event.total > '0') OK
END OF TEST
diff --git a/LayoutTests/media/progress-event-total-expected.txt b/LayoutTests/media/progress-event-total-expected.txt
index 4dc0936..818aab7 100644
--- a/LayoutTests/media/progress-event-total-expected.txt
+++ b/LayoutTests/media/progress-event-total-expected.txt
@@ -2,9 +2,8 @@ EVENT(loadstart)
EXPECTED (!event.lengthComputable == 'true') OK
EXPECTED (event.total == '0') OK
EXPECTED (event.loaded == '0') OK
-EVENT(load)
+EVENT(progress)
EXPECTED (event.lengthComputable == 'true') OK
EXPECTED (event.loaded > '0') OK
-SUCCESS: event.total is 103746 or 188483 or 192844 (Playback engine specific)
END OF TEST
diff --git a/LayoutTests/media/progress-event-total.html b/LayoutTests/media/progress-event-total.html
index a33baaa..ed4959e 100644
--- a/LayoutTests/media/progress-event-total.html
+++ b/LayoutTests/media/progress-event-total.html
@@ -12,20 +12,11 @@
testExpected("event.loaded", 0);
}
- function testOnLoad()
+ function testOnProgress()
{
consoleWrite("EVENT(" + event.type + ")");
testExpected("event.lengthComputable", true);
testExpected("event.loaded", 0, '>');
- var allowedTotalBytes = [103746, 188483, 192844];
- for (var i = 0; i < allowedTotalBytes.length; ++i) {
- if (event.total == allowedTotalBytes[i])
- break;
- }
- if (i < allowedTotalBytes.length)
- consoleWrite("SUCCESS: event.total is " + allowedTotalBytes.join(" or ") + " (Playback engine specific)");
- else
- consoleWrite("FAIL: event.total should not be " + event.total + " (should be " + allowedTotalBytes.join(" or ") + ")");
endTest();
}
@@ -40,7 +31,7 @@
<body onload="start()">
- <video controls onloadstart="testOnLoadStart()" onload="testOnLoad()">
+ <video controls onloadstart="testOnLoadStart()" onprogress="testOnProgress()">
</video>
</body>
diff --git a/LayoutTests/media/progress-event.html b/LayoutTests/media/progress-event.html
index 519d3f2..35cbff0 100644
--- a/LayoutTests/media/progress-event.html
+++ b/LayoutTests/media/progress-event.html
@@ -10,17 +10,9 @@
testExpected("!event.lengthComputable", true);
testExpected("event.total", 0);
testExpected("event.loaded", 0);
- }
-
- function testOnLoad()
- {
- consoleWrite("EVENT(" + event.type + ")");
- testExpected("event.lengthComputable", true);
- testExpected("event.loaded", 0, '>');
- testExpected("event.total", 0, '>');
endTest();
}
-
+
function start()
{
setSrcByTagName("video", findMediaFile("video", "content/test"));
@@ -31,7 +23,7 @@
<body onload="start()">
- <video controls onloadstart="testOnLoadStart()" onload="testOnLoad()">
+ <video controls onloadstart="testOnLoadStart()" >
</video>
</body>
diff --git a/LayoutTests/media/remove-from-document-expected.txt b/LayoutTests/media/remove-from-document-expected.txt
index 4e35898..8c84e9a 100644
--- a/LayoutTests/media/remove-from-document-expected.txt
+++ b/LayoutTests/media/remove-from-document-expected.txt
@@ -1,6 +1,6 @@
Test that removing a media element from the tree pauses playback but does not unload the media.
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.networkState == '3') OK
EXPECTED (video.paused == 'false') OK
RUN(document.body.removeChild(video))
diff --git a/LayoutTests/media/remove-from-document-no-load-expected.txt b/LayoutTests/media/remove-from-document-no-load-expected.txt
index 098adb3..d096282 100644
--- a/LayoutTests/media/remove-from-document-no-load-expected.txt
+++ b/LayoutTests/media/remove-from-document-no-load-expected.txt
@@ -1,4 +1,4 @@
-Test that removing a media element from the tree when no media has been loaded does not generate a load event.
+Test that removing a media element from the tree when no media has been loaded does not generate a loadstart event.
EXPECTED (video.networkState == '0') OK
RUN(document.body.removeChild(video))
diff --git a/LayoutTests/media/remove-from-document-no-load.html b/LayoutTests/media/remove-from-document-no-load.html
index 1f9f586..3dbce71 100644
--- a/LayoutTests/media/remove-from-document-no-load.html
+++ b/LayoutTests/media/remove-from-document-no-load.html
@@ -1,5 +1,5 @@
<video controls></video>
-<p>Test that removing a media element from the tree when no media has been loaded does not generate a load event.</p>
+<p>Test that removing a media element from the tree when no media has been loaded does not generate a loadstart event.</p>
<script src=media-file.js></script>
<script src=video-test.js></script>
<script>
diff --git a/LayoutTests/media/remove-from-document.html b/LayoutTests/media/remove-from-document.html
index 035b66f..a406b84 100644
--- a/LayoutTests/media/remove-from-document.html
+++ b/LayoutTests/media/remove-from-document.html
@@ -3,7 +3,7 @@
<script src=media-file.js></script>
<script src=video-test.js></script>
<script>
- waitForEvent('load', function () {
+ waitForEvent('canplaythrough', function () {
testExpected("video.networkState", HTMLMediaElement.NETWORK_LOADED);
testExpected("video.paused", false);
diff --git a/LayoutTests/media/restore-from-page-cache-expected.txt b/LayoutTests/media/restore-from-page-cache-expected.txt
index e3dc44e..59e8e57 100644
--- a/LayoutTests/media/restore-from-page-cache-expected.txt
+++ b/LayoutTests/media/restore-from-page-cache-expected.txt
@@ -1,7 +1,7 @@
Make sure we don't reload a <video> element when navigating back to an uncached page.
EVENT(loadstart)
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (loadCount == '0') OK
*** Page going into cache
*** Page returned from cache
diff --git a/LayoutTests/media/restore-from-page-cache.html b/LayoutTests/media/restore-from-page-cache.html
index 345e005..a125e42 100644
--- a/LayoutTests/media/restore-from-page-cache.html
+++ b/LayoutTests/media/restore-from-page-cache.html
@@ -28,7 +28,7 @@
}
}
- function load()
+ function canplaythrough()
{
testExpected("loadCount", 0);
if (!loadCount) {
@@ -43,7 +43,7 @@
video = mediaElement = document.getElementsByTagName('video')[0];
waitForEvent('loadstart');
- waitForEvent('load', load );
+ waitForEvent('canplaythrough', canplaythrough);
video.src = mediaFile;
}
diff --git a/LayoutTests/media/video-append-source-expected.txt b/LayoutTests/media/video-append-source-expected.txt
index e7203a3..eb61680 100644
--- a/LayoutTests/media/video-append-source-expected.txt
+++ b/LayoutTests/media/video-append-source-expected.txt
@@ -1,6 +1,6 @@
EXPECTED (video.currentSrc == '') OK
EXPECTED (video.currentSrc == '') OK
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (relativeURL(video.currentSrc) == 'content/test.mp4') OK
END OF TEST
diff --git a/LayoutTests/media/video-append-source.html b/LayoutTests/media/video-append-source.html
index 8616997..55c9b08 100644
--- a/LayoutTests/media/video-append-source.html
+++ b/LayoutTests/media/video-append-source.html
@@ -11,7 +11,7 @@
testExpected("video.currentSrc", "");
- waitForEvent("load", function () {
+ waitForEvent("canplaythrough", function () {
testExpected("relativeURL(video.currentSrc) ", mediaFile);
endTest();
});
diff --git a/LayoutTests/media/video-buffered-expected.txt b/LayoutTests/media/video-buffered-expected.txt
index 69ced3b..cc63b24 100644
--- a/LayoutTests/media/video-buffered-expected.txt
+++ b/LayoutTests/media/video-buffered-expected.txt
@@ -3,7 +3,7 @@ TEST(video.buffered.start(-1)) THROWS(DOMException.INDEX_SIZE_ERR) OK
TEST(video.buffered.end(-1)) THROWS(DOMException.INDEX_SIZE_ERR) OK
TEST(video.buffered.start(0)) THROWS(DOMException.INDEX_SIZE_ERR) OK
TEST(video.buffered.end(0)) THROWS(DOMException.INDEX_SIZE_ERR) OK
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.buffered.length == '1') OK
EXPECTED (video.buffered.start(0) == '0') OK
EXPECTED (video.buffered.end(0) > '0') OK
diff --git a/LayoutTests/media/video-buffered.html b/LayoutTests/media/video-buffered.html
index 6b6b7b2..2885fd4 100644
--- a/LayoutTests/media/video-buffered.html
+++ b/LayoutTests/media/video-buffered.html
@@ -7,7 +7,7 @@
testException("video.buffered.end(-1)", "DOMException.INDEX_SIZE_ERR");
testException("video.buffered.start(0)", "DOMException.INDEX_SIZE_ERR");
testException("video.buffered.end(0)", "DOMException.INDEX_SIZE_ERR");
- waitForEvent('load',
+ waitForEvent('canplaythrough',
function ()
{
testExpected("video.buffered.length", 1);
diff --git a/LayoutTests/media/video-canvas-source-expected.txt b/LayoutTests/media/video-canvas-source-expected.txt
index 055a49d..415dad1 100644
--- a/LayoutTests/media/video-canvas-source-expected.txt
+++ b/LayoutTests/media/video-canvas-source-expected.txt
@@ -6,6 +6,6 @@ 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.mp4'; video.appendChild(source))
-EVENT(load)
+EVENT(canplaythrough)
END OF TEST
diff --git a/LayoutTests/media/video-canvas-source.html b/LayoutTests/media/video-canvas-source.html
index 7fd02e5..4966f73 100644
--- a/LayoutTests/media/video-canvas-source.html
+++ b/LayoutTests/media/video-canvas-source.html
@@ -10,7 +10,7 @@
var width;
var height;
- function videoLoaded()
+ function canplaythrough()
{
width = video.videoWidth / 2;
height = video.videoHeight / 2;
@@ -27,7 +27,7 @@
description("Test to ensure we don't taint a canvas when drawing from a video the uses source elements rather than the src attribute");
findMediaElement();
canvas = document.getElementsByTagName('canvas')[0];
- waitForEvent('load', videoLoaded);
+ waitForEvent('canplaythrough', canplaythrough);
var mediaFile = findMediaFile("video", "content/counting");
run("var source = document.createElement('source'); source.src = '" + mediaFile + "'; video.appendChild(source)");
}
diff --git a/LayoutTests/media/video-controls-expected.txt b/LayoutTests/media/video-controls-expected.txt
index 6849b48..36e59f5 100644
--- a/LayoutTests/media/video-controls-expected.txt
+++ b/LayoutTests/media/video-controls-expected.txt
@@ -1,7 +1,7 @@
Test 'controls' attribute
EXPECTED (video.controls != 'null') OK
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.controls != 'null') OK
RUN(video.removeAttribute('controls'))
EXPECTED (video.controls == 'false') OK
diff --git a/LayoutTests/media/video-controls-transformed-expected.txt b/LayoutTests/media/video-controls-transformed-expected.txt
index 804db7e..0ff45e7 100644
--- a/LayoutTests/media/video-controls-transformed-expected.txt
+++ b/LayoutTests/media/video-controls-transformed-expected.txt
@@ -3,7 +3,7 @@ Test controls on transformed video.
This test only runs in DRT!
EXPECTED (video.controls != 'null') OK
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.paused == 'false') OK
END OF TEST
diff --git a/LayoutTests/media/video-controls-transformed.html b/LayoutTests/media/video-controls-transformed.html
index c399483..e3ff120 100644
--- a/LayoutTests/media/video-controls-transformed.html
+++ b/LayoutTests/media/video-controls-transformed.html
@@ -16,7 +16,7 @@
<script src=video-test.js></script>
<script>
testExpected("video.controls", null, '!=');
- waitForEvent('load', function () {
+ waitForEvent('canplaythrough', function () {
if (window.eventSender)
{
eventSender.mouseMoveTo(54,240); // over play button
diff --git a/LayoutTests/media/video-controls-zoomed-expected.txt b/LayoutTests/media/video-controls-zoomed-expected.txt
index 7ab5ddf..b5fa00b 100644
--- a/LayoutTests/media/video-controls-zoomed-expected.txt
+++ b/LayoutTests/media/video-controls-zoomed-expected.txt
@@ -3,7 +3,7 @@ Test controls on zoomed video.
This test only runs in DRT!
EXPECTED (video.controls != 'null') OK
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.paused == 'false') OK
END OF TEST
diff --git a/LayoutTests/media/video-controls-zoomed.html b/LayoutTests/media/video-controls-zoomed.html
index db2b872..5325248 100644
--- a/LayoutTests/media/video-controls-zoomed.html
+++ b/LayoutTests/media/video-controls-zoomed.html
@@ -31,7 +31,7 @@
<script src=video-test.js></script>
<script>
testExpected("video.controls", null, '!=');
- waitForEvent('load', function() {
+ waitForEvent('canplaythrough', function() {
runTest();
} );
video.src = findMediaFile("video", "content/test");
diff --git a/LayoutTests/media/video-controls.html b/LayoutTests/media/video-controls.html
index 367d348..91cea7b 100644
--- a/LayoutTests/media/video-controls.html
+++ b/LayoutTests/media/video-controls.html
@@ -4,7 +4,7 @@
<script src=video-test.js></script>
<script>
testExpected("video.controls", null, '!=');
- waitForEvent('load', function () {
+ waitForEvent('canplaythrough', function () {
document.body.offsetTop;
testExpected("video.controls", null, '!=');
run("video.removeAttribute('controls')");
diff --git a/LayoutTests/media/video-currentTime-expected.txt b/LayoutTests/media/video-currentTime-expected.txt
index ed08ae1..2b18d47 100644
--- a/LayoutTests/media/video-currentTime-expected.txt
+++ b/LayoutTests/media/video-currentTime-expected.txt
@@ -1,5 +1,5 @@
EXPECTED (video.currentTime == '0') OK
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.currentTime == '0') OK
EVENT(play)
EXPECTED (video.currentTime > '0') OK
diff --git a/LayoutTests/media/video-currentTime-set-expected.txt b/LayoutTests/media/video-currentTime-set-expected.txt
index a98be56..2010704 100644
--- a/LayoutTests/media/video-currentTime-set-expected.txt
+++ b/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.83') OK
diff --git a/LayoutTests/media/video-currentTime-set.html b/LayoutTests/media/video-currentTime-set.html
index a237fc4..92fe96a 100644
--- a/LayoutTests/media/video-currentTime-set.html
+++ b/LayoutTests/media/video-currentTime-set.html
@@ -8,7 +8,7 @@
<script src=media-file.js></script>
<script src=video-test.js></script>
<script>
- waitForEvent('load',
+ waitForEvent('canplaythrough',
function () {
waitForEventAndEnd('ended');
diff --git a/LayoutTests/media/video-currentTime-set2-expected.txt b/LayoutTests/media/video-currentTime-set2-expected.txt
index 0962a75..4fc3555 100644
--- a/LayoutTests/media/video-currentTime-set2-expected.txt
+++ b/LayoutTests/media/video-currentTime-set2-expected.txt
@@ -1,4 +1,4 @@
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.currentTime.toFixed(1) == '1.5') OK
EXPECTED (video.currentTime.toFixed(1) == '3.1') OK
END OF TEST
diff --git a/LayoutTests/media/video-currentTime-set2.html b/LayoutTests/media/video-currentTime-set2.html
index 4840378..8221cca 100644
--- a/LayoutTests/media/video-currentTime-set2.html
+++ b/LayoutTests/media/video-currentTime-set2.html
@@ -2,7 +2,7 @@
<script src=media-file.js></script>
<script src=video-test.js></script>
<script>
- waitForEvent('load',
+ waitForEvent('canplaythrough',
function () {
video.currentTime = 1.5;
testExpected("video.currentTime.toFixed(1)", 1.5);
diff --git a/LayoutTests/media/video-currentTime.html b/LayoutTests/media/video-currentTime.html
index 850a457..f0f2a45 100644
--- a/LayoutTests/media/video-currentTime.html
+++ b/LayoutTests/media/video-currentTime.html
@@ -3,8 +3,8 @@
<script src=video-test.js></script>
<script>
testExpected("video.currentTime", 0)
- waitForEvent('load', function() { testExpected("video.currentTime", 0); } );
- video.addEventListener('load', function() { video.play(); setTimeout(testCurrentTime, 500) });
+ waitForEvent('canplaythrough', function() { testExpected("video.currentTime", 0); } );
+ video.addEventListener('canplaythrough', function() { video.play(); setTimeout(testCurrentTime, 500) });
waitForEvent('play');
function testCurrentTime()
{
diff --git a/LayoutTests/media/video-dom-src-expected.txt b/LayoutTests/media/video-dom-src-expected.txt
index e7203a3..eb61680 100644
--- a/LayoutTests/media/video-dom-src-expected.txt
+++ b/LayoutTests/media/video-dom-src-expected.txt
@@ -1,6 +1,6 @@
EXPECTED (video.currentSrc == '') OK
EXPECTED (video.currentSrc == '') OK
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (relativeURL(video.currentSrc) == 'content/test.mp4') OK
END OF TEST
diff --git a/LayoutTests/media/video-dom-src.html b/LayoutTests/media/video-dom-src.html
index b204334..9177929 100644
--- a/LayoutTests/media/video-dom-src.html
+++ b/LayoutTests/media/video-dom-src.html
@@ -7,7 +7,7 @@
video.src = mediaFile;
testExpected("video.currentSrc", "");
- waitForEvent('load', function () {
+ waitForEvent('canplaythrough', function () {
testExpected("relativeURL(video.currentSrc)", mediaFile);
endTest();
} );
diff --git a/LayoutTests/media/video-error-abort-expected.txt b/LayoutTests/media/video-error-abort-expected.txt
index 18d6bc3..521d66f 100644
--- a/LayoutTests/media/video-error-abort-expected.txt
+++ b/LayoutTests/media/video-error-abort-expected.txt
@@ -3,7 +3,7 @@ EVENT(loadstart)
EVENT(abort)
EXPECTED (video.error.code == '1') OK
EVENT(loadstart)
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.error == 'null') OK
END OF TEST
diff --git a/LayoutTests/media/video-error-abort.html b/LayoutTests/media/video-error-abort.html
index 55a9233..6eb90c8 100644
--- a/LayoutTests/media/video-error-abort.html
+++ b/LayoutTests/media/video-error-abort.html
@@ -9,7 +9,7 @@
waitForEvent("abort", function () { testExpected("video.error.code", MediaError.MEDIA_ERR_ABORTED); } );
- waitForEvent('load', function () {
+ waitForEvent('canplaythrough', function () {
testExpected("video.error", null);
endTest();
} );
diff --git a/LayoutTests/media/video-error-does-not-exist.html b/LayoutTests/media/video-error-does-not-exist.html
index 3093cbc..35015bc 100644
--- a/LayoutTests/media/video-error-does-not-exist.html
+++ b/LayoutTests/media/video-error-does-not-exist.html
@@ -6,7 +6,7 @@
consoleWrite("");
testExpected("video.error", null);
- waitForEventAndTest("load", "false");
+ waitForEventAndTest("canplaythrough", "false");
waitForEvent("error", function () {
testExpected("video.error", null, "!=");
diff --git a/LayoutTests/media/video-muted-expected.txt b/LayoutTests/media/video-muted-expected.txt
index 4c07883..8da866e 100644
--- a/LayoutTests/media/video-muted-expected.txt
+++ b/LayoutTests/media/video-muted-expected.txt
@@ -4,7 +4,7 @@ EXPECTED (video.muted == 'false') OK
RUN(video.muted = true)
EXPECTED (video.muted == 'true') OK
RUN(video.load())
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.muted == 'true') OK
RUN(video.muted = false)
EXPECTED (video.muted == 'false') OK
diff --git a/LayoutTests/media/video-muted.html b/LayoutTests/media/video-muted.html
index a8198d3..431f8cd 100644
--- a/LayoutTests/media/video-muted.html
+++ b/LayoutTests/media/video-muted.html
@@ -8,7 +8,7 @@
testExpected("video.muted", true);
video.src = findMediaFile("video", "content/test");
run("video.load()");
- waitForEvent("load", function () {
+ waitForEvent("canplaythrough", function () {
testExpected("video.muted", true);
run("video.muted = false");
testExpected("video.muted", false);
diff --git a/LayoutTests/media/video-no-autoplay-expected.txt b/LayoutTests/media/video-no-autoplay-expected.txt
index 005b0c1..d803068 100644
--- a/LayoutTests/media/video-no-autoplay-expected.txt
+++ b/LayoutTests/media/video-no-autoplay-expected.txt
@@ -1,7 +1,7 @@
Test that play event does not fire when "src" set with no autoplay attribute.
EXPECTED (video.paused == 'true') OK
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.paused == 'true') OK
END OF TEST
diff --git a/LayoutTests/media/video-no-autoplay.html b/LayoutTests/media/video-no-autoplay.html
index d9ca511..38920ce 100644
--- a/LayoutTests/media/video-no-autoplay.html
+++ b/LayoutTests/media/video-no-autoplay.html
@@ -15,7 +15,7 @@
testExpected("video.paused", true);
endTest();
}
- waitForEvent('load', function () { setTimeout(testPaused, 500);} );
+ waitForEvent('canplaythrough', function () { setTimeout(testPaused, 500);} );
video.src = findMediaFile("video", "content/test");
</script>
diff --git a/LayoutTests/media/video-seek-past-end-paused-expected.txt b/LayoutTests/media/video-seek-past-end-paused-expected.txt
index 9a56eb9..621fee1 100644
--- a/LayoutTests/media/video-seek-past-end-paused-expected.txt
+++ b/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.mp4')
RUN(video.load())
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.paused == 'true') OK
EXPECTED (video.ended == 'false') OK
RUN(video.play())
diff --git a/LayoutTests/media/video-seek-past-end-paused.html b/LayoutTests/media/video-seek-past-end-paused.html
index 9855ce5..b558125 100644
--- a/LayoutTests/media/video-seek-past-end-paused.html
+++ b/LayoutTests/media/video-seek-past-end-paused.html
@@ -5,7 +5,7 @@
<script src=video-test.js></script>
<script>
- waitForEvent('load', function () {
+ waitForEvent('canplaythrough', function () {
testExpected("video.paused", true);
testExpected("video.ended", false);
run("video.play()");
diff --git a/LayoutTests/media/video-seek-past-end-playing-expected.txt b/LayoutTests/media/video-seek-past-end-playing-expected.txt
index 77ebff9..bbf2dee 100644
--- a/LayoutTests/media/video-seek-past-end-playing-expected.txt
+++ b/LayoutTests/media/video-seek-past-end-playing-expected.txt
@@ -2,7 +2,7 @@ Test that seeking video with 'loop' past it's end rewinds to the beginning and c
RUN(video.src = 'content/test.mp4')
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.paused == 'true') OK
RUN(video.play())
EXPECTED (video.paused == 'false') OK
diff --git a/LayoutTests/media/video-seek-past-end-playing.html b/LayoutTests/media/video-seek-past-end-playing.html
index 2a8dd26..d44a07b 100644
--- a/LayoutTests/media/video-seek-past-end-playing.html
+++ b/LayoutTests/media/video-seek-past-end-playing.html
@@ -4,7 +4,7 @@
<script src=video-test.js></script>
<script>
- waitForEvent('load', function () {
+ waitForEvent('canplaythrough', function () {
testExpected("video.paused", true);
run("video.play()");
testExpected("video.paused", false);
diff --git a/LayoutTests/media/video-seekable-expected.txt b/LayoutTests/media/video-seekable-expected.txt
index a197e75..0d45181 100644
--- a/LayoutTests/media/video-seekable-expected.txt
+++ b/LayoutTests/media/video-seekable-expected.txt
@@ -3,7 +3,7 @@ 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)
+EVENT(canplaythrough)
EXPECTED (video.seekable.length == '1') OK
EXPECTED (video.seekable.start(0) == '0') OK
EXPECTED (video.seekable.end(0) > '0') OK
diff --git a/LayoutTests/media/video-seekable.html b/LayoutTests/media/video-seekable.html
index 2f6e339..d7366a8 100644
--- a/LayoutTests/media/video-seekable.html
+++ b/LayoutTests/media/video-seekable.html
@@ -7,7 +7,7 @@
testException("video.seekable.end(-1)", "DOMException.INDEX_SIZE_ERR");
testException("video.seekable.start(0)", "DOMException.INDEX_SIZE_ERR");
testException("video.seekable.end(0)", "DOMException.INDEX_SIZE_ERR");
- waitForEvent('load',
+ waitForEvent('canplaythrough',
function ()
{
testExpected("video.seekable.length", 1);
diff --git a/LayoutTests/media/video-seeking-expected.txt b/LayoutTests/media/video-seeking-expected.txt
index 7793305..ebbbe32 100644
--- a/LayoutTests/media/video-seeking-expected.txt
+++ b/LayoutTests/media/video-seeking-expected.txt
@@ -1,6 +1,6 @@
Test that seeking attribute is true immediately after a seek, goes back to false when seeking completes, and that a 'seeked' event is fired for each seek
-EVENT(load)
+EVENT(canplaythrough)
RUN(video.currentTime = 0.5)
EVENT(seeked)
diff --git a/LayoutTests/media/video-seeking.html b/LayoutTests/media/video-seeking.html
index daba6bd..edcef6b 100644
--- a/LayoutTests/media/video-seeking.html
+++ b/LayoutTests/media/video-seeking.html
@@ -34,7 +34,7 @@
consoleWrite("");
}
- function loaded()
+ function canplaythrough()
{
run("video.currentTime = 0.5");
counter = 1;
@@ -46,7 +46,7 @@
waitForEvent('waiting' );
waitForEvent('seeked', seeked );
- waitForEvent('load', loaded);
+ waitForEvent('canplaythrough', canplaythrough);
video.src = findMediaFile("video", "content/test");
</script>
diff --git a/LayoutTests/media/video-src-change-expected.txt b/LayoutTests/media/video-src-change-expected.txt
index 9ad196f..40433e6 100644
--- a/LayoutTests/media/video-src-change-expected.txt
+++ b/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)
diff --git a/LayoutTests/media/video-src-change.html b/LayoutTests/media/video-src-change.html
index 8a65838..49a2b0e 100644
--- a/LayoutTests/media/video-src-change.html
+++ b/LayoutTests/media/video-src-change.html
@@ -6,7 +6,7 @@
<p>
1. Test that an invalid src attribute fires an error when the file fails to load.<br>
2. Test that changing src attribute triggers load after a load fails.<br>
- 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.
</p
<script src=media-file.js></script>
<script src=video-test.js></script>
diff --git a/LayoutTests/media/video-volume-expected.txt b/LayoutTests/media/video-volume-expected.txt
index eda190b..1641469 100644
--- a/LayoutTests/media/video-volume-expected.txt
+++ b/LayoutTests/media/video-volume-expected.txt
@@ -8,7 +8,7 @@ EXPECTED (video.volume == '0') OK
TEST(video.volume = 1.5) THROWS(DOMException.INDEX_SIZE_ERR) OK
TEST(video.volume = -0.5) THROWS(DOMException.INDEX_SIZE_ERR) OK
RUN(video.load())
-EVENT(load)
+EVENT(canplaythrough)
EXPECTED (video.volume == '0') OK
RUN(video.volume = 0.5)
EXPECTED (video.volume == '0.5') OK
diff --git a/LayoutTests/media/video-volume.html b/LayoutTests/media/video-volume.html
index 493540c..4d871fb 100644
--- a/LayoutTests/media/video-volume.html
+++ b/LayoutTests/media/video-volume.html
@@ -12,7 +12,7 @@
testException("video.volume = -0.5", "DOMException.INDEX_SIZE_ERR");
video.src = findMediaFile("video", "content/test");
run("video.load()");
- waitForEvent("load", function () {
+ waitForEvent("canplaythrough", function () {
testExpected("video.volume", 0);
run("video.volume = 0.5");
testExpected("video.volume", 0.5);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list