Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions tensorboard/webapp/app_routing/location.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,7 @@ import {Injectable} from '@angular/core';
import {fromEvent, Observable} from 'rxjs';
import {map} from 'rxjs/operators';
import {createURLSearchParamsFromSerializableQueryParams} from './internal_utils';
import {
Navigation,
NavigationFromHistory,
Route,
SerializableQueryParams,
} from './types';
import {NavigationFromHistory, Route, SerializableQueryParams} from './types';

export interface LocationInterface {
getHref(): string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ export interface ObjectRenderer<CacheValue = {}> {
destroyObject(cachedValue: CacheValue): void;

setUseDarkMode(useDarkMode: boolean): void;

/**
* Disposes rendering context. After invocation, renderer should never be
* used.
*/
dispose(): void;
}

interface PaintOption {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,4 +270,8 @@ export class SvgRenderer implements ObjectRenderer<CacheValue> {
data: vertices,
};
}

dispose() {
// noop.
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -495,4 +495,8 @@ export class ThreeRenderer implements ObjectRenderer<CacheValue> {
flush() {
this.renderer.render(this.scene, this.coordinator.getCamera());
}

dispose() {
this.renderer.dispose();
}
}
20 changes: 16 additions & 4 deletions tensorboard/webapp/widgets/line_chart_v2/lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,22 @@ export function convertRectToExtent(rect: Rect): Extent {
};
}

const cachedIsWebGl2Supported = Boolean(
self.hasOwnProperty('document') &&
document.createElement('canvas').getContext('webgl2')
);
let cachedIsWebGl2Supported = false;

{
if (
self.hasOwnProperty('WebGL2RenderingContext') &&
self.hasOwnProperty('document')
) {
const canvas = document.createElement('canvas');

canvas.addEventListener('webglcontextcreationerror', () => {
cachedIsWebGl2Supported = false;
});
const context = canvas.getContext('webgl2');
cachedIsWebGl2Supported = Boolean(context);
}
}

export function isWebGl2Supported(): boolean {
return cachedIsWebGl2Supported;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export enum HostToGuestEvent {
INIT,
DOM_RESIZED,
DARK_MODE_UPDATED,
DISPOSED,
}

export interface InitMessage {
Expand Down Expand Up @@ -73,8 +74,13 @@ export interface DarkModeUpdatedMessage {
useDarkMode: boolean;
}

export interface DisposeMessage {
type: HostToGuestEvent.DISPOSED;
}

export type HostToGuestMessage =
| DarkModeUpdatedMessage
| DisposeMessage
| ResizeMessage
| ScaleUpdateMessage
| SeriesMetadataChangedMessage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export class WorkerChart implements Chart {
}

dispose() {
this.sendMessage({type: HostToGuestEvent.DISPOSED});
this.workerInstance.free();
this.txMessagePort.close();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ function createPortHandler(port: MessagePort, initMessage: InitMessage) {
}
break;
}
case HostToGuestEvent.DISPOSED: {
lineChart.dispose();
break;
}
}
};
}