Merge pull request #140 from twpayne/array-clean-ups

Array clean ups

src/ol/control/mousepositioncontrol.js

@@ -3,6 +3,7 @@
 
 goog.provide('ol.control.MousePosition');
 
+goog.require('goog.array');
 goog.require('goog.dom');
 goog.require('goog.events');
 goog.require('goog.events.EventType');

src/ol/map.js

@@ -8,7 +8,6 @@ goog.provide('ol.RendererHint');
 goog.provide('ol.RendererHints');
 
 goog.require('goog.Uri.QueryData');
-goog.require('goog.array');
 goog.require('goog.async.AnimationDelay');
 goog.require('goog.debug.Logger');
 goog.require('goog.dispose');
@@ -542,13 +541,12 @@ ol.Map.prototype.handleMapBrowserEvent = function(mapBrowserEvent) {
 ol.Map.prototype.handlePostRender = function() {
   this.tileQueue_.reprioritize(); // FIXME only call if needed
   this.tileQueue_.loadMoreTiles();
-  goog.array.forEach(
+  var postRenderFunctions = this.postRenderFunctions_;
-      this.postRenderFunctions_,
+  var i;
-      function(postRenderFunction) {
+  for (i = 0; i < postRenderFunctions.length; ++i) {
-        postRenderFunction(this, this.frameState_);
+    postRenderFunctions[i](this, this.frameState_);
-      },
+  }
-      this);
+  postRenderFunctions.length = 0;
-  this.postRenderFunctions_.length = 0;
 };
 
 
@@ -628,9 +626,11 @@ ol.Map.prototype.renderFrame_ = function(time) {
     var backgroundColor = this.getBackgroundColor();
     var viewHints = view.getHints();
     var layerStates = {};
-    goog.array.forEach(layersArray, function(layer) {
+    var layer;
+    for (i = 0; i < layersArray.length; ++i) {
+      layer = layersArray[i];
       layerStates[goog.getUid(layer)] = layer.getLayerState();
-    });
+    }
     var view2DState = view2D.getView2DState();
     frameState = {
       animate: false,
@@ -652,12 +652,15 @@ ol.Map.prototype.renderFrame_ = function(time) {
     };
   }
 
-  this.preRenderFunctions_ = goog.array.filter(
+  var preRenderFunctions = this.preRenderFunctions_;
-      this.preRenderFunctions_,
+  var n = 0, preRenderFunction;
-      function(preRenderFunction) {
+  for (i = 0; i < preRenderFunctions.length; ++i) {
-        return preRenderFunction(this, frameState);
+    preRenderFunction = preRenderFunctions[i];
-      },
+    if (preRenderFunction(this, frameState)) {
-      this);
+      preRenderFunctions[n++] = preRenderFunction;
+    }
+  }
+  preRenderFunctions.length = n;
 
   if (!goog.isNull(frameState)) {
     // FIXME works for View2D only

src/ol/mapbrowserevent.js

@@ -2,6 +2,7 @@ goog.provide('ol.MapBrowserEvent');
 goog.provide('ol.MapBrowserEvent.EventType');
 goog.provide('ol.MapBrowserEventHandler');
 
+goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.events.BrowserEvent');
 goog.require('goog.events.EventTarget');

src/ol/overlay/overlay.js

@@ -1,6 +1,7 @@
 goog.provide('ol.overlay.Overlay');
 goog.provide('ol.overlay.OverlayPositioning');
 
+goog.require('goog.array');
 goog.require('goog.events');
 goog.require('goog.style');
 

src/ol/renderer/canvas/canvasmaprenderer.js

@@ -2,6 +2,7 @@
 
 goog.provide('ol.renderer.canvas.Map');
 
+goog.require('goog.array');
 goog.require('goog.dom');
 goog.require('goog.style');
 goog.require('goog.vec.Mat4');

src/ol/renderer/canvas/canvastilelayerrenderer.js

@@ -4,6 +4,7 @@
 
 goog.provide('ol.renderer.canvas.TileLayer');
 
+goog.require('goog.array');
 goog.require('goog.dom');
 goog.require('goog.style');
 goog.require('goog.vec.Mat4');

src/ol/renderer/dom/dommaprenderer.js

@@ -1,5 +1,6 @@
 goog.provide('ol.renderer.dom.Map');
 
+goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');

src/ol/renderer/maprenderer.js

@@ -1,6 +1,7 @@
 goog.provide('ol.renderer.Map');
 
 goog.require('goog.Disposable');
+goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.events');
 goog.require('goog.functions');

src/ol/renderer/webgl/webglmaprenderer.js

@@ -5,6 +5,7 @@
 goog.provide('ol.renderer.webgl.Map');
 goog.provide('ol.renderer.webgl.map.shader');
 
+goog.require('goog.array');
 goog.require('goog.debug.Logger');
 goog.require('goog.dispose');
 goog.require('goog.dom');

src/ol/source/bingmapssource.js

@@ -2,6 +2,7 @@ goog.provide('ol.BingMapsStyle');
 goog.provide('ol.source.BingMaps');
 
 goog.require('goog.Uri');
+goog.require('goog.array');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
 goog.require('goog.net.Jsonp');

src/ol/source/tiledwmssource.js

@@ -3,6 +3,7 @@
 goog.provide('ol.source.TiledWMS');
 
 
+goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.object');
 goog.require('goog.uri.utils');

src/ol/tileurlfunction.js

@@ -1,6 +1,7 @@
 goog.provide('ol.TileUrlFunction');
 goog.provide('ol.TileUrlFunctionType');
 
+goog.require('goog.array');
 goog.require('goog.math');
 goog.require('goog.uri.utils');
 goog.require('ol.TileCoord');