[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 6be8c5cb1f4ed1183a6f66b52892bcc8541a671f
Author: jparent at chromium.org <jparent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 23:37:02 2009 +0000

    Make shorthand-transitions.html less flaky.
    The test currently allows for timing related differences by using a tolerance, but the tolerance
    is inconsistent in the test, even for values read at the same time (some values are allowed a 100ms
    difference, others are only allowed 50ms).  This change makes all values have a 100ms tolerance.
    (open question: is 100ms enough?  I've looked through a bunch of logs of failures and it seems to be,
    so this should definitely help reduce but this may not entirely eliminate flakiness).
    
    Reviewed by Eric Seidel.
    
    https://bugs.webkit.org/show_bug.cgi?id=32134
    
    * transitions/shorthand-transitions.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51666 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dae20c5..f95d0ec 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-03  Julie Parent  <jparent at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Make shorthand-transitions.html less flaky.
+        The test currently allows for timing related differences by using a tolerance, but the tolerance
+        is inconsistent in the test, even for values read at the same time (some values are allowed a 100ms 
+        difference, others are only allowed 50ms).  This change makes all values have a 100ms tolerance.
+        (open question: is 100ms enough?  I've looked through a bunch of logs of failures and it seems to be,
+        so this should definitely help reduce but this may not entirely eliminate flakiness).
+        
+        https://bugs.webkit.org/show_bug.cgi?id=32134
+
+        * transitions/shorthand-transitions.html:
+
 2009-12-03  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/transitions/shorthand-transitions.html b/LayoutTests/transitions/shorthand-transitions.html
index e1de3ca..1359128 100644
--- a/LayoutTests/transitions/shorthand-transitions.html
+++ b/LayoutTests/transitions/shorthand-transitions.html
@@ -33,12 +33,14 @@
     
     const expectedValues = [
       // [time, element-id, property, expected-value, tolerance]
+      // The transition takes 1 second, so we compute tolerance to allow
+      // 10% or 100ms variance, (endValue - startValue) / 10.
       [0.5, 'box', 'padding-top', 5, 1],
-      [0.5, 'box', 'margin-top', 25, 2],
-      [0.5, 'box', 'outline-color', [128, 0, 128], 10],
-      [0.5, 'box', 'background-color', [128, 128, 255], 10],
+      [0.5, 'box', 'margin-top', 25, 3],
+      [0.5, 'box', 'outline-color', [128, 0, 128], 26],
+      [0.5, 'box', 'background-color', [128, 128, 255], 26],
       [0.5, 'box', '-webkit-border-top-right-radius', 10, 2],
-      [0.5, 'box', '-webkit-transform-origin', [50, 50], 5],
+      [0.5, 'box', '-webkit-transform-origin', [50, 50], 10],
     ];
     
     function setupTest()

-- 
WebKit Debian packaging