[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
eric.carlson at apple.com
eric.carlson at apple.com
Thu Feb 4 21:26:48 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit e636b4ea9fc54034f1b10e603bfb93df3b0b90d5
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jan 24 22:54:35 2010 +0000
2010-01-24 Eric Carlson <eric.carlson at apple.com>
No review, build fix.
Only log the first 'timeupdate' event from audio-delete-while-slider-thumb-clicked.html
as the number fired can vary according to how long it takes to run the test.
* media/audio-delete-while-slider-thumb-clicked.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53786 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 31531d1..95b9dcf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-24 Eric Carlson <eric.carlson at apple.com>
+
+ No review, build fix.
+
+ Only log the first 'timeupdate' event from audio-delete-while-slider-thumb-clicked.html
+ as the number fired can vary according to how long it takes to run the test.
+
+ * media/audio-delete-while-slider-thumb-clicked.html:
+
2010-01-24 Eric Seidel <eric at webkit.org>
No review.
diff --git a/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html b/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
index a5a6269..2d9a3a4 100644
--- a/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
+++ b/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
@@ -68,6 +68,15 @@
setTimeout(deleteAudio, 10);
}
+ var timeupdateCount = 0;
+ function logtimeupdate()
+ {
+ // only log the first 'timeupdate' event as more than one will be fired on slower
+ // machines
+ if (++timeupdateCount==1)
+ log('timeupdate');
+ }
+
function start()
{
setSrcByTagName("audio", findMediaFile("audio", "content/test"));
@@ -80,7 +89,7 @@
<br>
<input type="button" id="button" value="Click Me!" onmouseup="log('button click!')">
<br>
- <audio id="audio" ontimeupdate="log('timeupdate')" onload="drag()" controls></audio><br><br>
+ <audio id="audio" ontimeupdate="logtimeupdate()" onload="drag()" controls></audio><br><br>
<div id="console"></div>
</body>
</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list