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

    2010-01-05  Darin Adler  <darin at apple.com>
    
            Reviewed by Dan Bernstein.
    
            CDATA sections are merged into Text nodes when normalize() is used
            https://bugs.webkit.org/show_bug.cgi?id=33191
    
            * fast/dom/Node/normalize-with-cdata-expected.txt: Added.
            * fast/dom/Node/normalize-with-cdata.html: Added.
            * fast/dom/Node/script-tests/normalize-with-cdata.js: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7fea8b5..ddbca24 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -58,6 +58,21 @@
 
         Reviewed by Darin Adler.
 
+        animations/combo-transform-translate+scale.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33237
+
+        This test is rarely flaky, but sometimes the last value
+        is outside the tolerance. Make the tolerance for the last
+        value match the one before it. Specifically, since the
+        transform is 0,0 to 100,200, the tolerance for the second
+        part should be twice that of the first.
+
+        * animations/combo-transform-translate+scale.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/combo-transform-translate+scale.html b/LayoutTests/animations/combo-transform-translate+scale.html
index db311f2..362b6e8 100644
--- a/LayoutTests/animations/combo-transform-translate+scale.html
+++ b/LayoutTests/animations/combo-transform-translate+scale.html
@@ -26,17 +26,14 @@
     }
     
     result = "PASS";
-    const defaultTolerance = 0.2;
-    
+
     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,5 ];
+    const tolerance = [ 0.2,0.2,0.2,0.2,5,10 ];
     const prop = [ "a", "b", "c", "d", "e", "f" ];
     
     function isEqual(actual, desired, tolerance)
     {
-        if (tolerance == undefined || tolerance == 0)
-            tolerance = defaultTolerance;
         var diff = Math.abs(actual - desired);
         return diff <= tolerance;
     }

-- 
WebKit Debian packaging