Bug 1425370 - Fix DPI scaling for mozscreenshots. r?mattn draft
authorJared Wein <jwein@mozilla.com>
Thu, 14 Dec 2017 17:44:37 -0600
changeset 711887 de41711d26335266b3c7aaa991fa4f62035083fa
parent 709018 e30c06a1074c2455f47e0bafb9bb84ec1a09d682
child 743922 ce7514717fc3e272b00986ee723045533c33a974
push id93194
push userbmo:jaws@mozilla.com
push dateThu, 14 Dec 2017 23:45:15 +0000
reviewersmattn
bugs1425370
milestone59.0a1
Bug 1425370 - Fix DPI scaling for mozscreenshots. r?mattn MozReview-Commit-ID: LjmcLImLx0d
browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
@@ -200,19 +200,20 @@ this.TestRunner = {
     if (!selectors.length) {
       throw "No selectors specified.";
     }
 
     // Set window type, default "navigator:browser"
     windowType = windowType || "navigator:browser";
     let browserWindow = Services.wm.getMostRecentWindow(windowType);
     // Scale for high-density displays
-    const scale = browserWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                        .getInterface(Ci.nsIDocShell).QueryInterface(Ci.nsIBaseWindow)
-                        .devicePixelsPerDesktopPixel;
+    const scale = Cc["@mozilla.org/gfx/screenmanager;1"]
+                    .getService(Ci.nsIScreenManager)
+                    .screenForRect(browserWindow.screenX, browserWindow.screenY, 1, 1)
+                    .defaultCSSScaleFactor;
 
     const windowLeft = browserWindow.screenX * scale;
     const windowTop = browserWindow.screenY * scale;
     const windowWidth = browserWindow.outerWidth * scale;
     const windowHeight = browserWindow.outerHeight * scale;
 
     let bounds;
     const rects = [];