Modified: trunk/LayoutTests/ChangeLog (114024 => 114025)
--- trunk/LayoutTests/ChangeLog 2012-04-12 20:23:30 UTC (rev 114024)
+++ trunk/LayoutTests/ChangeLog 2012-04-12 20:26:49 UTC (rev 114025)
@@ -1,3 +1,16 @@
+2012-04-12 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r114005.
+ http://trac.webkit.org/changeset/114005
+ https://bugs.webkit.org/show_bug.cgi?id=83809
+
+ This patch may have unveiled other bugs, need to investigate
+ (Requested by vrk on #webkit).
+
+ * media/video-seek-past-end-paused-expected.txt:
+ * media/video-seek-past-end-paused.html:
+ * platform/chromium/test_expectations.txt:
+
2012-04-12 Stephen Chenney <[email protected]>
Shadow is not shown when using strokeRect with a gradient strokeStyle
Modified: trunk/LayoutTests/media/video-seek-past-end-paused-expected.txt (114024 => 114025)
--- trunk/LayoutTests/media/video-seek-past-end-paused-expected.txt 2012-04-12 20:23:30 UTC (rev 114024)
+++ trunk/LayoutTests/media/video-seek-past-end-paused-expected.txt 2012-04-12 20:26:49 UTC (rev 114025)
@@ -1,5 +1,7 @@
-Test that seeking paused video past its duration time sets currentTime to duration and leaves video paused.
+Test that seeking paused video past it's duration time sets currentTime to duration and leaves video paused.
+RUN(video.load())
+
EVENT(canplaythrough)
EXPECTED (video.paused == 'true') OK
EXPECTED (video.ended == 'false') OK
Modified: trunk/LayoutTests/media/video-seek-past-end-paused.html (114024 => 114025)
--- trunk/LayoutTests/media/video-seek-past-end-paused.html 2012-04-12 20:23:30 UTC (rev 114024)
+++ trunk/LayoutTests/media/video-seek-past-end-paused.html 2012-04-12 20:26:49 UTC (rev 114025)
@@ -1,61 +1,45 @@
-<!DOCTYPE html>
-<html>
- <head>
- <script src=""
- <script src=""
- <script>
- var timeupdateEventCount = 0;
- function doSetup()
- {
- findMediaElement();
- waitForEvent('canplaythrough', canPlayThrough);
- video.src = "" 'content/test');
- }
- window.addEventListener('load', doSetup, false);
+<video controls></video>
+<p>Test that seeking paused video past it's duration time sets currentTime to duration and leaves video paused.</p>
+<script src=""
+<script src=""
+<script>
- function canPlayThrough()
- {
- testExpected("video.paused", true);
- testExpected("video.ended", false);
- video.addEventListener('timeupdate', timeUpdate);
- run("video.play()");
- }
+ waitForEvent('canplaythrough', function () {
+ testExpected("video.paused", true);
+ testExpected("video.ended", false);
+ run("video.play()");
+ setTimeout(timeCheck1, 200);
+ });
- function timeUpdate()
- {
- ++timeupdateEventCount;
+ function timeCheck1()
+ {
+ consoleWrite("");
- // wait 2 timeupdate events so we are sure the media engine is
- // playing the media.
- if (timeupdateEventCount == 2) {
- consoleWrite("");
+ // make sure time is advancing, seek past end
+ testExpected("video.paused", false);
+ testExpected("mediaElement.currentTime", 0, '>');
+ video.currentTime = 500;
+ setTimeout(timeCheck2, 200);
+ }
- // make sure time is advancing, seek past end
- testExpected("video.paused", false);
- testExpected("mediaElement.currentTime", 0, '>');
- video.addEventListener('seeked', seeked);
- video.currentTime = 500;
- }
- }
+ function timeCheck2()
+ {
+ consoleWrite("");
- function seeked()
- {
- consoleWrite("");
+ // don't use "testExpected()" so we won't log the actual duration to the
+ // results file, as the floating point result may differ with different engines
+ reportExpected(mediaElement.currentTime == mediaElement.duration, "mediaElement.currentTime", "==", "mediaElement.duration", mediaElement.currentTime);
- // don't use "testExpected()" so we won't log the actual duration to the
- // results file, as the floating point result may differ with different engines
- reportExpected(mediaElement.currentTime == mediaElement.duration, "mediaElement.currentTime", "==", "mediaElement.duration", mediaElement.currentTime);
+ testExpected("video.ended", true);
+ consoleWrite("");
+ endTest();
+ }
- testExpected("video.ended", true);
- consoleWrite("");
- timeupdateEventCount = 0;
- endTest();
- }
- </script>
- </head>
- <body>
- <video controls></video>
- <p>Test that seeking paused video past its duration time sets currentTime to duration and leaves video paused.</p>
- </body>
-</html>
+ var mediaFile = findMediaFile("video", "content/test");
+ disableFullTestDetailsPrinting();
+ runSilently("video.src = ''");
+ enableFullTestDetailsPrinting();
+ run("video.load()");
+ consoleWrite("");
+</script>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (114024 => 114025)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-04-12 20:23:30 UTC (rev 114024)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-04-12 20:26:49 UTC (rev 114025)
@@ -3772,6 +3772,8 @@
BUGWK19688 SKIP : fast/images/exif-orientation.html = FAIL
BUGWK19688 SKIP : fast/images/exif-orientation-css.html = FAIL
+BUGCR122448 : media/video-seek-past-end-paused.html = PASS TEXT
+
BUGCR122462 WIN LINUX : http/tests/inspector/inspect-element.html = TEXT
BUGWK83503 LINUX DEBUG : plugins/inner-html-display-none.html = CRASH
