From f4c5168cdf7aa56dc7536a3446e100ee2bca20e0 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 18 Nov 2013 14:08:15 +0100 Subject: [PATCH] Remove renderer.Map#getCanvas function --- src/ol/renderer/canvas/canvasmaprenderer.exports | 1 - src/ol/renderer/canvas/canvasmaprenderer.js | 8 -------- src/ol/renderer/maprenderer.js | 7 ------- src/ol/renderer/webgl/webglimagelayerrenderer.js | 2 +- src/ol/renderer/webgl/webglmaprenderer.js | 8 -------- 5 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 src/ol/renderer/canvas/canvasmaprenderer.exports diff --git a/src/ol/renderer/canvas/canvasmaprenderer.exports b/src/ol/renderer/canvas/canvasmaprenderer.exports deleted file mode 100644 index 784a80737e..0000000000 --- a/src/ol/renderer/canvas/canvasmaprenderer.exports +++ /dev/null @@ -1 +0,0 @@ -@exportProperty ol.renderer.canvas.Map.prototype.getCanvas diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index 49cee29160..37a6f7ab43 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -74,14 +74,6 @@ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) { }; -/** - * @inheritDoc - */ -ol.renderer.canvas.Map.prototype.getCanvas = function() { - return this.canvas_; -}; - - /** * @inheritDoc */ diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index 0023ce8b71..c6d96d5dc4 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -3,7 +3,6 @@ goog.provide('ol.renderer.Map'); goog.require('goog.Disposable'); goog.require('goog.asserts'); goog.require('goog.dispose'); -goog.require('goog.functions'); goog.require('goog.object'); goog.require('goog.vec.Mat4'); goog.require('ol.FrameState'); @@ -91,12 +90,6 @@ ol.renderer.Map.prototype.disposeInternal = function() { }; -/** - * @return {HTMLCanvasElement} Canvas. - */ -ol.renderer.Map.prototype.getCanvas = goog.functions.NULL; - - /** * @param {ol.layer.Layer} layer Layer. * @protected diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 01f7151f5e..45b6f7ba1b 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -132,7 +132,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = if (!goog.isNull(image)) { goog.asserts.assert(!goog.isNull(texture)); - var canvas = this.getWebGLMapRenderer().getCanvas(); + var canvas = this.getWebGLMapRenderer().getContext().getCanvas(); this.updateProjectionMatrix_(canvas.width, canvas.height, viewCenter, viewResolution, viewRotation, image.getExtent()); diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 021332ad15..34a08ee743 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -267,14 +267,6 @@ ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) { }; -/** - * @inheritDoc - */ -ol.renderer.webgl.Map.prototype.getCanvas = function() { - return this.canvas_; -}; - - /** * @return {ol.webgl.Context} */