From bb9ccf40b62a6730dcf9b5faba77e170f0d44304 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sun, 9 Dec 2018 09:28:04 -0800
Subject: [PATCH] Reduce diff with master

---
 src/renderer/atlas/CharAtlasCache.ts | 5 ++---
 src/renderer/atlas/CharAtlasUtils.ts | 4 ++--
 src/renderer/webgl/WebglRenderer.ts  | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/renderer/atlas/CharAtlasCache.ts b/src/renderer/atlas/CharAtlasCache.ts
index 5a9c1a6e..db7db118 100644
--- a/src/renderer/atlas/CharAtlasCache.ts
+++ b/src/renderer/atlas/CharAtlasCache.ts
@@ -40,10 +40,9 @@ export function acquireCharAtlas(
   terminal: ITerminal,
   colors: IColorSet,
   scaledCharWidth: number,
-  scaledCharHeight: number,
-  devicePixelRatio?: number
+  scaledCharHeight: number
 ): BaseCharAtlas {
-  const newConfig = generateConfig(scaledCharWidth, scaledCharHeight, terminal, colors, devicePixelRatio);
+  const newConfig = generateConfig(scaledCharWidth, scaledCharHeight, terminal, colors);
 
   // TODO: Currently if a terminal changes configs it will not free the entry reference (until it's disposed)
 
diff --git a/src/renderer/atlas/CharAtlasUtils.ts b/src/renderer/atlas/CharAtlasUtils.ts
index 52c8a9bd..5b1add39 100644
--- a/src/renderer/atlas/CharAtlasUtils.ts
+++ b/src/renderer/atlas/CharAtlasUtils.ts
@@ -7,7 +7,7 @@ import { ITerminal } from '../../Types';
 import { IColorSet } from '../Types';
 import { DEFAULT_COLOR, ICharAtlasConfig } from './Types';
 
-export function generateConfig(scaledCharWidth: number, scaledCharHeight: number, terminal: ITerminal, colors: IColorSet, devicePixelRatio: number = window.devicePixelRatio): ICharAtlasConfig {
+export function generateConfig(scaledCharWidth: number, scaledCharHeight: number, terminal: ITerminal, colors: IColorSet): ICharAtlasConfig {
   // null out some fields that don't matter
   const clonedColors = <IColorSet>{
     foreground: colors.foreground,
@@ -21,7 +21,7 @@ export function generateConfig(scaledCharWidth: number, scaledCharHeight: number
   };
   return {
     type: terminal.options.experimentalCharAtlas,
-    devicePixelRatio,
+    devicePixelRatio: window.devicePixelRatio,
     scaledCharWidth,
     scaledCharHeight,
     fontFamily: terminal.options.fontFamily,
diff --git a/src/renderer/webgl/WebglRenderer.ts b/src/renderer/webgl/WebglRenderer.ts
index f8d73a32..92e9828a 100644
--- a/src/renderer/webgl/WebglRenderer.ts
+++ b/src/renderer/webgl/WebglRenderer.ts
@@ -173,7 +173,7 @@ export class WebglRenderer extends EventEmitter implements IRenderer {
     this._glyphRenderer.setDimensions(this.dimensions);
     this._glyphRenderer.onResize();
 
-    this._refreshCharAtlas(devicePixelRatio);
+    this._refreshCharAtlas();
     this._refreshViewport();
 
     this.emit('resize', {
@@ -219,12 +219,12 @@ export class WebglRenderer extends EventEmitter implements IRenderer {
    * @param terminal The terminal.
    * @param colorSet The color set to use for the char atlas.
    */
-  private _refreshCharAtlas(devicePixelRatio: number = window.devicePixelRatio): void {
+  private _refreshCharAtlas(): void {
     if (this.dimensions.scaledCharWidth <= 0 && this.dimensions.scaledCharHeight <= 0) {
       return;
     }
 
-    const atlas = acquireCharAtlas(this._terminal, this.colorManager.colors, this.dimensions.scaledCharWidth, this.dimensions.scaledCharHeight, devicePixelRatio);
+    const atlas = acquireCharAtlas(this._terminal, this.colorManager.colors, this.dimensions.scaledCharWidth, this.dimensions.scaledCharHeight);
     if (!('getRasterizedGlyph' in atlas)) {
       throw new Error('The webgl renderer only works with the webgl char atlas');
     }