From 8e47f02ae06e5a85f29a12b55f5557358f4f53c7 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Tue, 17 Jun 2014 10:16:08 -0700
Subject: [PATCH] Bug 987163 - Test fixups. r=gabor

---
 dom/tests/mochitest/chrome/test_sandbox_bindings.xul | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dom/tests/mochitest/chrome/test_sandbox_bindings.xul b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
index 04989e99b68..4ee77924534 100644
--- a/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
+++ b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
@@ -21,6 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=741267
   <![CDATA[
 
   /** Test for Bug 741267 **/
+    const Cu = Components.utils;
     function isXrayWrapper(x) {
       return Components.utils.isXrayWrapper(x);
     }
@@ -163,16 +164,18 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=741267
         for (var i = 0; i < data.data.length; ++i) {
           // Watch out for premultiplied bits... just set all the alphas to 255
           if (i % 4 == 3) {
-            data.data[i] = 255;
+            // Note - We need to waive Xrays here because indexed access on Typed
+            // Arrays is forbidden over Xrays for performance reasons.
+            Cu.waiveXrays(data.data)[i] = 255;
           } else {
-            data.data[i] = i;
+            Cu.waiveXrays(data.data)[i] = i;
           }
         }
         ctx.putImageData(data, 0, 0);
         var data2 = ctx.getImageData(0, 0, 1, 1);
         is(data2.data.length, data.data.length, "Lengths must match");
         for (i = 0; i < data.data.length; ++i)
-          is(data.data[i], data2.data[i], "Data at " + i + " should match");
+          is(Cu.waiveXrays(data.data)[i], Cu.waiveXrays(data2.data)[i], "Data at " + i + " should match");
       } catch (e) {
         ok(false, "Imagedata manipulation via an Xray shouldn't throw " + e);
       }