From eea0bcec452d6699a01c62f9d54db528861b2de3 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Tue, 23 Feb 2016 18:43:37 -0500
Subject: [PATCH] Bug 1249489 - covert css to device pixels in
 scroll/test_zoom.html and test_nsIAccessibleImage.html, r=yzen

---
 accessible/tests/mochitest/scroll/test_zoom.html        | 3 ++-
 accessible/tests/mochitest/test_nsIAccessibleImage.html | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/accessible/tests/mochitest/scroll/test_zoom.html b/accessible/tests/mochitest/scroll/test_zoom.html
index 3001a8048e31..05dd3c4440db 100644
--- a/accessible/tests/mochitest/scroll/test_zoom.html
+++ b/accessible/tests/mochitest/scroll/test_zoom.html
@@ -32,7 +32,8 @@
       anchor = getAccessible("bottom2");
       var [x, y] = getPos(anchor);
       var wnd = getRootAccessible().DOMDocument.defaultView;
-      var scrollToX = docX - wnd.screenX, scrollToY = docY - wnd.screenY;
+      var [screenX, screenY] = CSSToDevicePixels(wnd, wnd.screenX, wnd.screenY);
+      var scrollToX = docX - screenX, scrollToY = docY - screenY;
 
       anchor.scrollToPoint(COORDTYPE_WINDOW_RELATIVE, scrollToX, scrollToY);
       testPos(anchor, [x, docY]);
diff --git a/accessible/tests/mochitest/test_nsIAccessibleImage.html b/accessible/tests/mochitest/test_nsIAccessibleImage.html
index 266235fc1ecd..39e7e41e1b09 100644
--- a/accessible/tests/mochitest/test_nsIAccessibleImage.html
+++ b/accessible/tests/mochitest/test_nsIAccessibleImage.html
@@ -16,6 +16,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429659
           src="role.js"></script>
   <script type="application/javascript"
           src="attributes.js"></script>
+  <script type="application/javascript"
+          src="layout.js"></script>
 
   <script type="application/javascript">
     function testCoordinates(aID, aAcc, aWidth, aHeight)
@@ -70,10 +72,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429659
 //           "Wrong screen y coordinate for " + aID + "!");
       }
 
+      var [expected_w, expected_h] = CSSToDevicePixels(window, aWidth, aHeight);
       var width = {}, height = {};
       aAcc.getImageSize(width, height);
-      is(width.value, aWidth, "Wrong width for " + aID + "!");
-      is(height.value, aHeight, "wrong height for " + aID + "!");
+      is(width.value, expected_w, "Wrong width for " + aID + "!");
+      is(height.value, expected_h, "wrong height for " + aID + "!");
     }
 
     function testThis(aID, aSRC, aWidth, aHeight,