Add frameState to postcompose event and minimise calls to getTransform

src/ol/render/renderevent.js

@@ -20,11 +20,12 @@ ol.render.RenderEventType = {
  * @param {ol.render.RenderEventType} type Type.
  * @param {Object=} opt_target Target.
  * @param {ol.render.IRender=} opt_render Render.
+ * @param {ol.FrameState=} opt_frameState Frame state.
  * @param {?CanvasRenderingContext2D=} opt_context Context.
  * @param {?WebGLRenderingContext=} opt_gl GL.
  */
-ol.render.RenderEvent =
+ol.render.RenderEvent = function(
-    function(type, opt_target, opt_render, opt_context, opt_gl) {
+    type, opt_target, opt_render, opt_frameState, opt_context, opt_gl) {
 
   goog.base(this, type, opt_target);
 
@@ -34,6 +35,12 @@ ol.render.RenderEvent =
    */
   this.render_ = opt_render;
 
+  /**
+   * @type {ol.FrameState|undefined}
+   * @private
+   */
+  this.frameState_ = opt_frameState;
+
   /**
    * @type {CanvasRenderingContext2D|null|undefined}
    * @private
@@ -58,6 +65,14 @@ ol.render.RenderEvent.prototype.getContext = function() {
 };
 
 
+/**
+ * @return {ol.FrameState|undefined} Frame state.
+ */
+ol.render.RenderEvent.prototype.getFrameState = function() {
+  return this.frameState_;
+};
+
+
 /**
  * @return {WebGLRenderingContext|null|undefined} GL.
  */

src/ol/renderer/canvas/canvaslayerrenderer.js

@@ -64,27 +64,28 @@ ol.renderer.canvas.Layer.prototype.composeFrame =
     }
   }
 
-  // FIXME should be able to avoid call to getTransform here if no postcompose
+  this.dispatchPostComposeEvent(context, frameState);
-  // FIXME listeners
-  var transform = this.getTransform(frameState);
-  this.dispatchPostComposeEvent(context, frameState.extent, transform);
 
 };
 
 
 /**
  * @param {CanvasRenderingContext2D} context Context.
- * @param {ol.Extent} extent Extent.
+ * @param {ol.FrameState} frameState Frame state.
- * @param {goog.vec.Mat4.AnyType} transform Transform.
+ * @param {goog.vec.Mat4.AnyType=} opt_transform Transform.
  * @protected
  */
 ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent =
-    function(context, extent, transform) {
+    function(context, frameState, opt_transform) {
   var layer = this.getLayer();
   if (layer.hasListener(ol.render.RenderEventType.POSTCOMPOSE)) {
-    var render = new ol.render.canvas.Immediate(context, extent, transform);
+    var transform = goog.isDef(opt_transform) ?
+        opt_transform : this.getTransform(frameState);
+    var render = new ol.render.canvas.Immediate(context, frameState.extent,
+        transform);
     var postComposeEvent = new ol.render.RenderEvent(
-        ol.render.RenderEventType.POSTCOMPOSE, layer, render, context, null);
+        ol.render.RenderEventType.POSTCOMPOSE, layer, render, frameState,
+        context, null);
     layer.dispatchEvent(postComposeEvent);
   }
 };

src/ol/renderer/canvas/canvasmaprenderer.js

@@ -130,7 +130,8 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
     var render = new ol.render.canvas.Immediate(
         context, frameState.extent, frameState.coordinateToPixelMatrix);
     var postComposeEvent = new ol.render.RenderEvent(
-        ol.render.RenderEventType.POSTCOMPOSE, map, render, context, null);
+        ol.render.RenderEventType.POSTCOMPOSE, map, render, frameState, context,
+        null);
     map.dispatchEvent(postComposeEvent);
   }
 

src/ol/renderer/canvas/canvasvectorlayerrenderer.js

@@ -54,17 +54,17 @@ goog.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer);
 ol.renderer.canvas.VectorLayer.prototype.composeFrame =
     function(frameState, layerState, context) {
 
-  // FIXME should be able to avoid call to getTransform here if no postcompose
+  /** @type {goog.vec.Mat4.AnyType|undefined} */
-  // FIXME listeners or replay group
+  var transform;
-  var transform = this.getTransform(frameState);
 
   var replayGroup = this.replayGroup_;
   if (!goog.isNull(replayGroup)) {
+    transform = this.getTransform(frameState);
     context.globalAlpha = layerState.opacity;
     replayGroup.draw(context, frameState.extent, transform);
   }
 
-  this.dispatchPostComposeEvent(context, frameState.extent, transform);
+  this.dispatchPostComposeEvent(context, frameState, transform);
 
 };