[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mario at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 5af6e16dc11d51c23c97b36e0ae171e48b4a0ebc
Author: mario at webkit.org <mario at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 15:15:33 2011 +0000

    2011-01-25  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Antonio Gomes.
    
            fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html is flaky
            https://bugs.webkit.org/show_bug.cgi?id=53073
    
            Make the two steps in the flaky test to be executed sequentially.
    
            * fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html:
            Fix flaky test by chaining its two steps up.
            * platform/gtk/Skipped: Unskip test.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dd96186..1a30447 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-25  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Reviewed by Antonio Gomes.
+
+        fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=53073
+
+        Make the two steps in the flaky test to be executed sequentially.
+
+        * fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html:
+        Fix flaky test by chaining its two steps up.
+        * platform/gtk/Skipped: Unskip test.
+
 2011-01-25  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/LayoutTests/fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html b/LayoutTests/fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html
index 18472de..e36900a 100644
--- a/LayoutTests/fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html
+++ b/LayoutTests/fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html
@@ -31,7 +31,7 @@
 
     var resultMap1 = [
       ["Down", "start"],
-      ["", ""]
+      ["DONE", "DONE"]
     ];
 
     var resultMap2 = [
@@ -52,7 +52,6 @@
       document.getElementById("start").focus();
 
       setTimeout(step1 , 0);
-      setTimeout(step2 , 50);
     }
 
     function step1()
@@ -60,7 +59,7 @@
       // Actions in 'resultMap1' should keep the focus in the currently
       // focused element ('start') once the best candidate ('end') is not
       // visible in current viewport.
-      initTest(resultMap1);
+      initTest(resultMap1, step1Completed);
     }
 
     function step2()
@@ -72,10 +71,15 @@
         eventSender.keyDown("end");
 
       // And 'resultMap2' re-tries to move focus down.
-      initTest(resultMap2, testCompleted);
+      initTest(resultMap2, step2Completed);
+    }
+
+    function step1Completed()
+    {
+      setTimeout(step2 , 0);
     }
 
-    function testCompleted()
+    function step2Completed()
     {
       if (window.layoutTestController)
         layoutTestController.notifyDone();
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 3b4bcfa..29e4045 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5270,9 +5270,6 @@ fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Con
 # https://bugs.webkit.org/show_bug.cgi?id=38437
 editing/pasteboard/5761530-1.html
 
-# flaky test (see https://bugs.webkit.org/show_bug.cgi?id=53073)
-fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html
-
 # Speech input is not yet enabled.
 fast/speech
 

-- 
WebKit Debian packaging