From 482806b4b14a4d7b76d273390915c5a1eacda1e7 Mon Sep 17 00:00:00 2001 From: photonstorm Date: Thu, 2 Apr 2015 14:47:27 +0100 Subject: [PATCH] Added guards around `context.getImageData` calls in BitmapData, Text and Canvas Tinting classes to avoid crashing restricted browsers like Epic Browser. Please understand that several Phaser features won't work correctly with this browser (thanks @Erik3000 #1714) --- README.md | 7 ++++ src/gameobjects/BitmapData.js | 32 ++++++++++++------- .../renderers/canvas/utils/CanvasTinter.js | 5 +++ src/pixi/text/Text.js | 31 ++++++++++++------ src/pixi/utils/Utils.js | 5 +++ 5 files changed, 60 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index b68a074c0..6a43f1185 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,10 @@ or the minified version: `` +[cdnjs.com](https://cdnjs.com/libraries/phaser) also offers a free CDN service. They have all versions of Phaser and even the custom builds: + +`` + ### Phaser Sandbox If you'd like to try coding in Phaser right now, with nothing more than your web browser then you can head over to the [Phaser Sandbox](http://phaser.io/sandbox). You'll find Quick Start templates and a user-friendly editor filled with handy code-completion features. @@ -244,6 +248,7 @@ Version 2.3.1 - "Katar" - in dev ### Updates +* TypeScript definitions fixes and updates (thanks @clark-stevenson @isuda) * Added missing `resumed` method to Phaser.State class template. ### Bug Fixes @@ -251,6 +256,8 @@ Version 2.3.1 - "Katar" - in dev * The LoadTexture component has had a redundant `dirty` call removed from it. * TileSprites were missing a `physicsType` property, causing them to not collide with anything (thanks @numbofathma #1702) * Sprite was missing the Health and InCamera components. +* A Tween could be incorrectly set to never end if it was given a duration of zero (thanks @hardalias #1710) +* Added guards around `context.getImageData` calls in BitmapData, Text and Canvas Tinting classes to avoid crashing restricted browsers like Epic Browser. Please understand that several Phaser features won't work correctly with this browser (thanks @Erik3000 #1714) For changes in previous releases please see the extensive [Version History](https://github.com/photonstorm/phaser/blob/master/CHANGELOG.md). diff --git a/src/gameobjects/BitmapData.js b/src/gameobjects/BitmapData.js index 88cac782a..66b9467e4 100644 --- a/src/gameobjects/BitmapData.js +++ b/src/gameobjects/BitmapData.js @@ -64,9 +64,16 @@ Phaser.BitmapData = function (game, key, width, height) { this.imageData = this.context.getImageData(0, 0, width, height); /** - * @property {Uint8ClampedArray} data - A Uint8ClampedArray view into BitmapData.buffer. + * A Uint8ClampedArray view into BitmapData.buffer. + * Note that this is unavailable in some browsers (such as Epic Browser due to its security restrictions) + * @property {Uint8ClampedArray} data */ - this.data = this.imageData.data; + this.data = null; + + if (this.imageData) + { + this.data = this.imageData.data; + } /** * @property {Uint32Array} pixels - An Uint32Array view into BitmapData.buffer. @@ -76,21 +83,24 @@ Phaser.BitmapData = function (game, key, width, height) { /** * @property {ArrayBuffer} buffer - An ArrayBuffer the same size as the context ImageData. */ - if (this.imageData.data.buffer) + if (this.data) { - this.buffer = this.imageData.data.buffer; - this.pixels = new Uint32Array(this.buffer); - } - else - { - if (window['ArrayBuffer']) + if (this.imageData.data.buffer) { - this.buffer = new ArrayBuffer(this.imageData.data.length); + this.buffer = this.imageData.data.buffer; this.pixels = new Uint32Array(this.buffer); } else { - this.pixels = this.imageData.data; + if (window['ArrayBuffer']) + { + this.buffer = new ArrayBuffer(this.imageData.data.length); + this.pixels = new Uint32Array(this.buffer); + } + else + { + this.pixels = this.imageData.data; + } } } diff --git a/src/pixi/renderers/canvas/utils/CanvasTinter.js b/src/pixi/renderers/canvas/utils/CanvasTinter.js index 6c0d61139..d559fa08d 100644 --- a/src/pixi/renderers/canvas/utils/CanvasTinter.js +++ b/src/pixi/renderers/canvas/utils/CanvasTinter.js @@ -237,6 +237,11 @@ PIXI.CanvasTinter.checkInverseAlpha = function() // Get the color values var s1 = canvas.context.getImageData(0, 0, 1, 1); + if (s1 === null) + { + return false; + } + // Plot them to x2 canvas.context.putImageData(s1, 1, 0); diff --git a/src/pixi/text/Text.js b/src/pixi/text/Text.js index 68c630361..953252dd0 100644 --- a/src/pixi/text/Text.js +++ b/src/pixi/text/Text.js @@ -353,7 +353,7 @@ PIXI.Text.prototype.determineFontProperties = function(fontStyle) { var properties = PIXI.Text.fontPropertiesCache[fontStyle]; - if(!properties) + if (!properties) { properties = {}; @@ -380,6 +380,17 @@ PIXI.Text.prototype.determineFontProperties = function(fontStyle) context.fillStyle = '#000'; context.fillText('|MÉq', 0, baseline); + if (!context.getImageData(0, 0, width, height)) + { + properties.ascent = baseline; + properties.descent = baseline + 6; + properties.fontSize = properties.ascent + properties.descent; + + PIXI.Text.fontPropertiesCache[fontStyle] = properties; + + return properties; + } + var imagedata = context.getImageData(0, 0, width, height).data; var pixels = imagedata.length; var line = width * 4; @@ -390,17 +401,18 @@ PIXI.Text.prototype.determineFontProperties = function(fontStyle) var stop = false; // ascent. scan from top to bottom until we find a non red pixel - for(i = 0; i < baseline; i++) + for (i = 0; i < baseline; i++) { - for(j = 0; j < line; j += 4) + for (j = 0; j < line; j += 4) { - if(imagedata[idx + j] !== 255) + if (imagedata[idx + j] !== 255) { stop = true; break; } } - if(!stop) + + if (!stop) { idx += line; } @@ -416,17 +428,18 @@ PIXI.Text.prototype.determineFontProperties = function(fontStyle) stop = false; // descent. scan from bottom to top until we find a non red pixel - for(i = height; i > baseline; i--) + for (i = height; i > baseline; i--) { - for(j = 0; j < line; j += 4) + for (j = 0; j < line; j += 4) { - if(imagedata[idx + j] !== 255) + if (imagedata[idx + j] !== 255) { stop = true; break; } } - if(!stop) + + if (!stop) { idx -= line; } diff --git a/src/pixi/utils/Utils.js b/src/pixi/utils/Utils.js index 41e0acf80..ababef7e2 100644 --- a/src/pixi/utils/Utils.js +++ b/src/pixi/utils/Utils.js @@ -49,6 +49,11 @@ PIXI.canUseNewCanvasBlendModes = function() context.drawImage(magenta, 0, 0); context.drawImage(yellow, 2, 0); + if (!context.getImageData(2,0,1,1)) + { + return false; + } + var data = context.getImageData(2,0,1,1).data; return (data[0] === 255 && data[1] === 0 && data[2] === 0);