From 9eb031ed89b237a6ad0e7cb26c40a9bee941f898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 16 Aug 2012 15:04:23 +0200 Subject: [PATCH] remove ol.webgl.LayerRenderer.prototype.getGL (as suggest by @twpayne) --- src/ol/webgl/layerrenderer.js | 8 -------- src/ol/webgl/tilelayerrenderer.js | 10 ++++++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/ol/webgl/layerrenderer.js b/src/ol/webgl/layerrenderer.js index fb85a7ed04..59ca120d7a 100644 --- a/src/ol/webgl/layerrenderer.js +++ b/src/ol/webgl/layerrenderer.js @@ -32,14 +32,6 @@ ol.webgl.LayerRenderer.prototype.dispatchChangeEvent = function() { ol.webgl.LayerRenderer.prototype.getTexture = goog.abstractMethod; -/** - * @return {WebGLRenderingContext} GL. - */ -ol.webgl.LayerRenderer.prototype.getGL = function() { - return this.getMapRenderer().getGL(); -}; - - /** * @override * @return {ol.MapRenderer} MapRenderer. diff --git a/src/ol/webgl/tilelayerrenderer.js b/src/ol/webgl/tilelayerrenderer.js index 65b39c0ded..de57ee598b 100644 --- a/src/ol/webgl/tilelayerrenderer.js +++ b/src/ol/webgl/tilelayerrenderer.js @@ -149,7 +149,8 @@ goog.inherits(ol.webgl.TileLayerRenderer, ol.webgl.LayerRenderer); * @protected */ ol.webgl.TileLayerRenderer.prototype.disposeInternal = function() { - var gl = this.getGL(); + var mapRenderer = this.getMapRenderer(); + var gl = mapRenderer.getGL(); if (!gl.isContextLost()) { gl.deleteBuffer(this.arrayBuffer_); gl.deleteFramebuffer(this.framebuffer_); @@ -166,7 +167,8 @@ ol.webgl.TileLayerRenderer.prototype.disposeInternal = function() { ol.webgl.TileLayerRenderer.prototype.bindFramebuffer_ = function(framebufferDimension) { - var gl = this.getGL(); + var mapRenderer = this.getMapRenderer(); + var gl = mapRenderer.getGL(); if (!goog.isDef(this.framebufferDimension_) || this.framebufferDimension_ != framebufferDimension) { @@ -249,9 +251,9 @@ ol.webgl.TileLayerRenderer.prototype.handleWebGLContextLost = function() { */ ol.webgl.TileLayerRenderer.prototype.render = function() { - var gl = this.getGL(); - var map = this.getMap(); var mapRenderer = this.getMapRenderer(); + var map = this.getMap(); + var gl = mapRenderer.getGL(); goog.asserts.assert(map.isDef()); var mapCenter = map.getCenter();