From 4c3082c924ac2bd950edd2a16300d1d28469f5c6 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Sun, 28 Apr 2019 01:59:40 +0000
Subject: [PATCH] Remove ITerminal dependency in RenderDebouncer

---
 src/AccessibilityManager.ts     |  4 ++--
 src/renderer/Renderer.ts        |  4 ++--
 src/renderer/dom/DomRenderer.ts |  4 ++--
 src/ui/RenderDebouncer.ts       | 15 ++++++++++-----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/AccessibilityManager.ts b/src/AccessibilityManager.ts
index e2115797..1f44c132 100644
--- a/src/AccessibilityManager.ts
+++ b/src/AccessibilityManager.ts
@@ -61,7 +61,7 @@ export class AccessibilityManager extends Disposable {
     this._refreshRowsDimensions();
     this._accessibilityTreeRoot.appendChild(this._rowContainer);
 
-    this._renderRowsDebouncer = new RenderDebouncer(this._terminal, this._renderRows.bind(this));
+    this._renderRowsDebouncer = new RenderDebouncer(this._renderRows.bind(this));
     this._refreshRows();
 
     this._liveRegion = document.createElement('div');
@@ -239,7 +239,7 @@ export class AccessibilityManager extends Disposable {
   }
 
   private _refreshRows(start?: number, end?: number): void {
-    this._renderRowsDebouncer.refresh(start, end);
+    this._renderRowsDebouncer.refresh(start, end, this._terminal.rows);
   }
 
   private _renderRows(start: number, end: number): void {
diff --git a/src/renderer/Renderer.ts b/src/renderer/Renderer.ts
index 2a205be3..14ce72b3 100644
--- a/src/renderer/Renderer.ts
+++ b/src/renderer/Renderer.ts
@@ -68,7 +68,7 @@ export class Renderer extends Disposable implements IRenderer {
     this._updateDimensions();
     this.onOptionsChanged();
 
-    this._renderDebouncer = new RenderDebouncer(this._terminal, this._renderRows.bind(this));
+    this._renderDebouncer = new RenderDebouncer(this._renderRows.bind(this));
     this._screenDprMonitor = new ScreenDprMonitor();
     this._screenDprMonitor.setListener(() => this.onWindowResize(window.devicePixelRatio));
     this.register(this._screenDprMonitor);
@@ -194,7 +194,7 @@ export class Renderer extends Disposable implements IRenderer {
       this._needsFullRefresh = true;
       return;
     }
-    this._renderDebouncer.refresh(start, end);
+    this._renderDebouncer.refresh(start, end, this._terminal.rows);
   }
 
   /**
diff --git a/src/renderer/dom/DomRenderer.ts b/src/renderer/dom/DomRenderer.ts
index 1d879fcd..ea3ac5d9 100644
--- a/src/renderer/dom/DomRenderer.ts
+++ b/src/renderer/dom/DomRenderer.ts
@@ -80,7 +80,7 @@ export class DomRenderer extends Disposable implements IRenderer {
     };
     this._updateDimensions();
 
-    this._renderDebouncer = new RenderDebouncer(this._terminal, this._renderRows.bind(this));
+    this._renderDebouncer = new RenderDebouncer(this._renderRows.bind(this));
     this._rowFactory = new DomRendererRowFactory(_terminal.options, document);
 
     this._terminal.element.classList.add(TERMINAL_CLASS_PREFIX + this._terminalClass);
@@ -340,7 +340,7 @@ export class DomRenderer extends Disposable implements IRenderer {
   }
 
   public refreshRows(start: number, end: number): void {
-    this._renderDebouncer.refresh(start, end);
+    this._renderDebouncer.refresh(start, end, this._terminal.rows);
   }
 
   private _renderRows(start: number, end: number): void {
diff --git a/src/ui/RenderDebouncer.ts b/src/ui/RenderDebouncer.ts
index 775b7f74..260de12e 100644
--- a/src/ui/RenderDebouncer.ts
+++ b/src/ui/RenderDebouncer.ts
@@ -1,4 +1,8 @@
-import { ITerminal } from '../Types';
+/**
+ * Copyright (c) 2018 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { IDisposable } from 'xterm';
 
 /**
@@ -7,10 +11,10 @@ import { IDisposable } from 'xterm';
 export class RenderDebouncer implements IDisposable {
   private _rowStart: number;
   private _rowEnd: number;
+  private _rowCount: number;
   private _animationFrame: number = null;
 
   constructor(
-    private _terminal: ITerminal,
     private _callback: (start: number, end: number) => void
   ) {
   }
@@ -22,10 +26,11 @@ export class RenderDebouncer implements IDisposable {
     }
   }
 
-  public refresh(rowStart: number, rowEnd: number): void {
+  public refresh(rowStart: number, rowEnd: number, rowCount: number): void {
+    this._rowCount = rowCount;
     // Get the min/max row start/end for the arg values
     rowStart = rowStart !== null && rowStart !== undefined ? rowStart : 0;
-    rowEnd = rowEnd !== null && rowEnd !== undefined ? rowEnd : this._terminal.rows - 1;
+    rowEnd = rowEnd !== null && rowEnd !== undefined ? rowEnd : this._rowCount - 1;
     // Check whether the row start/end values have already been set
     const isRowStartSet = this._rowStart !== undefined && this._rowStart !== null;
     const isRowEndSet = this._rowEnd !== undefined && this._rowEnd !== null;
@@ -43,7 +48,7 @@ export class RenderDebouncer implements IDisposable {
   private _innerRefresh(): void {
     // Clamp values
     this._rowStart = Math.max(this._rowStart, 0);
-    this._rowEnd = Math.min(this._rowEnd, this._terminal.rows - 1);
+    this._rowEnd = Math.min(this._rowEnd, this._rowCount - 1);
 
     // Run render callback
     this._callback(this._rowStart, this._rowEnd);