[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[abarth at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 228eb4a403acdc9ccec91e9deaf2cc37e3174e85
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 11 03:41:02 2010 +0000

    2010-01-10  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            http/tests/messaging/cross-domain-message-event-dispatch.html failed on Gtk Linux 64-Bit Debug Bot
            https://bugs.webkit.org/show_bug.cgi?id=33458
    
            Fix flakey test.  If the machine is very slow, then more than 10ms
            might have elapsed between registering the timeout and calling
            postMessage.  We can't be sure which order they will be called in.
            Re-ordering the call guarantees the arrival order, even if it reduces
            our coverage slightly.
    
            * http/tests/messaging/cross-domain-message-event-dispatch.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53058 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 11bf352..2fd3a34 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,20 @@
 2010-01-10  Adam Barth  <abarth at webkit.org>
 
+        Reviewed by Eric Seidel.
+
+        http/tests/messaging/cross-domain-message-event-dispatch.html failed on Gtk Linux 64-Bit Debug Bot
+        https://bugs.webkit.org/show_bug.cgi?id=33458
+
+        Fix flakey test.  If the machine is very slow, then more than 10ms
+        might have elapsed between registering the timeout and calling
+        postMessage.  We can't be sure which order they will be called in.
+        Re-ordering the call guarantees the arrival order, even if it reduces
+        our coverage slightly.
+
+        * http/tests/messaging/cross-domain-message-event-dispatch.html:
+
+2010-01-10  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Darin Adler.
 
         Add defensive initialization of iframe sandbox flags
diff --git a/LayoutTests/http/tests/messaging/cross-domain-message-event-dispatch.html b/LayoutTests/http/tests/messaging/cross-domain-message-event-dispatch.html
index e8baf9e..9d289ed 100644
--- a/LayoutTests/http/tests/messaging/cross-domain-message-event-dispatch.html
+++ b/LayoutTests/http/tests/messaging/cross-domain-message-event-dispatch.html
@@ -22,13 +22,12 @@ window.onload = function () {
     log("Test begins");
 
     // The setTimeout handlers will get called after the
-    // event listeners, because setTimeout has a minimum wait time
-    // of 10ms while postMessage has no minimum wait time.
+    // event listeners.
     postMessage("Message1", "*");
-    setTimeout("log('setTimeout1')", 0);
     postMessage("Message2", "*");
-    setTimeout("log('setTimeout2')", 0);
     postMessage("Message3", "*");
+    setTimeout("log('setTimeout1')", 0);
+    setTimeout("log('setTimeout2')", 0);
     setTimeout(done, 0);
     log("Events queued");
 }

-- 
WebKit Debian packaging