From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 24 May 2011 11:24:40 +0100
Subject: Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
---
 LayoutTests/storage/close-during-stress-test.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'LayoutTests/storage/close-during-stress-test.html')

diff --git a/LayoutTests/storage/close-during-stress-test.html b/LayoutTests/storage/close-during-stress-test.html
index 2183e2f..5cc52fd 100644
--- a/LayoutTests/storage/close-during-stress-test.html
+++ b/LayoutTests/storage/close-during-stress-test.html
@@ -2,7 +2,6 @@
 <p>Should not crash or cause an assertion failure.</p>
 <p>A JavaScript failure on the console is expected, however, as the global object is cleared when closing a frame.
 It actually helps to cause database activity by throwing an exception from a callback.</p>
-<iframe src="resources/stress-frame.html" onload="startTest()"></iframe>
 <script>
 if (window.layoutTestController) {
     layoutTestController.waitUntilDone();
@@ -16,4 +15,5 @@ function startTest()
         setTimeout("layoutTestController.notifyDone()", 500);
 }
 </script>
+<iframe src="resources/stress-frame.html" onload="startTest()"></iframe>
 </body>
-- 
cgit v1.1