Title: [152302] branches/safari-537-branch/LayoutTests
- Revision
- 152302
- Author
- [email protected]
- Date
- 2013-07-02 11:00:22 -0700 (Tue, 02 Jul 2013)
Log Message
Merged r152184. <rdar://problem/14304814>
Modified Paths
Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (152301 => 152302)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-02 17:54:28 UTC (rev 152301)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-02 18:00:22 UTC (rev 152302)
@@ -1,3 +1,20 @@
+2013-07-02 Lucas Forschler <[email protected]>
+
+ Merge r152184
+
+ 2013-06-28 Jer Noble <[email protected]>
+
+ media/video-currentTime.html flakey
+ https://bugs.webkit.org/show_bug.cgi?id=118198
+
+ Reviewed by Jessie Berlin.
+
+ Update video-currentTime.html so that it listens for timeupdate events, and ends the test
+ after the first one with a >0 currentTime. Add a 3s watchdog for the failure case.
+
+ * media/video-currentTime-expected.txt:
+ * media/video-currentTime.html:
+
2013-07-01 Lucas Forschler <[email protected]>
Merge r152185
Modified: branches/safari-537-branch/LayoutTests/media/video-currentTime-expected.txt (152301 => 152302)
--- branches/safari-537-branch/LayoutTests/media/video-currentTime-expected.txt 2013-07-02 17:54:28 UTC (rev 152301)
+++ branches/safari-537-branch/LayoutTests/media/video-currentTime-expected.txt 2013-07-02 18:00:22 UTC (rev 152302)
@@ -2,6 +2,6 @@
EVENT(canplaythrough)
EXPECTED (video.currentTime == '0') OK
EVENT(play)
-EXPECTED (video.currentTime > '0') OK
+video.currentTime > 0 OK
END OF TEST
Modified: branches/safari-537-branch/LayoutTests/media/video-currentTime.html (152301 => 152302)
--- branches/safari-537-branch/LayoutTests/media/video-currentTime.html 2013-07-02 17:54:28 UTC (rev 152301)
+++ branches/safari-537-branch/LayoutTests/media/video-currentTime.html 2013-07-02 18:00:22 UTC (rev 152302)
@@ -4,12 +4,14 @@
<script>
testExpected("video.currentTime", 0)
waitForEvent('canplaythrough', function() { testExpected("video.currentTime", 0); } );
- video.addEventListener('canplaythrough', function() { video.play(); setTimeout(testCurrentTime, 500) });
+ video.addEventListener('canplaythrough', function() { video.play(); });
waitForEvent('play');
- function testCurrentTime()
- {
- testExpected("video.currentTime", 0, '>')
- endTest();
- }
+ video.addEventListener('timeupdate', function() {
+ if (video.currentTime > 0) {
+ logResult(true, 'video.currentTime > 0');
+ endTest();
+ }
+ });
video.src = "" "content/test");
+ failTestIn(3000);
</script>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
