From 1df516e14d3beab74e06a2f7d16eeded8264e623 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Wed, 15 Jan 2014 15:00:34 +0100
Subject: [PATCH] Use opt_this instead of opt_obj in ol.renderer.Layer

---
 src/ol/renderer/canvas/canvasimagelayerrenderer.js  | 4 ++--
 src/ol/renderer/canvas/canvasvectorlayerrenderer.js | 4 ++--
 src/ol/renderer/dom/domimagelayerrenderer.js        | 4 ++--
 src/ol/renderer/layerrenderer.js                    | 8 ++++----
 src/ol/renderer/webgl/webglimagelayerrenderer.js    | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
index a108112034..bf53f5cf9a 100644
--- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
@@ -45,7 +45,7 @@ goog.inherits(ol.renderer.canvas.ImageLayer, ol.renderer.canvas.Layer);
  * @inheritDoc
  */
 ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel =
-    function(coordinate, frameState, callback, opt_obj) {
+    function(coordinate, frameState, callback, opt_this) {
   var layer = this.getLayer();
   var source = layer.getSource();
   goog.asserts.assertInstanceof(source, ol.source.Image);
@@ -58,7 +58,7 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel =
        * @return {?} Callback result.
        */
       function(feature) {
-        return callback.call(opt_obj, feature, this);
+        return callback.call(opt_this, feature, this);
       });
 };
 
diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
index 4247864b11..05f4a5a228 100644
--- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -89,7 +89,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
  * @inheritDoc
  */
 ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel =
-    function(coordinate, frameState, callback, opt_obj) {
+    function(coordinate, frameState, callback, opt_this) {
   if (goog.isNull(this.replayGroup_)) {
     return undefined;
   } else {
@@ -109,7 +109,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel =
         function(geometry, data) {
           var feature = /** @type {ol.Feature} */ (data);
           goog.asserts.assert(goog.isDef(feature));
-          return callback.call(opt_obj, feature, layer);
+          return callback.call(opt_this, feature, layer);
         });
   }
 };
diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js
index 2578a0e682..b062dd984c 100644
--- a/src/ol/renderer/dom/domimagelayerrenderer.js
+++ b/src/ol/renderer/dom/domimagelayerrenderer.js
@@ -50,7 +50,7 @@ goog.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer);
  * @inheritDoc
  */
 ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel =
-    function(coordinate, frameState, callback, opt_obj) {
+    function(coordinate, frameState, callback, opt_this) {
   var layer = this.getLayer();
   var source = layer.getSource();
   goog.asserts.assertInstanceof(source, ol.source.Image);
@@ -63,7 +63,7 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel =
        * @return {?} Callback result.
        */
       function(feature) {
-        return callback.call(opt_obj, feature, this);
+        return callback.call(opt_this, feature, this);
       });
 };
 
diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js
index dd7b5af273..dfce3aae5e 100644
--- a/src/ol/renderer/layerrenderer.js
+++ b/src/ol/renderer/layerrenderer.js
@@ -49,7 +49,7 @@ goog.inherits(ol.renderer.Layer, goog.Disposable);
  * @param {ol.FrameState} frameState Frame state.
  * @param {function(this: S, ol.Feature, ol.layer.Layer): T} callback Feature
  *     callback.
- * @param {S=} opt_obj Scope.
+ * @param {S=} opt_this Object to use as `this` in `callback`.
  * @return {T|undefined} Callback result.
  * @template S,T
  */
@@ -249,13 +249,13 @@ ol.renderer.Layer.prototype.snapCenterToPixel =
  * @param {number} currentZ Current Z.
  * @param {number} preload Load low resolution tiles up to 'preload' levels.
  * @param {function(this: T, ol.Tile)=} opt_tileCallback Tile callback.
- * @param {T=} opt_obj Object.
+ * @param {T=} opt_this Object to use as `this` in `opt_tileCallback`.
  * @protected
  * @template T
  */
 ol.renderer.Layer.prototype.manageTilePyramid = function(
     frameState, tileSource, tileGrid, projection, extent, currentZ, preload,
-    opt_tileCallback, opt_obj) {
+    opt_tileCallback, opt_this) {
   var tileSourceKey = goog.getUid(tileSource).toString();
   if (!(tileSourceKey in frameState.wantedTiles)) {
     frameState.wantedTiles[tileSourceKey] = {};
@@ -279,7 +279,7 @@ ol.renderer.Layer.prototype.manageTilePyramid = function(
             }
           }
           if (goog.isDef(opt_tileCallback)) {
-            opt_tileCallback.call(opt_obj, tile);
+            opt_tileCallback.call(opt_this, tile);
           }
         } else {
           tileSource.useTile(z, x, y);
diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js
index 2fd5c166fd..e2b45f7cbd 100644
--- a/src/ol/renderer/webgl/webglimagelayerrenderer.js
+++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js
@@ -76,7 +76,7 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
  * @inheritDoc
  */
 ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtPixel =
-    function(coordinate, frameState, callback, opt_obj) {
+    function(coordinate, frameState, callback, opt_this) {
   var layer = this.getLayer();
   var source = layer.getSource();
   goog.asserts.assertInstanceof(source, ol.source.Image);
@@ -89,7 +89,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtPixel =
        * @return {?} Callback result.
        */
       function(feature) {
-        return callback.call(opt_obj, feature, this);
+        return callback.call(opt_this, feature, this);
       });
 };