Merge inbound to m-c. a=merge
Merge inbound to m-c. a=merge
--- a/docshell/test/test_bug694612.html
+++ b/docshell/test/test_bug694612.html
@@ -13,15 +13,22 @@ https://bugzilla.mozilla.org/show_bug.cg
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 694612 **/
SimpleTest.waitForExplicitFinish();
+
+window.addEventListener("message", receiveMessage);
+function receiveMessage(event) {
+ ok(event.data.result, "should have performance API in an <object>");
+ window.removeEventListener("message", receiveMessage);
+ SimpleTest.finish();
+}
</script>
<object type="text/html"
- data="data:text/html,<script>parent.isnot(performance, null, 'should have performance API in an <object>'); parent.SimpleTest.finish();</script>">
+ data="data:text/html,<script>parent.postMessage({result:performance!=null},'*');</script>">
</object>
</pre>
</body>
</html>