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

Thu Apr 8 01:10:29 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit b7f2fbf3303ff56b6ed405d40c32d21b808a08c4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 16 05:05:47 2010 +0000

    2010-01-15  Doug Muir  <dmuir at google.com>
    
            Fix some Layout Test timeouts when run under valgrind.
    
            * http/tests/history/redirect-js-form-submit-0-seconds.html:
            * http/tests/history/redirect-js-form-submit-2-seconds.html:
            * http/tests/misc/timer-vs-loading.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53356 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 726b833..a6c1598 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-15  Doug Muir  <dmuir at google.com>
+
+        Fix some Layout Test timeouts when run under valgrind.
+        
+        * http/tests/history/redirect-js-form-submit-0-seconds.html:
+        * http/tests/history/redirect-js-form-submit-2-seconds.html:
+        * http/tests/misc/timer-vs-loading.html:
+
 2010-01-15  Carol Szabo  <carol.szabo at nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/http/tests/history/redirect-js-form-submit-0-seconds.html b/LayoutTests/http/tests/history/redirect-js-form-submit-0-seconds.html
index 074e8d8..d62c631 100644
--- a/LayoutTests/http/tests/history/redirect-js-form-submit-0-seconds.html
+++ b/LayoutTests/http/tests/history/redirect-js-form-submit-0-seconds.html
@@ -7,12 +7,14 @@ if (window.layoutTestController) {
     layoutTestController.keepWebHistory();
     layoutTestController.waitUntilDone();
 }
-setTimeout(function () { document.getElementById("form").submit(); }, 0);
 </script>
 </head>
 
 <body>
 <p>This page is a JavaScript redirect on a 0 second delay.</p>
 <form id="form" action="resources/redirect-target.html#1"></form>
+<script>
+setTimeout(function () { document.getElementById("form").submit(); }, 0);
+</script>
 </body>
 </html>
diff --git a/LayoutTests/http/tests/history/redirect-js-form-submit-2-seconds.html b/LayoutTests/http/tests/history/redirect-js-form-submit-2-seconds.html
index c0fc5c6..a49b51d 100644
--- a/LayoutTests/http/tests/history/redirect-js-form-submit-2-seconds.html
+++ b/LayoutTests/http/tests/history/redirect-js-form-submit-2-seconds.html
@@ -7,12 +7,14 @@ if (window.layoutTestController) {
     layoutTestController.keepWebHistory();
     layoutTestController.waitUntilDone();
 }
-setTimeout(function () { document.getElementById("form").submit(); }, 2000);
 </script>
 </head>
 
 <body>
 <p>This page is a JavaScript redirect on a 2 second delay.</p>
 <form id="form" action="resources/redirect-target.html#1"></form>
+<script>
+setTimeout(function () { document.getElementById("form").submit(); }, 2000);
+</script>
 </body>
 </html>
diff --git a/LayoutTests/http/tests/misc/timer-vs-loading.html b/LayoutTests/http/tests/misc/timer-vs-loading.html
index 8d85fc6..06529f2 100644
--- a/LayoutTests/http/tests/misc/timer-vs-loading.html
+++ b/LayoutTests/http/tests/misc/timer-vs-loading.html
@@ -18,9 +18,6 @@
             window.location = "data:text/html,SUCCESS<script>layoutTestController.notifyDone()</scr" + "ipt>";
     }
 
-    window.setTimeout("updateClock()", 100);
-    setTimeout('window.location = "resources/hang-connection.php"', 0);
-
 --></script>
 
 </head><body>
@@ -29,4 +26,9 @@
 
     <span id="RESULT">WAIT</span><p>
 
+    <script>
+    window.setTimeout("updateClock()", 100);
+    setTimeout('window.location = "resources/hang-connection.php"', 0);
+    </script>
+
 </body></html>

-- 
WebKit Debian packaging

