fixed ImageBitmap memory leak (#3399)

* fixed ImageBitmap memory leak * better naming
google · May 2, 2022 · 4734ba3 · 4734ba3
1 parent 8e0894b
commit 4734ba3
Show file tree

Hide file tree

Showing 8 changed files with 1,164 additions and 910 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/model-viewer/package-lock.json b/packages/model-viewer/package-lock.json
diff --git a/packages/model-viewer/package.json b/packages/model-viewer/package.json
@@ -81,7 +81,7 @@
     "@types/chai": "^4.2.21",
     "@types/mocha": "^8.2.3",
     "@types/pngjs": "^6.0.1",
-    "@types/three": "^0.137.0",
+    "@types/three": "^0.139.0",
     "@ungap/event-target": "^0.2.2",
     "chai": "^4.3.4",
     "focus-visible": "^5.2.0",
@@ -104,4 +104,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}
diff --git a/packages/model-viewer/src/test/model-viewer-spec.ts b/packages/model-viewer/src/test/model-viewer-spec.ts
@@ -42,7 +42,8 @@ const setupLighting =
 // TODO(sun765): this only test whether the screenshot
 // is colorless or not. Replace this with more robust
 // test in later pr.
-function testFidelity(screenshotContext: WebGLRenderingContext) {
+function testFidelity(screenshotContext: WebGLRenderingContext|
+                      WebGL2RenderingContext) {
   const width = screenshotContext.drawingBufferWidth;
   const height = screenshotContext.drawingBufferHeight;
 

diff --git a/packages/model-viewer/src/three-components/GLTFInstance.ts b/packages/model-viewer/src/three-components/GLTFInstance.ts
@@ -141,9 +141,13 @@ export class GLTFInstance implements GLTF {
         materials.forEach(material => {
           // Explicitly dispose any textures assigned to this material
           for (const propertyName in material) {
-            const propertyValue = (material as any)[propertyName];
-            if (propertyValue instanceof Texture) {
-              propertyValue.dispose();
+            const texture = (material as any)[propertyName];
+            if (texture instanceof Texture) {
+              const image = texture.source.data;
+              if (image instanceof ImageBitmap) {
+                image.close();
+              }
+              texture.dispose();
             }
           }
           material.dispose();

diff --git a/packages/modelviewer.dev/package-lock.json b/packages/modelviewer.dev/package-lock.json