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

Merge pull request #7337 from ahocevar/blank-image

Browse Source 
Always create a new blank image to avoid CSP violations
This commit is contained in:
Andreas Hocevar
2017-10-09 13:24:49 +02:00
committed by GitHub
parent a5a0f5b98b 590dd6f1cf
commit 83cfb77407
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/imagetile.js
+7 -7
View File
@@ -61,7 +61,7 @@ ol.inherits(ol.ImageTile, ol.Tile);
ol.ImageTile.prototype.disposeInternal = function() { ol.ImageTile.prototype.disposeInternal = function() {
if (this.state == ol.TileState.LOADING) { if (this.state == ol.TileState.LOADING) {
this.unlistenImage_(); this.unlistenImage_();
this.image_.src = ol.ImageTile.blankImageUrl; this.image_ = ol.ImageTile.getBlankImage();
} }
if (this.interimTile) { if (this.interimTile) {
this.interimTile.dispose(); this.interimTile.dispose();
@@ -98,7 +98,7 @@ ol.ImageTile.prototype.getKey = function() {
ol.ImageTile.prototype.handleImageError_ = function() { ol.ImageTile.prototype.handleImageError_ = function() {
this.state = ol.TileState.ERROR; this.state = ol.TileState.ERROR;
this.unlistenImage_(); this.unlistenImage_();
this.image_.src = ol.ImageTile.blankImageUrl; this.image_ = ol.ImageTile.getBlankImage();
this.changed(); this.changed();
}; };
@@ -150,12 +150,12 @@ ol.ImageTile.prototype.unlistenImage_ = function() {
/** /**
* Data URI for a blank image. * Get a 1-pixel blank image.
* @type {string} * @return {HTMLCanvasElement} Blank image.
*/ */
ol.ImageTile.blankImageUrl = (function() { ol.ImageTile.getBlankImage = function() {
var ctx = ol.dom.createCanvasContext2D(1, 1); var ctx = ol.dom.createCanvasContext2D(1, 1);
ctx.fillStyle = 'rgba(0,0,0,0)'; ctx.fillStyle = 'rgba(0,0,0,0)';
ctx.fillRect(0, 0, 1, 1); ctx.fillRect(0, 0, 1, 1);
return ctx.canvas.toDataURL('image/png'); return ctx.canvas;
})(); };