Revert "Merge pull request #4166 from Tyriar/event_with_emitter"

This reverts commit d22f7c9edd, reversing
changes made to 1f8e6f0952.

src/browser/services/RenderService.ts

@@ -5,7 +5,7 @@
 
 import { IRenderer, IRenderDimensions } from 'browser/renderer/shared/Types';
 import { RenderDebouncer } from 'browser/RenderDebouncer';
-import { EventEmitter, IEvent, initEvent } from 'common/EventEmitter';
+import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { Disposable } from 'common/Lifecycle';
 import { ScreenDprMonitor } from 'browser/ScreenDprMonitor';
 import { addDisposableDomListener } from 'browser/Lifecycle';
@@ -39,10 +39,14 @@ export class RenderService extends Disposable implements IRenderService {
     columnSelectMode: false
   };
 
-  public readonly onDimensionsChange = initEvent<IRenderDimensions>();
-  public readonly onRenderedViewportChange = initEvent<{ start: number, end: number }>();
-  public readonly onRender = initEvent<{ start: number, end: number }>();
-  public readonly onRefreshRequest = initEvent<{ start: number, end: number }>();
+  private readonly _onDimensionsChange = new EventEmitter<IRenderDimensions>();
+  public readonly onDimensionsChange =  this._onDimensionsChange.event;
+  private readonly _onRenderedViewportChange = new EventEmitter<{ start: number, end: number }>();
+  public readonly onRenderedViewportChange = this._onRenderedViewportChange.event;
+  private readonly _onRender = new EventEmitter<{ start: number, end: number }>();
+  public readonly onRender = this._onRender.event;
+  private readonly _onRefreshRequest = new EventEmitter<{ start: number, end: number }>();
+  public readonly onRefreshRequest = this._onRefreshRequest.event;
 
   public get dimensions(): IRenderDimensions { return this._renderer.dimensions; }
 
@@ -131,9 +135,9 @@ export class RenderService extends Disposable implements IRenderService {
 
     // Fire render event only if it was not a redraw
     if (!this._isNextRenderRedrawOnly) {
-      this.onRenderedViewportChange.fire({ start, end });
+      this._onRenderedViewportChange.fire({ start, end });
     }
-    this.onRender.fire({ start, end });
+    this._onRender.fire({ start, end });
     this._isNextRenderRedrawOnly = true;
   }
 
@@ -153,7 +157,7 @@ export class RenderService extends Disposable implements IRenderService {
     if (this._renderer.dimensions.canvasWidth === this._canvasWidth && this._renderer.dimensions.canvasHeight === this._canvasHeight) {
       return;
     }
-    this.onDimensionsChange.fire(this._renderer.dimensions);
+    this._onDimensionsChange.fire(this._renderer.dimensions);
   }
 
   public dispose(): void {