From 756792b8dbde071c85821d6a004ed5f267651b40 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 4 Oct 2012 12:03:52 +0200
Subject: [PATCH] Pass time to render functions and rename them to renderFrame_

---
 src/ol/map.js                                   | 4 ++--
 src/ol/renderer/dom/domlayerrenderer.js         | 3 ++-
 src/ol/renderer/dom/dommaprenderer.js           | 5 +++--
 src/ol/renderer/dom/domtilelayerrenderer.js     | 2 +-
 src/ol/renderer/maprenderer.js                  | 3 ++-
 src/ol/renderer/webgl/webgllayerrenderer.js     | 3 ++-
 src/ol/renderer/webgl/webglmaprenderer.js       | 6 +++---
 src/ol/renderer/webgl/webgltilelayerrenderer.js | 2 +-
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/ol/map.js b/src/ol/map.js
index d674f05d3a..3e0296695d 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -690,7 +690,7 @@ ol.Map.prototype.render = function() {
 
 
 /**
- * Request that render be called some time in the future.
+ * Request that renderFrame_ be called some time in the future.
  */
 ol.Map.prototype.requestRenderFrame = function() {
   if (this.freezeRenderingCount_ === 0) {
@@ -714,7 +714,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
   if (goog.DEBUG) {
     this.logger.info('renderFrame_');
   }
-  this.renderer_.render();
+  this.renderer_.renderFrame(time);
   this.dirty_ = false;
   if (goog.DEBUG) {
     this.logger.info('postrender');
diff --git a/src/ol/renderer/dom/domlayerrenderer.js b/src/ol/renderer/dom/domlayerrenderer.js
index cddf4ce527..ed7ae1203f 100644
--- a/src/ol/renderer/dom/domlayerrenderer.js
+++ b/src/ol/renderer/dom/domlayerrenderer.js
@@ -71,8 +71,9 @@ ol.renderer.dom.Layer.prototype.handleLayerVisibleChange = function() {
 
 /**
  * Render.
+ * @param {number} time Time.
  */
-ol.renderer.dom.Layer.prototype.render = goog.abstractMethod;
+ol.renderer.dom.Layer.prototype.renderFrame = goog.abstractMethod;
 
 
 /**
diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/dommaprenderer.js
index be2ff3f869..e14abf983d 100644
--- a/src/ol/renderer/dom/dommaprenderer.js
+++ b/src/ol/renderer/dom/dommaprenderer.js
@@ -184,8 +184,9 @@ ol.renderer.dom.Map.prototype.handleSizeChanged = function() {
 /**
  * Render the map.  Sets up the layers pane on first render and adjusts its
  * position as needed on subsequent calls.
+ * @inheritDoc
  */
-ol.renderer.dom.Map.prototype.render = function() {
+ol.renderer.dom.Map.prototype.renderFrame = function(time) {
   var map = this.getMap();
   if (!map.isDef()) {
     return;
@@ -228,7 +229,7 @@ ol.renderer.dom.Map.prototype.render = function() {
 
   var animate = false;
   this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
-    if (layerRenderer.render()) {
+    if (layerRenderer.renderFrame(time)) {
       animate = true;
     }
   });
diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js
index 7b3abd7d0d..8ed136685f 100644
--- a/src/ol/renderer/dom/domtilelayerrenderer.js
+++ b/src/ol/renderer/dom/domtilelayerrenderer.js
@@ -108,7 +108,7 @@ ol.renderer.dom.TileLayer.prototype.handleTileChange_ = function(event) {
 /**
  * @inheritDoc
  */
-ol.renderer.dom.TileLayer.prototype.render = function() {
+ol.renderer.dom.TileLayer.prototype.renderFrame = function(time) {
 
   var map = this.getMap();
   if (!map.isDef()) {
diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js
index 882b971f32..b1caf6a48d 100644
--- a/src/ol/renderer/maprenderer.js
+++ b/src/ol/renderer/maprenderer.js
@@ -310,8 +310,9 @@ ol.renderer.Map.prototype.removeLayerRenderer = function(layer) {
 
 /**
  * Render.
+ * @param {number} time Time.
  */
-ol.renderer.Map.prototype.render = goog.functions.FALSE;
+ol.renderer.Map.prototype.renderFrame = goog.functions.FALSE;
 
 
 /**
diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js
index 638ae00424..465d6ac55a 100644
--- a/src/ol/renderer/webgl/webgllayerrenderer.js
+++ b/src/ol/renderer/webgl/webgllayerrenderer.js
@@ -112,6 +112,7 @@ ol.renderer.webgl.Layer.prototype.handleWebGLContextLost = goog.nullFunction;
 
 /**
  * Render.
+ * @param {number} time Time.
  * @return {boolean} Request render frame.
  */
-ol.renderer.webgl.Layer.prototype.render = goog.abstractMethod;
+ol.renderer.webgl.Layer.prototype.renderFrame = goog.abstractMethod;
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index 16cf4650b8..5a7d893bfb 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -601,7 +601,7 @@ ol.renderer.webgl.Map.prototype.removeLayerRenderer = function(layer) {
 /**
  * @inheritDoc
  */
-ol.renderer.webgl.Map.prototype.render = function() {
+ol.renderer.webgl.Map.prototype.renderFrame = function(time) {
 
   if (!this.getMap().isDef()) {
     return;
@@ -610,7 +610,7 @@ ol.renderer.webgl.Map.prototype.render = function() {
   var requestRenderFrame = false;
 
   this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
-    if (layerRenderer.render()) {
+    if (layerRenderer.renderFrame(time)) {
       requestRenderFrame = true;
     }
   });
@@ -624,7 +624,7 @@ ol.renderer.webgl.Map.prototype.render = function() {
 
   var animate = false;
   this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
-    if (layerRenderer.render()) {
+    if (layerRenderer.renderFrame(time)) {
       animate = true;
     }
   });
diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js
index c849b31362..d5d2bdf328 100644
--- a/src/ol/renderer/webgl/webgltilelayerrenderer.js
+++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js
@@ -285,7 +285,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
 /**
  * @inheritDoc
  */
-ol.renderer.webgl.TileLayer.prototype.render = function() {
+ol.renderer.webgl.TileLayer.prototype.renderFrame = function(time) {
 
   var requestRenderFrame = false;