Merge pull request #14578 from Snuffleupagus/rm-backingStorePixelRatio

Remove the `backingStorePixelRatio`-part of the `getOutputScale` helper function

web/pdf_page_view.js

@@ -40,7 +40,7 @@ import {
 import {
   approximateFraction,
   DEFAULT_SCALE,
-  getOutputScale,
+  OutputScale,
   RendererType,
   RenderingStates,
   roundToDivide,
@@ -806,8 +806,7 @@ class PDFPageView {
     }
 
     const ctx = canvas.getContext("2d", { alpha: false });
-    const outputScale = getOutputScale(ctx);
+    const outputScale = (this.outputScale = new OutputScale());
-    this.outputScale = outputScale;
 
     if (this.useOnlyCssZoom) {
       const actualSizeViewport = viewport.clone({
@@ -817,7 +816,6 @@ class PDFPageView {
       // of the page.
       outputScale.sx *= actualSizeViewport.width / viewport.width;
       outputScale.sy *= actualSizeViewport.height / viewport.height;
-      outputScale.scaled = true;
     }
 
     if (this.maxCanvasPixels > 0) {
@@ -826,7 +824,6 @@ class PDFPageView {
       if (outputScale.sx > maxScale || outputScale.sy > maxScale) {
         outputScale.sx = maxScale;
         outputScale.sy = maxScale;
-        outputScale.scaled = true;
         this.hasRestrictedScaling = true;
       } else {
         this.hasRestrictedScaling = false;
@@ -844,9 +841,9 @@ class PDFPageView {
     this.paintedViewportMap.set(canvas, viewport);
 
     // Rendering area
-    const transform = !outputScale.scaled
+    const transform = outputScale.scaled
-      ? null
+      ? [outputScale.sx, 0, 0, outputScale.sy, 0, 0]
-      : [outputScale.sx, 0, 0, outputScale.sy, 0, 0];
+      : null;
     const renderContext = {
       canvasContext: ctx,
       transform,

web/pdf_thumbnail_view.js

@@ -19,7 +19,7 @@
 // eslint-disable-next-line max-len
 /** @typedef {import("./pdf_rendering_queue").PDFRenderingQueue} PDFRenderingQueue */
 
-import { getOutputScale, RenderingStates } from "./ui_utils.js";
+import { OutputScale, RenderingStates } from "./ui_utils.js";
 import { RenderingCancelledException } from "pdfjs-lib";
 
 const DRAW_UPSCALE_FACTOR = 2; // See comment in `PDFThumbnailView.draw` below.
@@ -233,7 +233,7 @@ class PDFThumbnailView {
       canvas.mozOpaque = true;
     }
     const ctx = canvas.getContext("2d", { alpha: false });
-    const outputScale = getOutputScale(ctx);
+    const outputScale = new OutputScale();
 
     canvas.width = (upscaleFactor * this.canvasWidth * outputScale.sx) | 0;
     canvas.height = (upscaleFactor * this.canvasHeight * outputScale.sy) | 0;

web/ui_utils.js

@@ -78,24 +78,29 @@ const SpreadMode = {
 const AutoPrintRegExp = /\bprint\s*\(/;
 
 /**
- * Returns scale factor for the canvas. It makes sense for the HiDPI displays.
+ * Scale factors for the canvas, necessary with HiDPI displays.
- * @returns {Object} The object with horizontal (sx) and vertical (sy)
- *                   scales. The scaled property is set to false if scaling is
- *                   not required, true otherwise.
  */
-function getOutputScale(ctx) {
+class OutputScale {
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  constructor() {
-  const backingStoreRatio =
+    const pixelRatio = window.devicePixelRatio || 1;
-    ctx.webkitBackingStorePixelRatio ||
+
-    ctx.mozBackingStorePixelRatio ||
+    /**
-    ctx.backingStorePixelRatio ||
+     * @type {number} Horizontal scale.
-    1;
+     */
-  const pixelRatio = devicePixelRatio / backingStoreRatio;
+    this.sx = pixelRatio;
-  return {
+
-    sx: pixelRatio,
+    /**
-    sy: pixelRatio,
+     * @type {number} Vertical scale.
-    scaled: pixelRatio !== 1,
+     */
-  };
+    this.sy = pixelRatio;
+  }
+
+  /**
+   * @type {boolean} Returns `true` when scaling is required, `false` otherwise.
+   */
+  get scaled() {
+    return this.sx !== 1 || this.sy !== 1;
+  }
 }
 
 /**
@@ -840,7 +845,6 @@ export {
   DEFAULT_SCALE_DELTA,
   DEFAULT_SCALE_VALUE,
   getActiveOrFocusedElement,
-  getOutputScale,
   getPageSizeInches,
   getVisibleElements,
   isPortraitOrientation,
@@ -853,6 +857,7 @@ export {
   noContextMenuHandler,
   normalizeWheelEventDelta,
   normalizeWheelEventDirection,
+  OutputScale,
   parseQueryString,
   PresentationModeState,
   ProgressBar,