[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 38d1181da1654d9356b9e85d3d4b1b2ea8b40aeb
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 11 00:38:16 2010 +0000

    2010-01-10  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Nikolas Zimmermann.
    
            http/tests/security/xss-DENIED-window-open-javascript-url.html timed out on Windows Debug Bot
            https://bugs.webkit.org/show_bug.cgi?id=33349
    
            Previously we were using JavaScript URLs to return to the main event
            loop, but that is potentially unreliable because there can be only one
            scheduled redirect in flight per frame.  Let's try using setTimeout
            instead.  Notice that there isn't a race condition here because the
            event loop will always dispatch the actions in the proper order.
    
            * http/tests/security/xss-DENIED-window-open-javascript-url.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53055 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b68637b..d9e3042 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-10  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        http/tests/security/xss-DENIED-window-open-javascript-url.html timed out on Windows Debug Bot
+        https://bugs.webkit.org/show_bug.cgi?id=33349
+
+        Previously we were using JavaScript URLs to return to the main event
+        loop, but that is potentially unreliable because there can be only one
+        scheduled redirect in flight per frame.  Let's try using setTimeout
+        instead.  Notice that there isn't a race condition here because the
+        event loop will always dispatch the actions in the proper order.
+
+        * http/tests/security/xss-DENIED-window-open-javascript-url.html:
+
 2010-01-09  Daniel Bates  <dbates at webkit.org>
 
         No review, rolling out r53044.
diff --git a/LayoutTests/http/tests/security/xss-DENIED-window-open-javascript-url.html b/LayoutTests/http/tests/security/xss-DENIED-window-open-javascript-url.html
index bb59b75..0c5a1bb 100644
--- a/LayoutTests/http/tests/security/xss-DENIED-window-open-javascript-url.html
+++ b/LayoutTests/http/tests/security/xss-DENIED-window-open-javascript-url.html
@@ -7,8 +7,10 @@ if (window.layoutTestController) {
     layoutTestController.waitUntilDone();
 }
 function runTest() {
+    // Schedule a return to the main event loop so that the javascript: URL
+    // has a chance to run.
+    setTimeout(done, 0);
     window.open("javascript:alert('FAIL')", "tg");
-    window.open("javascript:done()", "_self");
 }
 function done() {
     if (window.layoutTestController)

-- 
WebKit Debian packaging