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

[jparent at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 69e5d0edd0b5c17b378829a37e8b7a7e736971bd
Author: jparent at chromium.org <jparent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 23:57:53 2009 +0000

    Reduce flakiness in zero-duration-with-non-zero-delay-end.html by
    increasing a timeout.
    
    Reviewed by Eric Seidel.
    
    https://bugs.webkit.org/show_bug.cgi?id=31646
    
    * transitions/zero-duration-with-non-zero-delay-end.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c5740d7..3d06f71 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-18  Julie Parent  <jparent at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Reduce flakiness in zero-duration-with-non-zero-delay-end.html by
+        increasing a timeout.
+     
+        https://bugs.webkit.org/show_bug.cgi?id=31646
+
+        * transitions/zero-duration-with-non-zero-delay-end.html:
+
 2009-11-18  Oliver Hunt  <oliver at apple.com>
 
         Update expected results of fixed test.
diff --git a/LayoutTests/transitions/zero-duration-with-non-zero-delay-end.html b/LayoutTests/transitions/zero-duration-with-non-zero-delay-end.html
index f6e92ef..0749839 100644
--- a/LayoutTests/transitions/zero-duration-with-non-zero-delay-end.html
+++ b/LayoutTests/transitions/zero-duration-with-non-zero-delay-end.html
@@ -47,7 +47,9 @@
     
     function runTest() {
       window.setTimeout(sample0, 250);
-      window.setTimeout(sample1, 500);
+      // Note that since 0-delay transitions do not disptach transitionEnd events
+      // we have to use a timeout here.
+      window.setTimeout(sample1, 750);
     }
     
     function startTest() {

-- 
WebKit Debian packaging