Bug 698985 - make canvas/image-rendering-test.html more reliable. r=dholbert

2011-11-19 08:53:35 +00:00 · 2011-11-19 08:53:35 +00:00 · 89b6a36b03
--- a/layout/reftests/canvas/image-rendering-test.html
+++ b/layout/reftests/canvas/image-rendering-test.html
@ -3,13 +3,15 @@
    Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/licenses/publicdomain/
  -->
-<html reftest-zoom="2">
+<html reftest-zoom="2" class="reftest-wait">
 <head>
  <title>test image-rendering</title>
  <style>
    canvas { position:absolute;left:0px;top:0px; }
  </style>
  <script type="text/javascript">
+    document.addEventListener("MozReftestInvalidate", draw, false);
+    
    function draw() {
        var canvas = document.getElementById("canvas");
        var ctx = canvas.getContext("2d");
@ -17,10 +19,11 @@
        ctx.fillRect(25,25,100,100);
        ctx.fillStyle = "rgb(0,255,0)";
        ctx.fillRect(25,25,50,50);
+        document.documentElement.removeAttribute('class');
    }
  </script>
 </head>
-<body onload="draw();">
+<body>
  <canvas style="image-rendering: -moz-crisp-edges; " id="canvas" width="300" height="300"></canvas>
 </body>
 </html>
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@ -1,7 +1,7 @@
 == default-size.html default-size-ref.html
 == size-1.html size-1-ref.html

-fails-if(Android) == image-rendering-test.html image-rendering-ref.html # bug 698985
+== image-rendering-test.html image-rendering-ref.html
 == image-shadow.html image-shadow-ref.html

 asserts-if(cocoaWidget,0-2) == size-change-1.html size-change-1-ref.html