Use ol.dom.createCanvasContext2D and remove canvas variable
This commit is contained in:
@@ -2,6 +2,7 @@ goog.provide('ol.renderer.canvas.Layer');
|
|||||||
|
|
||||||
goog.require('goog.array');
|
goog.require('goog.array');
|
||||||
goog.require('goog.vec.Mat4');
|
goog.require('goog.vec.Mat4');
|
||||||
|
goog.require('ol.dom');
|
||||||
goog.require('ol.layer.Layer');
|
goog.require('ol.layer.Layer');
|
||||||
goog.require('ol.render.Event');
|
goog.require('ol.render.Event');
|
||||||
goog.require('ol.render.EventType');
|
goog.require('ol.render.EventType');
|
||||||
@@ -173,11 +174,6 @@ ol.renderer.canvas.Layer.prototype.getTransform = function(frameState) {
|
|||||||
*/
|
*/
|
||||||
ol.renderer.canvas.Layer.testCanvasSize = (function() {
|
ol.renderer.canvas.Layer.testCanvasSize = (function() {
|
||||||
|
|
||||||
/**
|
|
||||||
* @type {HTMLCanvasElement}
|
|
||||||
*/
|
|
||||||
var canvas = null;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {CanvasRenderingContext2D}
|
* @type {CanvasRenderingContext2D}
|
||||||
*/
|
*/
|
||||||
@@ -189,11 +185,8 @@ ol.renderer.canvas.Layer.testCanvasSize = (function() {
|
|||||||
var imageData = null;
|
var imageData = null;
|
||||||
|
|
||||||
return function(size) {
|
return function(size) {
|
||||||
if (goog.isNull(canvas)) {
|
if (goog.isNull(context)) {
|
||||||
canvas = /** @type {HTMLCanvasElement} */
|
context = ol.dom.createCanvasContext2D(1, 1);
|
||||||
(document.createElement('canvas'));
|
|
||||||
context = /** @type {CanvasRenderingContext2D} */
|
|
||||||
(canvas.getContext('2d'));
|
|
||||||
imageData = context.createImageData(1, 1);
|
imageData = context.createImageData(1, 1);
|
||||||
var data = imageData.data;
|
var data = imageData.data;
|
||||||
data[0] = 42;
|
data[0] = 42;
|
||||||
@@ -201,6 +194,7 @@ ol.renderer.canvas.Layer.testCanvasSize = (function() {
|
|||||||
data[2] = 126;
|
data[2] = 126;
|
||||||
data[3] = 255;
|
data[3] = 255;
|
||||||
}
|
}
|
||||||
|
var canvas = context.canvas;
|
||||||
var good = size[0] <= canvas.width && size[1] <= canvas.height;
|
var good = size[0] <= canvas.width && size[1] <= canvas.height;
|
||||||
if (!good) {
|
if (!good) {
|
||||||
canvas.width = size[0];
|
canvas.width = size[0];
|
||||||
|
|||||||
Reference in New Issue
Block a user