[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 3d9c91cc36681fc0dbc30e97304192024e6be665
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 02:03:52 2010 +0000

    2010-01-05  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Darin Adler.
    
            animations/animation-drt-api-multiple-keyframes.html and animations/animation-drt-api.html are flaky
            https://bugs.webkit.org/show_bug.cgi?id=33244
    
            Both these tests have a race condition. They start looking
            for the animation start after the node is already rendered.
            Instead, set the animation just before looking for the animation
            start.
    
            * animations/animation-drt-api-multiple-keyframes.html:
            * animations/animation-drt-api.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dbfc57d..40e0f27 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -29,6 +29,21 @@
 
         Reviewed by Darin Adler.
 
+        animations/animation-drt-api-multiple-keyframes.html and animations/animation-drt-api.html are flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33244
+
+        Both these tests have a race condition. They start looking
+        for the animation start after the node is already rendered.
+        Instead, set the animation just before looking for the animation
+        start.
+
+        * animations/animation-drt-api-multiple-keyframes.html:
+        * animations/animation-drt-api.html:
+
+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
 
diff --git a/LayoutTests/animations/animation-drt-api-multiple-keyframes.html b/LayoutTests/animations/animation-drt-api-multiple-keyframes.html
index 023e11f..d6bdff4 100644
--- a/LayoutTests/animations/animation-drt-api-multiple-keyframes.html
+++ b/LayoutTests/animations/animation-drt-api-multiple-keyframes.html
@@ -15,7 +15,6 @@
       height: 200px;
       width: 200px;
       background-color: red;
-      -webkit-animation-name: anim;
       -webkit-animation-duration: 5s;
       -webkit-animation-timing-function: linear;
     }
@@ -45,6 +44,7 @@
 
     function startTest()
     {
+      document.getElementById("box").style.webkitAnimationName = "anim";
       waitForAnimationToStart(document.getElementById('box'), animationStarted);
     }
    </script>
diff --git a/LayoutTests/animations/animation-drt-api.html b/LayoutTests/animations/animation-drt-api.html
index 8872ae2..d2ab835 100644
--- a/LayoutTests/animations/animation-drt-api.html
+++ b/LayoutTests/animations/animation-drt-api.html
@@ -15,7 +15,6 @@
       height: 200px;
       width: 200px;
       background-color: red;
-      -webkit-animation-name: bounce;
       -webkit-animation-duration: 2s;
       -webkit-animation-timing-function: linear;
     }
@@ -47,6 +46,7 @@
 
     function startTest()
     {
+      document.getElementById("target").style.webkitAnimationName = "bounce";
       waitForAnimationToStart(document.getElementById('target'), animationStarted);
     }
    </script>

-- 
WebKit Debian packaging