[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 151d5d410bf28cc73b74c82a35509fd61690dcf9
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 17:46:01 2010 +0000

    2010-01-14  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Eric Seidel.
    
            animations/combo-transform-translate+scale.html failed on Snow Leopard Debug Bot
            https://bugs.webkit.org/show_bug.cgi?id=33461
    
            Make test half as long. Remove a setTimeout and tweak tolerances to
            reduce flakiness.
    
            * animations/combo-transform-translate+scale.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53333 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a62b03c..8125c4f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-14  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        animations/combo-transform-translate+scale.html failed on Snow Leopard Debug Bot
+        https://bugs.webkit.org/show_bug.cgi?id=33461
+
+        Make test half as long. Remove a setTimeout and tweak tolerances to
+        reduce flakiness.
+
+        * animations/combo-transform-translate+scale.html:
+
 2010-01-14  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Brady Eidson.
diff --git a/LayoutTests/animations/combo-transform-translate+scale-expected.txt b/LayoutTests/animations/combo-transform-translate+scale-expected.txt
index 91c9d4f..65ec680 100644
--- a/LayoutTests/animations/combo-transform-translate+scale-expected.txt
+++ b/LayoutTests/animations/combo-transform-translate+scale-expected.txt
@@ -1,2 +1,2 @@
-This test performs an animation of the translate() and scale() operators. It animates over 2 seconds. At 0.5 and 1 second it takes a snapshot and expects the result to be within range.
+This test performs an animation of the translate() and scale() operators. It animates over 1 seconds. At 0.25 and 0.5 seconds it takes a snapshot and expects the result to be within range.
 PASS
diff --git a/LayoutTests/animations/combo-transform-translate+scale.html b/LayoutTests/animations/combo-transform-translate+scale.html
index 362b6e8..d330c14 100644
--- a/LayoutTests/animations/combo-transform-translate+scale.html
+++ b/LayoutTests/animations/combo-transform-translate+scale.html
@@ -10,7 +10,7 @@
       height: 100px;
       width: 100px;
       background-color: blue;
-      -webkit-animation-duration: 2s;
+      -webkit-animation-duration: 1s;
       -webkit-animation-timing-function: linear;
       -webkit-animation-name: "anim";
     }
@@ -25,11 +25,11 @@
       layoutTestController.waitUntilDone();
     }
     
-    result = "PASS";
+    result = "";
 
     const expected =  [ [ 1.25,0,0,1.75,25,50 ],
                         [ 1.5,0,0,2.5,50,100 ] ];
-    const tolerance = [ 0.2,0.2,0.2,0.2,5,10 ];
+    const tolerance = [ 0.2,0.2,0.2,0.3,5,15 ];
     const prop = [ "a", "b", "c", "d", "e", "f" ];
     
     function isEqual(actual, desired, tolerance)
@@ -38,29 +38,28 @@
         return diff <= tolerance;
     }
     
+    var numSnapshots = 0;
+    
     function snapshot(which)
     {
-        if (result != "PASS")
-            return;
-        
         var t = new WebKitCSSMatrix(window.getComputedStyle(document.getElementById('box')).webkitTransform);
-        for (i = 0; i < 6; ++i)
-            if (!isEqual(t[prop[i]], expected[which][i], tolerance[i])) {
-                result = "FAIL('"+prop[i]+"' was:"+t[prop[i]]+", expected:"+expected[which][i]+")";
-                return;
-            }
+        for (i = 0; i < 6; ++i) {
+            if (!isEqual(t[prop[i]], expected[which][i], tolerance[i]))
+                result += "FAIL('"+prop[i]+"' was:"+t[prop[i]]+", expected:"+expected[which][i]+")";
+        }
+        
+        numSnapshots++;
+        if (numSnapshots == 2) {
+            document.getElementById('result').innerHTML = result || "PASS";
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
+        }
     }
 
     function start()
     {
-        setTimeout("snapshot(0)", 500);
-        setTimeout("snapshot(1)", 1000);
-        
-        window.setTimeout(function() {
-            document.getElementById('result').innerHTML = result;
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
-        }, 1100);
+        setTimeout("snapshot(0)", 250);
+        setTimeout("snapshot(1)", 500);
     }
     
     document.addEventListener('webkitAnimationStart', start, false);
@@ -68,8 +67,8 @@
   </script>
 </head>
 <body>
-This test performs an animation of the translate() and scale() operators. It animates over 2 seconds. 
-At 0.5 and 1 second it takes a snapshot and expects the result to be within range.
+This test performs an animation of the translate() and scale() operators. It animates over 1 seconds. 
+At 0.25 and 0.5 seconds it takes a snapshot and expects the result to be within range.
 <div id="box">
 </div>
 <div id="result">

-- 
WebKit Debian packaging