Remove glContext from RenderEvent

This commit is contained in:
Frederic Junod
2019-06-17 13:50:12 +02:00
parent bd8a7bff16
commit 1f00da8d83
3 changed files with 3 additions and 26 deletions

View File

@@ -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;
}
}

View File

@@ -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);
}
}

View File

@@ -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);