From 1f00da8d83628b91bd0e2b07b547189d17d0a7b4 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Mon, 17 Jun 2019 13:50:12 +0200
Subject: [PATCH] Remove glContext from RenderEvent

---
 src/ol/render/Event.js          | 11 +----------
 src/ol/renderer/canvas/Layer.js |  2 +-
 test/test-extensions.js         | 16 +---------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/ol/render/Event.js b/src/ol/render/Event.js
index 36d09cf465..fc621c7bf9 100644
--- a/src/ol/render/Event.js
+++ b/src/ol/render/Event.js
@@ -12,9 +12,8 @@ class RenderEvent extends Event {
    *     CSS pixels to rendered pixels.
    * @param {import("../PluggableMap.js").FrameState=} opt_frameState Frame state.
    * @param {?CanvasRenderingContext2D=} opt_context Context.
-   * @param {?import("../webgl/Helper.js").default=} opt_glContext WebGL Context.
    */
-  constructor(type, opt_inversePixelTransform, opt_frameState, opt_context, opt_glContext) {
+  constructor(type, opt_inversePixelTransform, opt_frameState, opt_context) {
 
     super(type);
 
@@ -41,14 +40,6 @@ class RenderEvent extends Event {
      */
     this.context = opt_context;
 
-    /**
-     * WebGL context. Only available when a WebGL renderer is used, null
-     * otherwise.
-     * @type {import("../webgl/Helper.js").default|null|undefined}
-     * @api
-     */
-    this.glContext = opt_glContext;
-
   }
 
 }
diff --git a/src/ol/renderer/canvas/Layer.js b/src/ol/renderer/canvas/Layer.js
index 1522c58e8f..5508ca9f2d 100644
--- a/src/ol/renderer/canvas/Layer.js
+++ b/src/ol/renderer/canvas/Layer.js
@@ -187,7 +187,7 @@ class CanvasLayerRenderer extends LayerRenderer {
   dispatchRenderEvent_(type, context, frameState) {
     const layer = this.getLayer();
     if (layer.hasListener(type)) {
-      const event = new RenderEvent(type, this.inversePixelTransform, frameState, context, null);
+      const event = new RenderEvent(type, this.inversePixelTransform, frameState, context);
       layer.dispatchEvent(event);
     }
   }
diff --git a/test/test-extensions.js b/test/test-extensions.js
index 6a5739e759..869e871efa 100644
--- a/test/test-extensions.js
+++ b/test/test-extensions.js
@@ -443,21 +443,7 @@ import {WEBGL} from '../src/ol/has.js';
         return;
       }
 
-      let canvas;
-      if (event.glContext) {
-        const webglCanvas = event.glContext.getCanvas();
-        expect(webglCanvas).to.be.a(HTMLCanvasElement);
-
-        // draw the WebGL canvas on a new canvas, because we can not create
-        // a 2d context for that canvas because there is already a webgl context.
-        canvas = document.createElement('canvas');
-        canvas.width = webglCanvas.width;
-        canvas.height = webglCanvas.height;
-        canvas.getContext('2d').drawImage(webglCanvas, 0, 0,
-          webglCanvas.width, webglCanvas.height);
-      } else {
-        canvas = event.context.canvas;
-      }
+      const canvas = event.context.canvas;
       expect(canvas).to.be.a(HTMLCanvasElement);
 
       resembleCanvas(canvas, referenceImage, tolerance, done);