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

[ojan at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit fe799ef05a95f00e148f956a5d6e9b1dd4fc752c
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 00:30:40 2010 +0000

    2010-01-06  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Eric Carlson.
    
            media/video-seeking.html is flaky
            https://bugs.webkit.org/show_bug.cgi?id=33273
    
            Removed setTimeouts from this test. It kind of looks
            like they were intentional, but I don't see how they add
            anything to this test (other than race conditions).
    
            * media/video-seeking-expected.txt:
            * media/video-seeking.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52881 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aa86aa8..6355a65 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,19 @@
 2010-01-06  Ojan Vafai  <ojan at chromium.org>
 
+        Reviewed by Eric Carlson.
+
+        media/video-seeking.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33273
+
+        Removed setTimeouts from this test. It kind of looks
+        like they were intentional, but I don't see how they add
+        anything to this test (other than race conditions).
+
+        * media/video-seeking-expected.txt:
+        * media/video-seeking.html:
+
+2010-01-06  Ojan Vafai  <ojan at chromium.org>
+
         Reviewed by Eric Seidel.
 
         fast/css/transition-color-unspecified.html and fast/dom/HTMLObjectElement/object-as-frame.html are flaky
diff --git a/LayoutTests/media/video-seeking-expected.txt b/LayoutTests/media/video-seeking-expected.txt
index ebbbe32..917eb68 100644
--- a/LayoutTests/media/video-seeking-expected.txt
+++ b/LayoutTests/media/video-seeking-expected.txt
@@ -5,7 +5,6 @@ RUN(video.currentTime = 0.5)
 
 EVENT(seeked)
 
-EXPECTED (seekedCount == '1') OK
 EXPECTED (video.seeking == 'false') OK
 EXPECTED (video.currentTime == '0.5') OK
 RUN(video.currentTime = 1)
@@ -13,7 +12,6 @@ EXPECTED (video.seeking == 'true') OK
 
 EVENT(seeked)
 
-EXPECTED (seekedCount == '2') OK
 EXPECTED (video.seeking == 'false') OK
 EXPECTED (video.currentTime == '1') OK
 RUN(video.currentTime = 1.5)
@@ -21,7 +19,6 @@ EXPECTED (video.seeking == 'true') OK
 
 EVENT(seeked)
 
-EXPECTED (seekedCount == '3') OK
 EXPECTED (video.seeking == 'false') OK
 EXPECTED (video.currentTime == '1.5') OK
 RUN(video.currentTime = 2)
diff --git a/LayoutTests/media/video-seeking.html b/LayoutTests/media/video-seeking.html
index edcef6b..a8c6b5a 100644
--- a/LayoutTests/media/video-seeking.html
+++ b/LayoutTests/media/video-seeking.html
@@ -8,39 +8,26 @@
 <script>
 
     var seekedCount = 0;
-    var counter;
 
     function seeked()
     { 
         ++seekedCount; 
         consoleWrite("");
-    }
 
-    function someTimeLater()
-    {
-        testExpected("seekedCount", counter);
         testExpected("video.seeking", false);
-        testExpected("video.currentTime", counter * 0.5);
-        run("video.currentTime = " + (counter + 1) * 0.5);
+        testExpected("video.currentTime", seekedCount * 0.5);
+        run("video.currentTime = " + (seekedCount + 1) * 0.5);
         testExpected("video.seeking", true);
 
-        if (counter == 3)
-        {
-            consoleWrite("");
-            endTest();
-        }
-
-        ++counter;
         consoleWrite("");
+
+        if (seekedCount == 3)
+            endTest();
      }
 
     function canplaythrough() 
     {
         run("video.currentTime = 0.5");
-        counter = 1;
-        setTimeout(someTimeLater, 200) 
-        setTimeout(someTimeLater, 400) 
-        setTimeout(someTimeLater, 600) 
         consoleWrite("");
     }
     

-- 
WebKit Debian packaging