[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 2b6f2dc947cc5ff7e1a7a645bb721d5f3de0030f
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 23:57:39 2010 +0000

    2010-01-05  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Darin Adler.
    
            LayoutTests/animations/change-keyframes.html is flaky
            https://bugs.webkit.org/show_bug.cgi?id=33233
    
            The timing calculation was just off. It was starting the
            second animation at 600ms and then checking to be half-way
            done with the 1 second animation at 1000ms. Instead, just
            modify the animation to run a bit earlier.
    
            * animations/change-keyframes.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52837 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d4201a8..2e6c19d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-05  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        LayoutTests/animations/change-keyframes.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33233
+
+        The timing calculation was just off. It was starting the
+        second animation at 600ms and then checking to be half-way
+        done with the 1 second animation at 1000ms. Instead, just
+        modify the animation to run a bit earlier.
+
+        * animations/change-keyframes.html:
+
 2010-01-05  Chris Marrin  <cmarrin at apple.com>
 
         Fixed a bug in testcase. Passing an empty array to texImage2D
diff --git a/LayoutTests/animations/change-keyframes.html b/LayoutTests/animations/change-keyframes.html
index 5f8712c..9741320 100644
--- a/LayoutTests/animations/change-keyframes.html
+++ b/LayoutTests/animations/change-keyframes.html
@@ -30,7 +30,7 @@
     const expectedValues = [
       // [animation-name, time, element-id, property, expected-value, tolerance]
       [null, 0.5, "box", "left", 200, 10],
-      [null, 0.5 + 0.5, "box", "top", 100, 10],
+      [null, 1, "box", "top", 100, 10],
     ];
 
     function findKeyframesRule(rule)
@@ -55,8 +55,8 @@
         keyframes.deleteRule("60%");
         keyframes.deleteRule("100%");
         keyframes.insertRule("0% { top: 50px; }");
-        keyframes.insertRule("40% { top: 100px; }");
-        keyframes.insertRule("60% { top: 100px; }");
+        keyframes.insertRule("30% { top: 100px; }");
+        keyframes.insertRule("50% { top: 100px; }");
         keyframes.insertRule("100% { top: 150px; }");
         document.getElementById('box').style.webkitAnimationName = "anim";
     }

-- 
WebKit Debian packaging