[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 b7f3ffd72479c1038cbe9e21fb4889e18c056724
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 02:05:13 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@52842 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 40e0f27..7fea8b5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -44,6 +44,20 @@
 
         Reviewed by Darin Adler.
 
+        LayoutTests/animations/change-keyframes-name.html and LayoutTests/animations/play-state.html are flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33240
+
+        Increase the tolerances. They are infrequently flaky now.
+        Since these are just linear animations, I think the tolerance
+        is just too small.
+
+        * animations/change-keyframes-name.html:
+        * animations/play-state.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/change-keyframes-name.html b/LayoutTests/animations/change-keyframes-name.html
index 6a7b2de..cc5d76f 100644
--- a/LayoutTests/animations/change-keyframes-name.html
+++ b/LayoutTests/animations/change-keyframes-name.html
@@ -29,7 +29,7 @@
     
     const expectedValues = [
       // [animation-name, time, element-id, property, expected-value, tolerance]
-      [null, 0.25, "box", "left", 200, 10],
+      [null, 0.25, "box", "left", 200, 20],
     ];
 
     function findKeyframesRule(rule)
diff --git a/LayoutTests/animations/play-state.html b/LayoutTests/animations/play-state.html
index ee75b08..f548559 100644
--- a/LayoutTests/animations/play-state.html
+++ b/LayoutTests/animations/play-state.html
@@ -38,12 +38,12 @@
     
     const expectedValues = [
       // [animation-name, time, element-id, property, expected-value, tolerance]
-      ["move1", 0.5, "box1", "webkitTransform", [1,0,0,1,25,0], 3],
-      ["move1", 1.5, "box1", "webkitTransform", [1,0,0,1,50,0], 3],
-      ["move1", 2.5, "box1", "webkitTransform", [1,0,0,1,75,0], 5],
-      ["move2", 0.5, "box2", "left", 25, 3],
-      ["move3", 1.5, "box2", "left", 50, 3],
-      ["move4", 2.5, "box2", "left", 75, 5],
+      ["move1", 0.5, "box1", "webkitTransform", [1,0,0,1,25,0], 10],
+      ["move1", 1.5, "box1", "webkitTransform", [1,0,0,1,50,0], 10],
+      ["move1", 2.5, "box1", "webkitTransform", [1,0,0,1,75,0], 10],
+      ["move2", 0.5, "box2", "left", 25, 10],
+      ["move3", 1.5, "box2", "left", 50, 10],
+      ["move4", 2.5, "box2", "left", 75, 10],
     ];
     
     function stop()

-- 
WebKit Debian packaging