Title: [94320] trunk/LayoutTests
- Revision
- 94320
- Author
- [email protected]
- Date
- 2011-09-01 11:37:07 -0700 (Thu, 01 Sep 2011)
Log Message
http/tests/loading/empty-urls.html shouldn't
fail if the load event fires before we finish.
https://bugs.webkit.org/show_bug.cgi?id=67359
Reviewed by Adam Barth.
* http/tests/loading/empty-urls-expected.txt:
* http/tests/loading/empty-urls.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (94319 => 94320)
--- trunk/LayoutTests/ChangeLog 2011-09-01 18:20:45 UTC (rev 94319)
+++ trunk/LayoutTests/ChangeLog 2011-09-01 18:37:07 UTC (rev 94320)
@@ -1,3 +1,14 @@
+2011-09-01 Nate Chapin <[email protected]>
+
+ http/tests/loading/empty-urls.html shouldn't
+ fail if the load event fires before we finish.
+ https://bugs.webkit.org/show_bug.cgi?id=67359
+
+ Reviewed by Adam Barth.
+
+ * http/tests/loading/empty-urls-expected.txt:
+ * http/tests/loading/empty-urls.html:
+
2011-09-01 Sam Weinig <[email protected]>
WebGLContextEvent should have its own JS wrapper
Modified: trunk/LayoutTests/http/tests/loading/empty-urls-expected.txt (94319 => 94320)
--- trunk/LayoutTests/http/tests/loading/empty-urls-expected.txt 2011-09-01 18:20:45 UTC (rev 94319)
+++ trunk/LayoutTests/http/tests/loading/empty-urls-expected.txt 2011-09-01 18:37:07 UTC (rev 94320)
@@ -2,6 +2,7 @@
main frame - didCommitLoadForFrame
main frame - didFinishDocumentLoadForFrame
main frame - didFinishLoadForFrame
+main frame - didHandleOnloadEventsForFrame
PASS: img onerror fired
PASS: input type=image onerror fired
PASS: script onerror fired
Modified: trunk/LayoutTests/http/tests/loading/empty-urls.html (94319 => 94320)
--- trunk/LayoutTests/http/tests/loading/empty-urls.html 2011-09-01 18:20:45 UTC (rev 94319)
+++ trunk/LayoutTests/http/tests/loading/empty-urls.html 2011-09-01 18:37:07 UTC (rev 94320)
@@ -9,6 +9,7 @@
var expectedPasses = 6;
var messages = new Array();
var currentMessageIndex = 0;
+var _onloadFired_ = false;
function log(message)
{
@@ -26,7 +27,12 @@
}
expectedPasses--;
- if (expectedPasses == 0 && window.layoutTestController)
+ checkIfDone();
+}
+
+function checkIfDone()
+{
+ if (expectedPasses == 0 && onloadFired && window.layoutTestController)
layoutTestController.notifyDone();
}
</script>
@@ -34,7 +40,7 @@
<link rel="prefetch" src="" href="" _onerror_="log('FAIL: link rel=prefetch onerror fired')"></link>
<link rel="stylesheet" src="" href="" _onerror_="log('FAIL: link rel=stylesheet onerror fired')"></link>
</head>
-<body>
+<body _onload_="setTimeout('_onloadFired_ = true; checkIfDone();', 0)">
<div id="console"></div>
<command icon="" _onerror_="log('FAIL: command onerror fired')"></command>
<object data="" _onerror_="log('FAIL: object onerror fired')"></object>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
