From ebdb5dce22ae25669c4dbdb6b6c56b21468e031c Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 20 Feb 2014 03:05:31 +0100
Subject: [PATCH] Rename ol.Map#render to ol.Map#renderSync

---
 src/ol/control/control.js                 |  2 +-
 src/ol/control/zoomslidercontrol.js       |  2 +-
 src/ol/map.exports                        |  2 +-
 src/ol/map.js                             | 14 +++++++-------
 src/ol/renderer/layerrenderer.js          |  2 +-
 src/ol/renderer/webgl/webglmaprenderer.js |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/ol/control/control.js b/src/ol/control/control.js
index ab61fc8c0b..a080e05def 100644
--- a/src/ol/control/control.js
+++ b/src/ol/control/control.js
@@ -103,6 +103,6 @@ ol.control.Control.prototype.setMap = function(map) {
       this.listenerKeys.push(goog.events.listen(map,
           ol.MapEventType.POSTRENDER, this.handleMapPostrender, false, this));
     }
-    map.render();
+    map.renderSync();
   }
 };
diff --git a/src/ol/control/zoomslidercontrol.js b/src/ol/control/zoomslidercontrol.js
index c2cf84481e..a8330a223a 100644
--- a/src/ol/control/zoomslidercontrol.js
+++ b/src/ol/control/zoomslidercontrol.js
@@ -116,7 +116,7 @@ ol.control.ZoomSlider.direction = {
 ol.control.ZoomSlider.prototype.setMap = function(map) {
   goog.base(this, 'setMap', map);
   if (!goog.isNull(map)) {
-    map.render();
+    map.renderSync();
   }
 };
 
diff --git a/src/ol/map.exports b/src/ol/map.exports
index 97bbc8abf7..3c4e88dc60 100644
--- a/src/ol/map.exports
+++ b/src/ol/map.exports
@@ -18,6 +18,6 @@
 @exportProperty ol.Map.prototype.removeInteraction
 @exportProperty ol.Map.prototype.removeLayer
 @exportProperty ol.Map.prototype.removeOverlay
-@exportProperty ol.Map.prototype.render
+@exportProperty ol.Map.prototype.renderSync
 @exportProperty ol.Map.prototype.requestRenderFrame
 @exportProperty ol.Map.prototype.updateSize
diff --git a/src/ol/map.js b/src/ol/map.js
index 17f88cc720..b527f0e63b 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -866,7 +866,7 @@ ol.Map.prototype.handlePostRender = function() {
  * @private
  */
 ol.Map.prototype.handleSizeChanged_ = function() {
-  this.render();
+  this.renderSync();
 };
 
 
@@ -917,7 +917,7 @@ ol.Map.prototype.handleTileChange_ = function() {
  * @private
  */
 ol.Map.prototype.handleViewPropertyChanged_ = function() {
-  this.render();
+  this.renderSync();
 };
 
 
@@ -935,7 +935,7 @@ ol.Map.prototype.handleViewChanged_ = function() {
         view, ol.ObjectEventType.PROPERTYCHANGE,
         this.handleViewPropertyChanged_, false, this);
   }
-  this.render();
+  this.renderSync();
 };
 
 
@@ -945,7 +945,7 @@ ol.Map.prototype.handleViewChanged_ = function() {
  */
 ol.Map.prototype.handleLayerGroupMemberChanged_ = function(event) {
   goog.asserts.assertInstanceof(event, goog.events.Event);
-  this.render();
+  this.renderSync();
 };
 
 
@@ -955,7 +955,7 @@ ol.Map.prototype.handleLayerGroupMemberChanged_ = function(event) {
  */
 ol.Map.prototype.handleLayerGroupPropertyChanged_ = function(event) {
   goog.asserts.assertInstanceof(event, ol.ObjectEvent);
-  this.render();
+  this.renderSync();
 };
 
 
@@ -981,7 +981,7 @@ ol.Map.prototype.handleLayerGroupChanged_ = function() {
           this.handleLayerGroupMemberChanged_, false, this)
     ];
   }
-  this.render();
+  this.renderSync();
 };
 
 
@@ -1013,7 +1013,7 @@ ol.Map.prototype.isDef = function() {
 /**
  * Render.
  */
-ol.Map.prototype.render = function() {
+ol.Map.prototype.renderSync = function() {
   if (this.animationDelay_.isActive()) {
     // pass
   } else if (this.freezeRenderingCount_ === 0) {
diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js
index 09dc1199ae..95cbe82262 100644
--- a/src/ol/renderer/layerrenderer.js
+++ b/src/ol/renderer/layerrenderer.js
@@ -109,7 +109,7 @@ ol.renderer.Layer.prototype.prepareFrame = goog.abstractMethod;
 ol.renderer.Layer.prototype.renderIfReadyAndVisible = function() {
   var layer = this.getLayer();
   if (layer.getVisible() && layer.getSourceState() == ol.source.State.READY) {
-    this.getMap().render();
+    this.getMap().renderSync();
   }
 };
 
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index 9eba422d21..d541069773 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -387,7 +387,7 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
  */
 ol.renderer.webgl.Map.prototype.handleWebGLContextRestored = function() {
   this.initializeGL_();
-  this.getMap().render();
+  this.getMap().renderSync();
 };