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

Wed Apr 7 23:47:00 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit fa3472c546c922beac9c9015e438ba2e33827669
Author: jparent at chromium.org <jparent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 18:21:06 2009 +0000

    Eliminate flakiness in file-URL-with-port-number by removing a setTimeout.
    The timeout caused the test to fail about 2% of the time on the Chromium builders.
    The timeout exists to catch cases where the iframe does not load, but the test
    framework already will handle this (albeit with a longer timeout).
    
    Reviewed by Dmitry Titov.
    
    * fast/loader/file-URL-with-port-number.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51120 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c68f858..ebc6490 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-17  Julie Parent  <jparent at chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Eliminate flakiness in file-URL-with-port-number by removing a setTimeout.
+        The timeout caused the test to fail about 2% of the time on the Chromium builders.
+        The timeout exists to catch cases where the iframe does not load, but the test
+        framework already will handle this (albeit with a longer timeout).
+
+        * fast/loader/file-URL-with-port-number.html:
+
 2009-11-18  Ben Murdoch  <benm at google.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/loader/file-URL-with-port-number.html b/LayoutTests/fast/loader/file-URL-with-port-number.html
index ceb3eef..f68f677 100644
--- a/LayoutTests/fast/loader/file-URL-with-port-number.html
+++ b/LayoutTests/fast/loader/file-URL-with-port-number.html
@@ -1,27 +1,12 @@
 <head>
 <script>
-var watchdog;
-
-function logResult(result)
+function subframeLoaded()
 {
-    document.getElementById("result").appendChild(document.createTextNode(result));
+    document.getElementById("result").appendChild(document.createTextNode("SUCCESS: The subframe loaded."));
     if (window.layoutTestController)
         layoutTestController.notifyDone();
 }
 
-function subframeLoaded()
-{
-    if (watchdog) {
-        clearTimeout(watchdog);
-        logResult("SUCCESS: The subframe loaded.");
-    }
-}
-
-function watchdogFired()
-{
-    logResult("FAILURE: The subframe did not load within 100 ms.");
-}
-
 function runTest()
 {
     if (window.layoutTestController) {
@@ -32,8 +17,9 @@ function runTest()
     var subframeLocation = window.location + "";
     subframeLocation = subframeLocation.replace(/file:\/\/\//, "file://:1/");
     subframeLocation = subframeLocation.replace(/file-URL-with-port-number/, "resources/empty-subframe");
-    document.getElementById("subframe").contentWindow.location = subframeLocation;
-    watchdog = setTimeout(watchdogFired, 100);
+    var subframe = document.getElementById("subframe");
+    subframe.onload = subframeLoaded;
+    subframe.contentWindow.location = subframeLocation;
 }
 
 </script>
@@ -42,5 +28,5 @@ function runTest()
 <body onload="runTest()">
 <p>This tests whether we can load a file URL with a port number in the URL. It should be ignored, and so the load should succeed.</p>
 <p id="result"></p>
-<iframe id="subframe" onload="subframeLoaded()" width="20" height="20"></iframe>
+<iframe id="subframe" width="20" height="20"></iframe>
 </body>

-- 
WebKit Debian packaging

