[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[philn at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0fb10f4ec0ace7d3c675cf906e849160d18a98da
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 08:37:34 2010 +0000

    2010-01-20  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Eric Carlson.
    
            [Gtk] media/video-currentTime-set.html is flaky
            https://bugs.webkit.org/show_bug.cgi?id=33897
    
            Refactored the test to use the "seeked" event.
    
            * media/video-currentTime-set-expected.txt:
            * media/video-currentTime-set.html:
            * platform/gtk/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53612 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d0bb51b..d63a7d9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-20  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Eric Carlson.
+
+        [Gtk] media/video-currentTime-set.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33897
+
+        Refactored the test to use the "seeked" event.
+
+        * media/video-currentTime-set-expected.txt:
+        * media/video-currentTime-set.html:
+        * platform/gtk/Skipped:
+
 2010-01-21  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed. Fix incorrect close tags.
diff --git a/LayoutTests/media/video-currentTime-set-expected.txt b/LayoutTests/media/video-currentTime-set-expected.txt
index 2010704..b53c5c8 100644
--- a/LayoutTests/media/video-currentTime-set-expected.txt
+++ b/LayoutTests/media/video-currentTime-set-expected.txt
@@ -3,6 +3,7 @@ Test that setting currentTime changes the time, and that 'ended' event is fired
 EVENT(canplaythrough)
 EXPECTED (video.currentTime == '0') OK
 RUN(video.currentTime = video.duration - 0.2)
+EVENT(seeked)
 EXPECTED (video.currentTime.toFixed(2) == '5.83') OK
 RUN(video.play())
 
diff --git a/LayoutTests/media/video-currentTime-set.html b/LayoutTests/media/video-currentTime-set.html
index 9b61836..688081c 100644
--- a/LayoutTests/media/video-currentTime-set.html
+++ b/LayoutTests/media/video-currentTime-set.html
@@ -14,13 +14,19 @@
     
         testExpected("video.currentTime", 0);
         run("video.currentTime = video.duration - 0.2"); 
+    });
+
+    waitForEvent('seeked',
+    function () {
         testExpected("video.currentTime.toFixed(2)", (video.duration - 0.2).toFixed(2));
         run("video.play()"); 
         consoleWrite("");
     
         var timeout = 2000;
         setTimeout(function () { logResult(false, "No 'ended' event in " + timeout/1000  + " seconds"); }, timeout);
+
     });
+
     video.src = findMediaFile("video", "content/test");
     </script>
 
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 8b508cc..23d67d5 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5566,7 +5566,6 @@ fast/dom/Document/CaretRangeFromPoint/caretRangeFromPoint-in-zoom-and-scroll.htm
 fast/css/opacity-float.html 
 
 # Media tests that keep failing on the bot
-media/video-currentTime-set.html
 media/video-play-pause-events.html
 
 # New events failing; see https://bugs.webkit.org/show_bug.cgi?id=28823

-- 
WebKit Debian packaging