If you make rommel, you clean up.

rdkcentral · Apr 20, 2023 · c988a62 · c988a62
1 parent b17b3a5
commit c988a62
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 1 deletion.
diff --git a/src/platforms/browser/ImageWorker.mjs b/src/platforms/browser/ImageWorker.mjs
@@ -30,6 +30,12 @@ export default class ImageWorker {
         if (this._worker) {
             this._worker.terminate();
         }
+
+        this._items = null;
+        this._worker = null;
+
+        delete this._items;
+        delete this._worker;        
     }
 
     _initWorker() {

diff --git a/src/platforms/browser/WebPlatform.mjs b/src/platforms/browser/WebPlatform.mjs
@@ -50,11 +50,17 @@ export default class WebPlatform {
         if (this._imageWorker) {
             this._imageWorker.destroy();
         }
+
+        clearInterval(this._loopHandler);
+
         this._removeKeyHandler();
         this._removeClickHandler();
         this._removeHoverHandler();
         this._removeScrollWheelHandler();
         this._removeVisibilityChangeHandler();
+
+        this.stage = null;
+        delete this.stage;
     }
 
     startLoop() {

diff --git a/src/renderer/c2d/C2dRenderer.mjs b/src/renderer/c2d/C2dRenderer.mjs
@@ -38,6 +38,9 @@ export default class C2dRenderer extends Renderer {
 
     destroy() {
         this.tintManager.destroy();
+
+        this.tintManager = null;
+        delete this.tintManager;
     }
 
     _createDefaultShader(ctx) {

diff --git a/src/renderer/c2d/C2dTextureTintManager.mjs b/src/renderer/c2d/C2dTextureTintManager.mjs
@@ -27,6 +27,9 @@ export default class C2dTextureTintManager {
 
     destroy() {
         this.gc(true);
+
+        this.stage = null;
+        delete this.stage;
     }
 
     _addMemoryUsage(delta) {

diff --git a/src/renderer/webgl/WebGLCoreRenderExecutor.mjs b/src/renderer/webgl/WebGLCoreRenderExecutor.mjs
@@ -64,6 +64,9 @@ export default class WebGLCoreRenderExecutor extends CoreRenderExecutor {
         super.destroy();
         this.gl.deleteBuffer(this._attribsBuffer);
         this.gl.deleteBuffer(this._quadsBuffer);
+
+        this.gl = null;
+        delete this.gl;
     }
 
     _reset() {

diff --git a/src/renderer/webgl/WebGLRenderer.mjs b/src/renderer/webgl/WebGLRenderer.mjs
@@ -46,6 +46,12 @@ export default class WebGLRenderer extends Renderer {
 
     destroy() {
         this.shaderPrograms.forEach(shaderProgram => shaderProgram.destroy());
+
+        this.shaderPrograms = null;
+        this._compressedTextureExtensions = null;
+
+        delete this.shaderPrograms;
+        delete this._compressedTextureExtensions;
     }
 
     _createDefaultShader(ctx) {

diff --git a/src/renderer/webgl/WebGLShaderProgram.mjs b/src/renderer/webgl/WebGLShaderProgram.mjs
@@ -28,6 +28,7 @@ export default class WebGLShaderProgram {
         this.fragmentShaderSource = fragmentShaderSource;
 
         this._program = null;
+        this.gl = null;
 
         this._uniformLocations = new Map();
         this._attributeLocations = new Map();
@@ -109,8 +110,24 @@ export default class WebGLShaderProgram {
     destroy() {
         if (this._program) {
             this.gl.deleteProgram(this._program);
-            this._program = null;
         }
+
+        this._attributeLocations = null;
+        this._currentUniformValues = null;
+        this.fragmentShaderSource = null;
+        this._program = null;
+        this.gl = null;
+        this._uniformLocations = null;
+        this.vertexShaderSource = null;  
+
+        delete this.vertexShaderSource;
+        delete this._program;        
+        delete this._currentUniformValues;
+        delete this.fragmentShaderSource;
+        delete this.gl;
+        delete this._uniformLocations;
+        delete this._attributeLocations;
+
     }
 
     get glProgram() {

diff --git a/src/tree/Stage.mjs b/src/tree/Stage.mjs
@@ -223,6 +223,20 @@ export default class Stage extends EventEmitter {
         this.ctx.destroy();
         this.textureManager.destroy();
         this._renderer.destroy();
+
+        this.gl = null;
+        this.c2d = null;
+        this.ctx = null;
+        this.platform = null;
+        this.textureManager = null;
+        this._renderer = null;
+
+        delete this.gl;
+        delete this.c2d;
+        delete this.ctx;
+        delete this.platform;
+        delete this.textureManager;
+        delete this._renderer;
     }
 
     stop() {

diff --git a/src/tree/TextureThrottler.mjs b/src/tree/TextureThrottler.mjs
@@ -36,6 +36,11 @@ export default class TextureThrottler {
     destroy() {
         this._sources = [];
         this._data = [];
+        this.stage = null;
+
+        delete this._sources;
+        delete this._data;
+        delete this.stage;
     }
 
     processSome() {

diff --git a/src/tree/core/CoreContext.mjs b/src/tree/core/CoreContext.mjs
@@ -49,6 +49,21 @@ export default class CoreContext {
     destroy() {
         this._renderTexturePool.forEach(texture => this._freeRenderTexture(texture));
         this._usedMemory = 0;
+
+        this.stage = null;
+        this.root = null;
+
+        this.renderState = null;
+        this.renderExec = null;
+        this._renderTexturePool = null;
+        this._zSorts = null;
+
+        delete this.stage;
+        delete this.root;
+        delete this.renderState;
+        delete this.renderExec;
+        delete this._renderTexturePool;
+        delete this._zSorts;
     }
 
     hasRenderUpdates() {

diff --git a/src/tree/core/CoreRenderExecutor.mjs b/src/tree/core/CoreRenderExecutor.mjs
@@ -29,6 +29,13 @@ export default class CoreRenderExecutor {
     }
 
     destroy() {
+        this.ctx = null;
+        this.renderState = null;
+        this.gl = null;
+
+        delete this.ctx;
+        delete this.renderState;
+        delete this.gl;
     }
 
     _reset() {