[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 ed4097682fc7bd61ec29f9656f4ec6587492bef4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 22:16:33 2009 +0000

    2009-12-14  Kinuko Yasuda  <kinuko at chromium.com>
    
            Reviewed by Darin Fisher.
    
            Make changing-frame-hierarchy-in-onload.html less flaky and
            platform-independent.
            https://bugs.webkit.org/show_bug.cgi?id=32319
    
            * http/tests/navigation/changing-frame-hierarchy-in-onload.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52119 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6bc21a3..c6753a2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-14  Kinuko Yasuda  <kinuko at chromium.com>
+
+        Reviewed by Darin Fisher.
+
+        Make changing-frame-hierarchy-in-onload.html less flaky and
+        platform-independent.
+        https://bugs.webkit.org/show_bug.cgi?id=32319
+
+        * http/tests/navigation/changing-frame-hierarchy-in-onload.html:
+
 2009-12-14  Robert Hogan  <robert at roberthogan.net>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/http/tests/navigation/changing-frame-hierarchy-in-onload.html b/LayoutTests/http/tests/navigation/changing-frame-hierarchy-in-onload.html
index a04301e..5a2c7d3 100644
--- a/LayoutTests/http/tests/navigation/changing-frame-hierarchy-in-onload.html
+++ b/LayoutTests/http/tests/navigation/changing-frame-hierarchy-in-onload.html
@@ -4,16 +4,15 @@ if (window.layoutTestController)
     layoutTestController.dumpAsText();
 
 
-setTimeout(stop, 500);
-
 window.onload = function () {
   document.body.appendChild(document.getElementById('from1'));
 }
 </script>
-
 <div>
 This tests that we won't crash when an onload method changes the frame hierarchy when the main frame load is stopped.
 </div>
 <div>SUCCESS - didn't crash</div>
-<iframe id="from1" src="/navigation/resources/slow-resource.pl"></iframe>
+<iframe id="from1" src="/navigation/resources/slow-resource-1-sec.pl"></iframe>
+<script>setTimeout(stop, 0);</script>
 </html>
+

-- 
WebKit Debian packaging