mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
Bug 528946 - Move the iframe below the script in test_bug497665.html so we don't get checkFirst is not defined when the iframe's onload races parsing the script, a=test
This commit is contained in:
parent
09b32a6f6e
commit
c09e907566
@ -12,17 +12,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=497665
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=497665">Mozilla Bug 497665</a>
|
||||
<p id="display"></p>
|
||||
<div id="content"> <!-- style="display: none" -->
|
||||
<canvas id="canvas" width="100" height="100"> </canvas>
|
||||
<iframe id="test-iframe" src="bug497665-iframe.html" onload="checkFirst()"></iframe>
|
||||
</div>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
|
||||
var image1first, image2first, image1second, image2second, image1third, image2third;
|
||||
var iframeelem = document.getElementById('test-iframe');
|
||||
var canvas = document.getElementById('canvas');
|
||||
var ctx = canvas.getContext('2d');
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
|
||||
@ -30,6 +23,10 @@ function checkFirst()
|
||||
{
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
|
||||
|
||||
var iframeelem = document.getElementById('test-iframe');
|
||||
var canvas = document.getElementById('canvas');
|
||||
var ctx = canvas.getContext('2d');
|
||||
|
||||
var firstimg = iframeelem.contentDocument.getElementById('image1');
|
||||
var secondimg = iframeelem.contentDocument.getElementById('image2');
|
||||
ctx.drawImage(firstimg, 0, 0);
|
||||
@ -45,6 +42,10 @@ function checkFirst()
|
||||
|
||||
function checkForceReload()
|
||||
{
|
||||
var iframeelem = document.getElementById('test-iframe');
|
||||
var canvas = document.getElementById('canvas');
|
||||
var ctx = canvas.getContext('2d');
|
||||
|
||||
var firstimg = iframeelem.contentDocument.getElementById('image1');
|
||||
var secondimg = iframeelem.contentDocument.getElementById('image2');
|
||||
ctx.drawImage(firstimg, 0, 0);
|
||||
@ -63,6 +64,10 @@ function checkForceReload()
|
||||
|
||||
function checkReload()
|
||||
{
|
||||
var iframeelem = document.getElementById('test-iframe');
|
||||
var canvas = document.getElementById('canvas');
|
||||
var ctx = canvas.getContext('2d');
|
||||
|
||||
var firstimg = iframeelem.contentDocument.getElementById('image1');
|
||||
var secondimg = iframeelem.contentDocument.getElementById('image2');
|
||||
ctx.drawImage(firstimg, 0, 0);
|
||||
@ -81,5 +86,9 @@ function checkReload()
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
<div id="content"> <!-- style="display: none" -->
|
||||
<canvas id="canvas" width="100" height="100"> </canvas>
|
||||
<iframe id="test-iframe" src="bug497665-iframe.html" onload="checkFirst()"></iframe>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
Loading…
Reference in New Issue
Block a user