From 3a7aa77950af84058859d2577c9e94ecf1505821 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 14 Jun 2019 22:18:53 -0700
Subject: [PATCH] Remove remaining parts of renderer API, fix webgl tests

---
 src/Terminal.ts                          | 6 ------
 src/TestUtils.test.ts                    | 3 ---
 src/Types.d.ts                           | 1 -
 src/browser/services/RenderService.ts    | 5 +++--
 src/public/Terminal.ts                   | 3 ---
 src/renderer/webgl/WebglRendererAddon.ts | 2 +-
 6 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index f2b2a8c8..eaf2a41d 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -686,12 +686,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
 
   }
 
-  public setRenderer(renderer: IRenderer): void {
-    this._renderService.setRenderer(renderer);
-    // this._renderCoordinator.onOptionsChanged();
-    this.refresh(0, this.rows - 1);
-  }
-
   private _createRenderer(): IRenderer {
     switch (this.options.rendererType) {
       case 'canvas': return new Renderer(this, this._colorManager.colors, this._charSizeService); break;
diff --git a/src/TestUtils.test.ts b/src/TestUtils.test.ts
index 1446c41a..6b92bf0b 100644
--- a/src/TestUtils.test.ts
+++ b/src/TestUtils.test.ts
@@ -24,9 +24,6 @@ export class TestTerminal extends Terminal {
 }
 
 export class MockTerminal implements ITerminal {
-  setRenderer(renderer: any): void {
-    throw new Error('Method not implemented.');
-  }
   onBlur: IEvent<void>;
   onFocus: IEvent<void>;
   onA11yChar: IEvent<string>;
diff --git a/src/Types.d.ts b/src/Types.d.ts
index 8aadfa51..9a08a7a1 100644
--- a/src/Types.d.ts
+++ b/src/Types.d.ts
@@ -271,7 +271,6 @@ export interface IPublicTerminal extends IDisposable {
   writeUtf8(data: Uint8Array): void;
   refresh(start: number, end: number): void;
   reset(): void;
-  setRenderer(renderer: any): void;
 }
 
 export interface IBufferAccessor {
diff --git a/src/browser/services/RenderService.ts b/src/browser/services/RenderService.ts
index 00f3a769..b41f1ebc 100644
--- a/src/browser/services/RenderService.ts
+++ b/src/browser/services/RenderService.ts
@@ -105,13 +105,14 @@ export class RenderService extends Disposable implements IRenderService {
     // TODO: RenderCoordinator should be the only one to dispose the renderer
     this._renderer.dispose();
     this._renderer = renderer;
+    this.refreshRows(0, this._rowCount - 1);
   }
 
   private _fullRefresh(): void {
     if (this._isPaused) {
       this._needsFullRefresh = true;
     } else {
-      this.refreshRows(0, this._rowCount);
+      this.refreshRows(0, this._rowCount - 1);
     }
   }
 
@@ -122,7 +123,7 @@ export class RenderService extends Disposable implements IRenderService {
 
   public onDevicePixelRatioChange(): void {
     this._renderer.onDevicePixelRatioChange();
-    this.refreshRows(0, this._rowCount);
+    this.refreshRows(0, this._rowCount - 1);
   }
 
   public onResize(cols: number, rows: number): void {
diff --git a/src/public/Terminal.ts b/src/public/Terminal.ts
index a1830576..2026d70e 100644
--- a/src/public/Terminal.ts
+++ b/src/public/Terminal.ts
@@ -162,9 +162,6 @@ export class Terminal implements ITerminalApi {
   public loadAddon(addon: ITerminalAddon): void {
     return this._addonManager.loadAddon(this, addon);
   }
-  public setRenderer(renderer: any): void {
-    this._core.setRenderer(renderer);
-  }
   public loadWebgl(preserveDrawingBuffer?: boolean): void {
     this.loadAddon(new WebglRendererAddon(preserveDrawingBuffer));
   }
diff --git a/src/renderer/webgl/WebglRendererAddon.ts b/src/renderer/webgl/WebglRendererAddon.ts
index 9ebe954f..e29a7f07 100644
--- a/src/renderer/webgl/WebglRendererAddon.ts
+++ b/src/renderer/webgl/WebglRendererAddon.ts
@@ -18,7 +18,7 @@ export class WebglRendererAddon implements ITerminalAddon {
       throw new Error('Cannot activate WebglRendererAddon before Terminal.open');
     }
     this._terminal = terminal;
-    (<any>this._terminal)._renderService.setRenderer(new WebglRenderer(terminal, (terminal as any)._core._colorManager.colors, this._preserveDrawingBuffer));
+    (<any>this._terminal)._core._renderService.setRenderer(new WebglRenderer(terminal, (terminal as any)._core._colorManager.colors, this._preserveDrawingBuffer));
   }
 
   public dispose(): void {