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

Merge pull request #7960 from PetroDE/master

Browse Source 
Fix memory leak in CanvasImageRenderer
This commit is contained in:
Tim Schaub
2018-03-12 23:04:18 -06:00
committed by GitHub
parent ba17527d29 0fcc986dac
commit 2593ac116c
2 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ol/renderer/canvas/ImageLayer.js
View File

@@ -80,6 +80,7 @@ CanvasImageLayerRenderer['create'] = function(mapRenderer, layer) {
const candidate = /** @type {Object.<string, Function>} */ (candidates[i]);
if (candidate !== CanvasImageLayerRenderer && candidate['handles'](RendererType.CANVAS, layer)) {
renderer.setVectorRenderer(candidate['create'](mapRenderer, layer));
break;
}
}
}
@@ -87,6 +88,17 @@ CanvasImageLayerRenderer['create'] = function(mapRenderer, layer) {
};
/**
* @inheritDoc
*/
CanvasImageLayerRenderer.prototype.disposeInternal = function() {
if (this.vectorRenderer_) {
this.vectorRenderer_.dispose();
}
IntermediateCanvasRenderer.prototype.disposeInternal.call(this);
};
/**
* @inheritDoc
*/
@@ -210,6 +222,9 @@ CanvasImageLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordin
* @param {ol.renderer.canvas.VectorLayer} renderer Vector renderer.
*/
CanvasImageLayerRenderer.prototype.setVectorRenderer = function(renderer) {
if (this.vectorRenderer_) {
this.vectorRenderer_.dispose();
}
this.vectorRenderer_ = renderer;
};
export default CanvasImageLayerRenderer;