ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve memory leak when deleting a webgl layer

Browse Source 
Various references were kept, preventing the layer and underlying
renderer and webgl context to be garbage collected.

Also, the Helper was simplified because it turns out deleting manually
all Webgl objects is useless: these objects will be released when
the context is garbage collected anyway.

Note: this touches the Layer and BaseLayer classes, as the following were
preventing the layer from being garbage collected:
* layer reference in the `state_` object in BaseLayer
* dangling listener for source change in Layer
This commit is contained in:
jahow
2019-10-30 21:59:57 +01:00
committed by Olivier Guyot
parent e5e03d46a0
commit f7b0f6750b
7 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ol/renderer/webgl/PointsLayer.js
View File

@@ -19,7 +19,7 @@ import {getUid} from '../../util.js';
import WebGLRenderTarget from '../../webgl/RenderTarget.js';
import {assert} from '../../asserts.js';
import BaseVector from '../../layer/BaseVector.js';
import {listen} from '../../events.js';
import {listen, unlistenByKey} from '../../events.js';
import VectorEventType from '../../source/VectorEventType.js';
/**
@@ -288,9 +288,11 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
this.featureCache_ = {};
const source = this.getLayer().getSource();
listen(source, VectorEventType.ADDFEATURE, this.handleSourceFeatureChanged_, this);
listen(source, VectorEventType.CHANGEFEATURE, this.handleSourceFeatureChanged_, this);
listen(source, VectorEventType.REMOVEFEATURE, this.handleSourceFeatureDelete_, this);
this.sourceListenKeys_ = [
listen(source, VectorEventType.ADDFEATURE, this.handleSourceFeatureChanged_, this),
listen(source, VectorEventType.CHANGEFEATURE, this.handleSourceFeatureChanged_, this),
listen(source, VectorEventType.REMOVEFEATURE, this.handleSourceFeatureDelete_, this)
];
source.getFeatures().forEach(function(feature) {
const uid = getUid(feature);
this.featureCache_[uid] = {
@@ -548,6 +550,11 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
*/
disposeInternal() {
this.worker_.terminate();
this.layer_ = null;
this.sourceListenKeys_.forEach(function(key) {
unlistenByKey(key);
});
this.sourceListenKeys_ = null;
super.disposeInternal();
}
}