[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 85a2a7715b4a871d61724ab5cd18a9ed6590c0ac
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 2 18:52:57 2009 +0000

    2009-11-02  Andrew Scherkus  <scherkus at chromium.org>
    
            Reviewed by Eric Carlson.
    
            Increase the timeout of media/video-currentTime-set.html from 800ms to 2000ms.
    
            Also fix call to logResult() as parameters were reversed, resulting in
            printing an error message of "false".
    
            https://bugs.webkit.org/show_bug.cgi?id=31017
    
            * media/video-currentTime-set.html: Timeout increased to 2000ms.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50420 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2c40a53..6a4433c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-02  Andrew Scherkus  <scherkus at chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Increase the timeout of media/video-currentTime-set.html from 800ms to 2000ms.
+
+        Also fix call to logResult() as parameters were reversed, resulting in
+        printing an error message of "false".
+
+        https://bugs.webkit.org/show_bug.cgi?id=31017
+
+        * media/video-currentTime-set.html: Timeout increased to 2000ms.
+
 2009-10-30  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/media/video-currentTime-set.html b/LayoutTests/media/video-currentTime-set.html
index 92fe96a..9b61836 100644
--- a/LayoutTests/media/video-currentTime-set.html
+++ b/LayoutTests/media/video-currentTime-set.html
@@ -18,8 +18,8 @@
         run("video.play()"); 
         consoleWrite("");
     
-        var timeout = 800;
-        setTimeout(function () { logResult("No 'ended' event in " + timeout/1000  + "seconds", false); }, timeout);
+        var timeout = 2000;
+        setTimeout(function () { logResult(false, "No 'ended' event in " + timeout/1000  + " seconds"); }, timeout);
     });
     video.src = findMediaFile("video", "content/test");
     </script>

-- 
WebKit Debian packaging