Skip to content
Permalink
Browse files
2011-02-22 Jer Noble <jer.noble@apple.com>
        Reviewed by Eric Carlson.

        media/audio-repaint.html flakey.
        https://bugs.webkit.org/show_bug.cgi?id=54970

        Audio repaint tests flakey, as they took a snapshot 1.5s into a 7s file.  Tests
        modified to test against a 1s file, and will trigger a snapshot when the audio
        finishes seeking to the 1/2way point.

        * media/audio-repaint-expected.txt:
        * media/audio-repaint.html:
        * media/content/silence.wav: Added.
        * media/media-document-audio-repaint-expected.txt:
        * media/media-document-audio-repaint.html:
        * platform/mac/media/audio-repaint-expected.checksum:
        * platform/mac/media/audio-repaint-expected.png:
        * platform/mac/media/media-document-audio-repaint-expected.checksum:
        * platform/mac/media/media-document-audio-repaint-expected.png:

Canonical link: https://commits.webkit.org/69281@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79359 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
jernoble committed Feb 22, 2011
1 parent ef6cb5c commit 7da309bf802047f93f5c42861fb645f7dfbdd058
Showing 10 changed files with 62 additions and 23 deletions.
@@ -1,3 +1,24 @@
2011-02-22 Jer Noble <jer.noble@apple.com>

Reviewed by Eric Carlson.

media/audio-repaint.html flakey.
https://bugs.webkit.org/show_bug.cgi?id=54970

Audio repaint tests flakey, as they took a snapshot 1.5s into a 7s file. Tests
modified to test against a 1s file, and will trigger a snapshot when the audio
finishes seeking to the 1/2way point.

* media/audio-repaint-expected.txt:
* media/audio-repaint.html:
* media/content/silence.wav: Added.
* media/media-document-audio-repaint-expected.txt:
* media/media-document-audio-repaint.html:
* platform/mac/media/audio-repaint-expected.checksum:
* platform/mac/media/audio-repaint-expected.png:
* platform/mac/media/media-document-audio-repaint-expected.checksum:
* platform/mac/media/media-document-audio-repaint-expected.png:

2011-02-22 Csaba Osztrogonác <ossy@webkit.org>

Unreviewed.
@@ -22,7 +22,7 @@ layer at (8,67) size 200x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,1) size 126x22
RenderSlider {INPUT} at (0,5) size 126x13
RenderBlock {DIV} at (18,2) size 10x8
RenderBlock {DIV} at (58,2) size 10x8
RenderButton {INPUT} at (177,6) size 14x12
layer at (8,42) size 200x25
RenderBlock (relative positioned) {DIV} at (0,0) size 200x25
@@ -32,7 +32,7 @@ layer at (8,42) size 200x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,1) size 126x22
RenderSlider {INPUT} at (0,5) size 126x13
RenderBlock {DIV} at (18,2) size 10x8
RenderBlock {DIV} at (58,2) size 10x8
RenderButton {INPUT} at (177,6) size 14x12
layer at (8,144) size 200x25
RenderMedia {AUDIO} at (0,102) size 200x25
@@ -44,5 +44,5 @@ layer at (8,144) size 200x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,1) size 126x22
RenderSlider {INPUT} at (0,5) size 126x13
RenderBlock {DIV} at (18,2) size 10x8
RenderBlock {DIV} at (58,2) size 10x8
RenderButton {INPUT} at (177,6) size 14x12
@@ -1,19 +1,32 @@
<body onload="bodyLoaded()">
<p>
This tests that in a standalone media document with audio content, the media element repaints correctly
This tests that in a html document with inline audio content, the media element repaints correctly
while playing.
</p>
<audio controls autoplay src="content/test.wav"></audio><br/>
<audio controls autoplay src="content/test.wav" style="margin-bottom:25px; -webkit-box-reflect:below;"></audio><br/>
<audio controls autoplay src="content/test.wav" style="margin:27px 0; -webkit-transform: rotate(15deg);"></audio><br>
<audio controls autoplay src="content/silence.wav"></audio><br/>
<audio controls autoplay src="content/silence.wav" style="margin-bottom:25px; -webkit-box-reflect:below;"></audio><br/>
<audio controls autoplay src="content/silence.wav" style="margin:27px 0; -webkit-transform: rotate(15deg);"></audio><br>
<script>
if (window.layoutTestController)
layoutTestController.waitUntilDone();

if (window.layoutTestController)
layoutTestController.display();

setTimeout(function() {
if (window.layoutTestController)
layoutTestController.notifyDone();
}, 1500);

function bodyLoaded() {
setTimeout(function(){
var audioElements = document.getElementsByTagName('audio');
var count = audioElements.length;
for (i = 0; i < count; ++i) {
var audio = audioElements[i];
audio.pause();
audio.currentTime = audio.duration * 0.50;
audio.addEventListener("seeked", function() {
if (!--count && window.layoutTestController)
layoutTestController.notifyDone();
}, true);
}
}, 100);
}
</script>
</body>
Binary file not shown.
@@ -27,15 +27,15 @@ layer at (8,42) size 384x334
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 226x15
RenderSlider {INPUT} at (45,2) size 136x13
RenderBlock {DIV} at (23,2) size 10x8
RenderBlock {DIV} at (63,2) size 10x8
RenderButton {INPUT} at (277,6) size 14x12
layer at (89,172) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderText {#text} at (0,0) size 26x11
text run at (0,0) width 26: "00:01"
text run at (0,0) width 26: "00:00"
layer at (270,172) size 45x11
RenderFlexibleBox {DIV} at (181,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
text run at (0,0) width 31: "-00:00"
@@ -2,7 +2,7 @@
This tests that in a standalone media document with audio content, the media element repaints correctly
while playing.
</p>
<iframe src="content/test.wav" width=380 height=330 onload="frameLoaded()"></iframe>
<iframe src="content/silence.wav" id="fr" width=380 height=330 onload="frameLoaded()"></iframe>
<script>
if (window.layoutTestController)
layoutTestController.waitUntilDone();
@@ -11,10 +11,15 @@
{
if (window.layoutTestController)
layoutTestController.display();

setTimeout(function() {
if (window.layoutTestController)
layoutTestController.notifyDone();
}, 1500);

var videoElement = document.getElementById("fr").contentDocument.querySelector("video");
setTimeout(function(){
videoElement.pause();
videoElement.addEventListener("seeked", function() {
if (window.layoutTestController)
layoutTestController.notifyDone();
}, false);
videoElement.currentTime = videoElement.duration * 0.50;
}, 100)
}
</script>
@@ -1 +1 @@
6b05a8d77b8da28f5dca1e2800b1738e
48e4125559ba3678f606dfd6e0ac48ac
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1 +1 @@
9d3b8f0d93b62576cfeb140f2c2d62e8
ebbf0c0a87c22069c420ba8abba235a0
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7da309b

Please sign in to comment.