[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 b3caab2b6011e74a5000fcf361f249162757e8fb
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 19:58:18 2010 +0000

    2010-01-06  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Eric Seidel.
    
            transitions/shorthand-border-transitions.html is flaky
            https://bugs.webkit.org/show_bug.cgi?id=33276
    
            Yet another transitions test that doesn't give consistent
            wiggle room. Make all the wiggle rooms account for >=200ms
            instead of some that were only giving 100ms wiggle room.
    
            * transitions/shorthand-border-transitions.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52999 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 96fadea..e576c39 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-06  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        transitions/shorthand-border-transitions.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33276
+
+        Yet another transitions test that doesn't give consistent
+        wiggle room. Make all the wiggle rooms account for >=200ms
+        instead of some that were only giving 100ms wiggle room.
+
+        * transitions/shorthand-border-transitions.html:
+
 2010-01-08  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/transitions/shorthand-border-transitions.html b/LayoutTests/transitions/shorthand-border-transitions.html
index 9543b1c..d71c4a7 100644
--- a/LayoutTests/transitions/shorthand-border-transitions.html
+++ b/LayoutTests/transitions/shorthand-border-transitions.html
@@ -52,10 +52,10 @@
     const expectedValues = [
       // [time, element-id, property, expected-value, tolerance]
       // color and width of each side should be animating
-      [0.5, 'box', 'border-top-color', [128, 0, 128], 10],
-      [0.5, 'box', 'border-right-color', [128, 0, 128], 10],
-      [0.5, 'box', 'border-bottom-color', [128, 0, 128], 10],
-      [0.5, 'box', 'border-left-color', [128, 0, 128], 10],
+      [0.5, 'box', 'border-top-color', [128, 0, 128], 15],
+      [0.5, 'box', 'border-right-color', [128, 0, 128], 15],
+      [0.5, 'box', 'border-bottom-color', [128, 0, 128], 15],
+      [0.5, 'box', 'border-left-color', [128, 0, 128], 15],
       [0.5, 'box', 'border-top-width', 10, 1],
       [0.5, 'box', 'border-right-width', 10, 1],
       [0.5, 'box', 'border-bottom-width', 10, 1],
@@ -67,7 +67,7 @@
 
       // border-width should be animating
       [0.5, 'box2', 'border-top-width', 10, 1],
-      [0.5, 'box2', 'border-bottom-width', 20, 1],
+      [0.5, 'box2', 'border-bottom-width', 20, 2],
     ];
     
     function setupTest()

-- 
WebKit Debian packaging