add typings for offscreencanvas

tafsiri · web-flow · commit afabd67cf991 · 2019-06-17T11:22:54.000-04:00
INTERNAL
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "@types/jasmine": "~2.5.53",
     "@types/node": "~9.6.0",
     "@types/node-fetch": "~2.1.2",
+    "@types/offscreencanvas": "~2019.3.0",
     "browserify": "~16.2.3",
     "clang-format": "~1.2.4",
     "jasmine": "~3.1.0",
diff --git a/src/backends/cpu/backend_cpu.ts b/src/backends/cpu/backend_cpu.ts
@@ -66,11 +66,9 @@ interface TensorData<D extends DataType> {
 }
 
 function createCanvas() {
-  //@ts-ignore
-  if (typeof(OffscreenCanvas) !== 'undefined') {
-    //@ts-ignore
+  if (typeof OffscreenCanvas !== 'undefined') {
     return new OffscreenCanvas(300, 150);
-  } else if (typeof(document) !== 'undefined') {
+  } else if (typeof document !== 'undefined') {
     return document.createElement('canvas');
   } else {
     throw new Error('Cannot create a canvas in this context');
@@ -81,7 +79,8 @@ export class MathBackendCPU implements KernelBackend {
   public blockSize = 48;
 
   private data: DataStorage<TensorData<DataType>>;
-  private fromPixels2DContext: CanvasRenderingContext2D;
+  private fromPixels2DContext: CanvasRenderingContext2D|
+      OffscreenCanvasRenderingContext2D;
   private firstUse = true;
 
   constructor() {
diff --git a/src/backends/webgl/canvas_util.ts b/src/backends/webgl/canvas_util.ts
@@ -56,11 +56,9 @@ export function getWebGLContext(webGLVersion: number): WebGLRenderingContext {
 }
 
 export function createCanvas(webGLVersion: number) {
-  //@ts-ignore
-  if (typeof(OffscreenCanvas) !== 'undefined' && webGLVersion === 2) {
-    //@ts-ignore
+  if (typeof OffscreenCanvas !== 'undefined' && webGLVersion === 2) {
     return new OffscreenCanvas(300, 150);
-  } else if (typeof(document) !== 'undefined') {
+  } else if (typeof document !== 'undefined') {
     return document.createElement('canvas');
   } else {
     throw new Error('Cannot create a canvas in this context');
@@ -73,7 +71,7 @@ function getWebGLRenderingContext(webGLVersion: number): WebGLRenderingContext {
   }
   const canvas = createCanvas(webGLVersion);
 
-  canvas.addEventListener('webglcontextlost', (ev : Event) => {
+  canvas.addEventListener('webglcontextlost', (ev: Event) => {
     ev.preventDefault();
     delete contexts[webGLVersion];
   }, false);
diff --git a/src/backends/webgl/canvas_util_test.ts b/src/backends/webgl/canvas_util_test.ts
@@ -22,10 +22,12 @@ import {getWebGLContext} from './canvas_util';
 
 describeWithFlags('canvas_util', BROWSER_ENVS, () => {
   it('Returns a valid canvas', () => {
-    const canvas = getWebGLContext(ENV.getNumber('WEBGL_VERSION')).canvas;
-    expect((canvas instanceof HTMLCanvasElement)
-        //@ts-ignore
-        || (canvas instanceof OffscreenCanvas)).toBe(true);
+    const canvas = getWebGLContext(ENV.getNumber('WEBGL_VERSION')).canvas as (
+                       HTMLCanvasElement | OffscreenCanvas);
+    expect(
+        (canvas instanceof HTMLCanvasElement) ||
+        (canvas instanceof OffscreenCanvas))
+        .toBe(true);
   });
 
   it('Returns a valid gl context', () => {
diff --git a/yarn.lock b/yarn.lock
@@ -142,6 +142,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.47.tgz#655b4a1cc52c8ab08f48cc055061990d6846bc97"
   integrity sha512-56wEJWXZs+3XXoTe/OCpdZ6czrONhy+6hT0GdPOb7HvudLTMJ1T5tuZPs37K5cPR5t+J9+vLPFDQgUQ8NWJE1w==
 
+"@types/offscreencanvas@~2019.3.0":
+  version "2019.3.0"
+  resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.3.0.tgz#3336428ec7e9180cf4566dfea5da04eb586a6553"
+  integrity sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q==
+
 "@types/seedrandom@2.4.27":
   version "2.4.27"
   resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.27.tgz#9db563937dd86915f69092bc43259d2f48578e41"
