Merge remote-tracking branch 'origin/tracking' into custom

toolkit/components/thumbnails/PageThumbUtils.jsm

@@ -71,6 +71,18 @@ this.PageThumbUtils = {
       let windowScale = aWindow ? aWindow.devicePixelRatio : systemScale;
       let scale = Math.max(systemScale, windowScale);
 
+#ifdef XP_MACOSX
+      /** *
+       * On retina displays, we can sometimes go down this path
+       * without a window object. In those cases, force 2x scaling
+       * as the system scale doesn't represent the 2x scaling
+       * on OS X.
+       */
+      if (!aWindow) {
+        scale = 2;
+      }
+#endif
+
       /** *
        * THESE VALUES ARE DEFINED IN newtab.css and hard coded.
        * If you change these values from the prefs,

toolkit/components/thumbnails/moz.build

@@ -11,11 +11,11 @@ EXTRA_COMPONENTS += [
 EXTRA_JS_MODULES += [
     'PageThumbs.jsm',
     'PageThumbsWorker.js',
-    'PageThumbUtils.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'BackgroundPageThumbs.jsm',
+    'PageThumbUtils.jsm',
 ]
 
 JAR_MANIFESTS += ['jar.mn']