From 3bd1b92b056dfa06a18d80dd3fc53a094597c20e Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Mon, 28 Jan 2013 19:56:32 +0100
Subject: [PATCH] Promote renderFrame from ol.renderer.*.LayerRender to
 ol.renderer.LayerRenderer

---
 src/ol/renderer/canvas/canvaslayerrenderer.js |  9 ---------
 src/ol/renderer/dom/domlayerrenderer.js       |  9 ---------
 src/ol/renderer/layerrenderer.js              |  8 ++++++++
 src/ol/renderer/webgl/webgllayerrenderer.js   | 10 ----------
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/canvaslayerrenderer.js
index 78ed9d6665..f63048d8e3 100644
--- a/src/ol/renderer/canvas/canvaslayerrenderer.js
+++ b/src/ol/renderer/canvas/canvaslayerrenderer.js
@@ -1,7 +1,5 @@
 goog.provide('ol.renderer.canvas.Layer');
 
-goog.require('ol.FrameState');
-goog.require('ol.layer.LayerState');
 goog.require('ol.renderer.Layer');
 
 
@@ -28,10 +26,3 @@ ol.renderer.canvas.Layer.prototype.getImage = goog.abstractMethod;
  * @return {!goog.vec.Mat4.Number} Transform.
  */
 ol.renderer.canvas.Layer.prototype.getTransform = goog.abstractMethod;
-
-
-/**
- * @param {ol.FrameState} frameState Frame state.
- * @param {ol.layer.LayerState} layerState Layer state.
- */
-ol.renderer.canvas.Layer.prototype.renderFrame = goog.abstractMethod;
diff --git a/src/ol/renderer/dom/domlayerrenderer.js b/src/ol/renderer/dom/domlayerrenderer.js
index 4c78d42ed9..5a39813363 100644
--- a/src/ol/renderer/dom/domlayerrenderer.js
+++ b/src/ol/renderer/dom/domlayerrenderer.js
@@ -1,9 +1,7 @@
 goog.provide('ol.renderer.dom.Layer');
 
 goog.require('ol.Coordinate');
-goog.require('ol.FrameState');
 goog.require('ol.layer.Layer');
-goog.require('ol.layer.LayerState');
 goog.require('ol.renderer.Layer');
 
 
@@ -44,10 +42,3 @@ ol.renderer.dom.Layer.prototype.disposeInternal = function() {
 ol.renderer.dom.Layer.prototype.getTarget = function() {
   return this.target;
 };
-
-
-/**
- * @param {ol.FrameState} frameState Frame state.
- * @param {ol.layer.LayerState} layerState Layer state.
- */
-ol.renderer.dom.Layer.prototype.renderFrame = goog.abstractMethod;
diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js
index 795e51988d..e3f2b01635 100644
--- a/src/ol/renderer/layerrenderer.js
+++ b/src/ol/renderer/layerrenderer.js
@@ -7,6 +7,7 @@ goog.require('ol.Object');
 goog.require('ol.TileRange');
 goog.require('ol.layer.Layer');
 goog.require('ol.layer.LayerProperty');
+goog.require('ol.layer.LayerState');
 goog.require('ol.source.TileSource');
 
 
@@ -144,6 +145,13 @@ ol.renderer.Layer.prototype.handleLayerVisibleChange = function() {
 };
 
 
+/**
+ * @param {ol.FrameState} frameState Frame state.
+ * @param {ol.layer.LayerState} layerState Layer state.
+ */
+ol.renderer.Layer.prototype.renderFrame = goog.abstractMethod;
+
+
 /**
  * @protected
  * @param {ol.FrameState} frameState Frame state.
diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js
index 988d1d6ac4..3f8f3c2d17 100644
--- a/src/ol/renderer/webgl/webgllayerrenderer.js
+++ b/src/ol/renderer/webgl/webgllayerrenderer.js
@@ -3,9 +3,7 @@
 goog.provide('ol.renderer.webgl.Layer');
 
 goog.require('goog.vec.Mat4');
-goog.require('ol.FrameState');
 goog.require('ol.layer.Layer');
-goog.require('ol.layer.LayerState');
 goog.require('ol.renderer.Layer');
 goog.require('ol.vec.Mat4');
 
@@ -149,14 +147,6 @@ ol.renderer.webgl.Layer.prototype.handleLayerSaturationChange = function() {
 ol.renderer.webgl.Layer.prototype.handleWebGLContextLost = goog.nullFunction;
 
 
-/**
- * Render.
- * @param {ol.FrameState} frameState Frame state.
- * @param {ol.layer.LayerState} layerState Layer state.
- */
-ol.renderer.webgl.Layer.prototype.renderFrame = goog.abstractMethod;
-
-
 /**
  * @private
  */