summaryrefslogtreecommitdiffstats
path: root/LayoutTests/storage/close-during-stress-test.html
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-24 11:24:40 +0100
committerBen Murdoch <benm@google.com>2011-06-02 09:53:15 +0100
commit81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch)
tree7a9e5ed86ff429fd347a25153107221543909b19 /LayoutTests/storage/close-during-stress-test.html
parent94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff)
downloadexternal_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip
external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz
external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'LayoutTests/storage/close-during-stress-test.html')
-rw-r--r--LayoutTests/storage/close-during-stress-test.html2
1 files changed, 1 insertions, 1 deletions
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>