From a8d43eb2ec9d0aca8aa21cf34931c5ab0357a5a8 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Fri, 7 Feb 2025 05:58:28 -0800 Subject: [PATCH] Fix issue where listeners remain after WebglRenderer throws See microsoft/vscode#239838 --- addons/addon-webgl/src/WebglRenderer.ts | 26 +++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/addons/addon-webgl/src/WebglRenderer.ts b/addons/addon-webgl/src/WebglRenderer.ts index 398594d9..576cdad5 100644 --- a/addons/addon-webgl/src/WebglRenderer.ts +++ b/addons/addon-webgl/src/WebglRenderer.ts @@ -76,6 +76,20 @@ export class WebglRenderer extends Disposable implements IRenderer { ) { super(); + // IMPORTANT: Canvas initialization and fetching of the context must be first in order to + // prevent possible listeners leaking and continuing to operate after the WebglRenderer has been + // discarded. + this._canvas = this._coreBrowserService.mainDocument.createElement('canvas'); + const contextAttributes = { + antialias: false, + depth: false, + preserveDrawingBuffer + }; + this._gl = this._canvas.getContext('webgl2', contextAttributes) as IWebGL2RenderingContext; + if (!this._gl) { + throw new Error('WebGL2 not supported ' + this._gl); + } + this._register(this._themeService.onChangeColors(() => this._handleColorChange())); this._cellColorResolver = new CellColorResolver(this._terminal, this._optionsService, this._model.selection, this._decorationService, this._coreBrowserService, this._themeService); @@ -91,18 +105,6 @@ export class WebglRenderer extends Disposable implements IRenderer { this._updateCursorBlink(); this._register(_optionsService.onOptionChange(() => this._handleOptionsChanged())); - this._canvas = this._coreBrowserService.mainDocument.createElement('canvas'); - - const contextAttributes = { - antialias: false, - depth: false, - preserveDrawingBuffer - }; - this._gl = this._canvas.getContext('webgl2', contextAttributes) as IWebGL2RenderingContext; - if (!this._gl) { - throw new Error('WebGL2 not supported ' + this._gl); - } - this._deviceMaxTextureSize = this._gl.getParameter(this._gl.MAX_TEXTURE_SIZE); this._register(addDisposableListener(this._canvas, 'webglcontextlost', (e) => {