[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit dd88b7a3bb8782bb266f25478033241b43bfc429
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 00:45:30 2009 +0000

    2009-10-28  Andrew Scherkus  <scherkus at chromium.org>
    
            Reviewed by Eric Carlson.
    
            Fix video-pause-immediately.html to avoid using setTimeout().
    
            This also addresses the flakiness on Windows, where 200ms was not enough time to advance the clock past zero.
    
            https://bugs.webkit.org/show_bug.cgi?id=30889
    
            * media/video-pause-immediately.html: Replace setTimeout() with timeupdate events.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50252 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7f935e7..ec5fec6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-28  Andrew Scherkus  <scherkus at chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Fix video-pause-immediately.html to avoid using setTimeout().
+
+        This also addresses the flakiness on Windows, where 200ms was not enough time to advance the clock past zero.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30889
+
+        * media/video-pause-immediately.html: Replace setTimeout() with timeupdate events.
+
 2009-10-28  Brian Weinstein  <bweinstein at apple.com>
 
         Rubber-stamped by Ada Chan.
diff --git a/LayoutTests/media/video-pause-immediately.html b/LayoutTests/media/video-pause-immediately.html
index 0940199..aa36036 100644
--- a/LayoutTests/media/video-pause-immediately.html
+++ b/LayoutTests/media/video-pause-immediately.html
@@ -22,13 +22,15 @@
 
             function playing()
             {
-                setTimeout(pauseVideo, 200);
+                video.addEventListener("timeupdate", timeupdate);
             }
 
-            function pauseVideo()
+            function timeupdate()
             {
-                video.pause();
-                timeAfterPause = video.currentTime;
+                if (video.currentTime > 0) {
+                    video.pause();
+                    timeAfterPause = video.currentTime;
+                }
             }
 
             function pause()

-- 
WebKit Debian packaging