Commit 41b8caa0 authored by philn@webkit.org's avatar philn@webkit.org
Browse files

2011-02-15 Philippe Normand <pnormand@igalia.com>

        Reviewed by Martin Robinson.

        [GStreamer] wrong media duration report in media/controls-after-reload.html
        https://bugs.webkit.org/show_bug.cgi?id=51602

        Refactored some media tests to be less flaky-prone.

        * media/controls-after-reload.html: Trigger playback just before
        rendering the controls.
        * media/video-paint-test.js: Ditto.
        (init.document.addEventListener.):
        (init):
        * media/video-volume-slider.html: Trigger DRT dump after volume
        was updated.
        * platform/gtk/Skipped: Unskip fixed tests.
        * platform/gtk/media/video-controls-rendering-expected.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78689 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e1d85012
2011-02-15 Philippe Normand <pnormand@igalia.com>
Reviewed by Martin Robinson.
[GStreamer] wrong media duration report in media/controls-after-reload.html
https://bugs.webkit.org/show_bug.cgi?id=51602
Refactored some media tests to be less flaky-prone.
* media/controls-after-reload.html: Trigger playback just before
rendering the controls.
* media/video-paint-test.js: Ditto.
(init.document.addEventListener.):
(init):
* media/video-volume-slider.html: Trigger DRT dump after volume
was updated.
* platform/gtk/Skipped: Unskip fixed tests.
* platform/gtk/media/video-controls-rendering-expected.txt:
2011-02-15 Kent Tamura <tkent@chromium.org>
 
Unreviewed, test expectation update.
......@@ -8,17 +8,21 @@
if (window.layoutTestController)
layoutTestController.waitUntilDone();
function finish()
{
if (window.layoutTestController)
layoutTestController.notifyDone();
}
function canplaythrough()
{
loadedCount++;
if (loadedCount == 2) {
if (window.layoutTestController)
layoutTestController.notifyDone();
return;
if (!loadedCount) {
video.src = findMediaFile("video", "content/test");
video.load();
video.play();
video.addEventListener("playing", finish);
}
video.src = findMediaFile("video", "content/test");
video.load();
loadedCount++;
}
function test()
......
......@@ -4,9 +4,12 @@ function init()
var count = totalCount;
document.addEventListener("canplaythrough", function () {
if (!--count) {
var video = document.getElementsByTagName('video')[0];
if (window.layoutTestController) {
video.play();
video.addEventListener("playing", function() { layoutTestController.notifyDone(); });
}
document.body.offsetLeft;
if (window.layoutTestController)
setTimeout(function() { layoutTestController.notifyDone(); }, totalCount * 100);
}
}, true);
}
......
......@@ -24,8 +24,10 @@
eventSender.mouseMoveTo(x, y);
}
if (window.layoutTestController)
layoutTestController.notifyDone();
video.addEventListener("volumechange", function() {
if (window.layoutTestController)
layoutTestController.notifyDone();
});
}
</script>
</head>
......
......@@ -344,13 +344,7 @@ media/video-seek-past-end-playing.html
# https://bugs.webkit.org/show_bug.cgi?id=30198
media/video-source-error.html
# https://bugs.webkit.org/show_bug.cgi?id=51602
media/controls-after-reload.html
media/controls-strict.html
media/video-display-toggle.html
media/controls-styling.html
media/video-volume-slider.html
media/video-controls-rendering.html
# Tests generating new results
media/video-aspect-ratio.html
......
......@@ -26,7 +26,7 @@ layer at (8,43) size 320x240 scrollHeight 250
RenderText {#text} at (5,5) size 55x12
text run at (5,5) width 55: "00:00 / 00:06"
RenderSlider {INPUT} at (66,0) size 153x20
RenderBlock {DIV} at (2,4) size 12x12
RenderBlock {DIV} at (7,4) size 12x12
RenderButton {INPUT} at (240,220) size 20x20
RenderButton {INPUT} at (260,220) size 20x20
RenderButton {INPUT} at (280,220) size 20x20
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment