[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 9b267a0a20d46965594ec7554e57affac2a46290
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 02:07:04 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@52844 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ddbca24..271eba7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -73,6 +73,22 @@
 
         Reviewed by Darin Adler.
 
+        LayoutTests/animations/change-one-anim.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33234
+
+        As best I can tell, the animation is running faster than
+        the timeout is firing. Increase the tolerance to give 200ms
+        worth of wiggle room.
+
+        As further indication that this is just a race condition,
+        this test is considerably more flaky on debug bots.
+
+        * animations/change-one-anim.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-one-anim.html b/LayoutTests/animations/change-one-anim.html
index e6e60c0..bdfe6d8 100644
--- a/LayoutTests/animations/change-one-anim.html
+++ b/LayoutTests/animations/change-one-anim.html
@@ -32,8 +32,8 @@
         
         const expectedValues = [
           // [animation-name, time, element-id, property, expected-value, tolerance]
-          [null, 0.75, "box", "left", 150, 15],
-          [null, 0.75, "box", "top", 225, 15],
+          [null, 0.75, "box", "left", 150, 30],
+          [null, 0.75, "box", "top", 225, 30],
         ];
 
         function removeAnim()

-- 
WebKit Debian packaging