From 78324fb54b449a6c4467452df20cadb8274a871d Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Thu, 3 Apr 2014 12:02:58 -0600
Subject: [PATCH] Remove layers array from frame state

---
 externs/oli.js                       | 4 ----
 src/ol/control/attributioncontrol.js | 6 +++---
 src/ol/map.js                        | 1 -
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/externs/oli.js b/externs/oli.js
index be5000cc35..675505c8ae 100644
--- a/externs/oli.js
+++ b/externs/oli.js
@@ -64,10 +64,6 @@ oli.FrameState.prototype.focus;
 oli.FrameState.prototype.index;
 
 
-/** @type {Array.<ol.layer.Layer>} */
-oli.FrameState.prototype.layersArray;
-
-
 /** @type {Object.<number, ol.layer.LayerState>} */
 oli.FrameState.prototype.layerStates;
 
diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attributioncontrol.js
index 1433b40908..109faf06f9 100644
--- a/src/ol/control/attributioncontrol.js
+++ b/src/ol/control/attributioncontrol.js
@@ -74,13 +74,13 @@ ol.control.Attribution.prototype.getSourceAttributions =
     function(frameState) {
   var i, ii, j, jj, tileRanges, source, sourceAttribution,
       sourceAttributionKey, sourceAttributions, sourceKey;
-  var layers = frameState.layersArray;
+  var layerStatesArray = frameState.layerStatesArray;
   /** @type {Object.<string, ol.Attribution>} */
   var attributions = goog.object.clone(frameState.attributions);
   /** @type {Object.<string, ol.Attribution>} */
   var hiddenAttributions = {};
-  for (i = 0, ii = layers.length; i < ii; i++) {
-    source = layers[i].getSource();
+  for (i = 0, ii = layerStatesArray.length; i < ii; i++) {
+    source = layerStatesArray[i].layer.getSource();
     sourceKey = goog.getUid(source).toString();
     sourceAttributions = source.getAttributions();
     if (goog.isNull(sourceAttributions)) {
diff --git a/src/ol/map.js b/src/ol/map.js
index b490cd89e6..5463e5174a 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -1224,7 +1224,6 @@ ol.Map.prototype.renderFrame_ = function(time) {
       extent: null,
       focus: goog.isNull(this.focus_) ? view2DState.center : this.focus_,
       index: this.frameIndex_++,
-      layersArray: layersArray,
       layerStates: layerStates,
       layerStatesArray: layerStatesArray,
       logos: {},