ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ol.dom.createCanvasContext2D and remove canvas variable

Browse Source
This commit is contained in:
ahocevar
2014-04-07 13:25:49 +02:00
parent 09021dffd4
commit d685c79e02
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/renderer/canvas/canvaslayerrenderer.js
View File

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