[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

Thu Oct 29 20:50:51 UTC 2009

The following commit has been merged in the webkit-1.1 branch:
commit 95726e4e236f26bbc778d35954834a151d4a13da
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 20:13:46 2009 +0000

    2009-10-23  Andrew Scherkus  <scherkus at chromium.org>
    
            Reviewed by Eric Carlson.
    
            Add a layout test to assert that media element implementors do not
            advance currentTime after being paused.
    
            https://bugs.webkit.org/show_bug.cgi?id=30699
    
            * media/video-pause-immediately-expected.txt: Added.
            * media/video-pause-immediately.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d46298b..f0b91d5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-23  Andrew Scherkus  <scherkus at chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Add a layout test to assert that media element implementors do not
+        advance currentTime after being paused.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30699
+
+        * media/video-pause-immediately-expected.txt: Added.
+        * media/video-pause-immediately.html: Added.
+
 2009-10-23  Victor Wang  <victorw at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/media/video-pause-immediately-expected.txt b/LayoutTests/media/video-pause-immediately-expected.txt
new file mode 100644
index 0000000..7c6feb0
--- /dev/null
+++ b/LayoutTests/media/video-pause-immediately-expected.txt
@@ -0,0 +1,9 @@
+Test that pausing the media element has an immediate effect on the clock.
+
+EVENT(canplay)
+EVENT(playing)
+EVENT(pause)
+EXPECTED ((video.currentTime - timeAfterPause) == '0') OK
+EXPECTED ((video.played.end(0) - timeAfterPause) == '0') OK
+END OF TEST
+
diff --git a/LayoutTests/media/video-pause-immediately.html b/LayoutTests/media/video-pause-immediately.html
new file mode 100644
index 0000000..0940199
--- /dev/null
+++ b/LayoutTests/media/video-pause-immediately.html
@@ -0,0 +1,47 @@
+<html>
+    <head>
+        <title>Test pause() pauses the clock immediately</title>
+        <script src=media-file.js></script>
+        <script src=video-test.js></script>
+        <script>
+            var timeAfterPause;
+
+            function test()
+            {
+                findMediaElement();
+                video.src = findMediaFile("video", "content/test");
+                waitForEvent("canplay", canplay);
+                waitForEvent("playing", playing);
+                waitForEvent("pause", pause);
+            }
+
+            function canplay()
+            {
+                video.play();
+            }
+
+            function playing()
+            {
+                setTimeout(pauseVideo, 200);
+            }
+
+            function pauseVideo()
+            {
+                video.pause();
+                timeAfterPause = video.currentTime;
+            }
+
+            function pause()
+            {
+                testExpected("(video.currentTime - timeAfterPause)", 0);
+                testExpected("(video.played.end(0) - timeAfterPause)", 0);
+                endTest();
+            }
+        </script>
+     </head>
+    <body onload="test()">
+        <p>Test that pausing the media element has an immediate effect on the clock.</p>
+        <video controls></video>
+    </body>
+</html>
+

-- 
WebKit Debian packaging

