Unreviewed, rolling out r114005.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Apr 2012 20:26:49 +0000 (20:26 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Apr 2012 20:26:49 +0000 (20:26 +0000)
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).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-04-12

* media/video-seek-past-end-paused-expected.txt:
* media/video-seek-past-end-paused.html:
* platform/chromium/test_expectations.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114025 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/media/video-seek-past-end-paused-expected.txt
LayoutTests/media/video-seek-past-end-paused.html
LayoutTests/platform/chromium/test_expectations.txt

index 89e92e9..5095fac 100644 (file)
@@ -1,3 +1,16 @@
+2012-04-12  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <schenney@chromium.org>
 
         Shadow is not shown when using strokeRect with a gradient strokeStyle
index 50314d0..707b5d2 100644 (file)
@@ -1,4 +1,6 @@
-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
index 02a6952..e9c784e 100644 (file)
@@ -1,61 +1,45 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
-        <script>
-            var timeupdateEventCount = 0;
-
-            function doSetup()
-            {
-                findMediaElement();
-                waitForEvent('canplaythrough', canPlayThrough);
-                video.src = findMediaFile('video', 'content/test');
-            }
-            window.addEventListener('load', doSetup, false);
-
-            function canPlayThrough()
-            {
-                testExpected("video.paused", true);
-                testExpected("video.ended", false);
-                video.addEventListener('timeupdate', timeUpdate);
-                run("video.play()");
-            }
-
-            function timeUpdate()
-            {
-                ++timeupdateEventCount;
-
-                // 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.addEventListener('seeked', seeked);
-                    video.currentTime = 500;
-                }
-            }
-
-            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);
-
-                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>
+
+<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=media-file.js></script>
+<script src=video-test.js></script>
+<script>
+
+    waitForEvent('canplaythrough', function () { 
+        testExpected("video.paused", true);
+        testExpected("video.ended", false);
+        run("video.play()");
+        setTimeout(timeCheck1, 200);
+    });
+
+    function timeCheck1() 
+    {
+        consoleWrite("");
+
+        // make sure time is advancing, seek past end
+        testExpected("video.paused", false);
+        testExpected("mediaElement.currentTime", 0, '>');
+        video.currentTime = 500;
+        setTimeout(timeCheck2, 200);
+    }
+
+    function timeCheck2() 
+    {
+        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);
+
+        testExpected("video.ended", true);
+        consoleWrite("");
+        endTest();
+    }
+
+    var mediaFile = findMediaFile("video", "content/test");
+    disableFullTestDetailsPrinting();
+    runSilently("video.src = '" + mediaFile + "'");
+    enableFullTestDetailsPrinting();
+    run("video.load()");
+    consoleWrite("");
+</script>
index 4b6beb5..90947ce 100644 (file)
@@ -3772,6 +3772,8 @@ BUGWK83324 WIN DEBUG : fast/js/cross-global-object-inline-global-var.html = PASS
 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