From 767f1da92c991841968a75d4cea20309baf69f7d Mon Sep 17 00:00:00 2001 From: kkapsner Date: Mon, 16 May 2016 14:44:40 +0200 Subject: [PATCH] Changed modifiedAPI to support FF28. Fixes #69. --- canvasblocker.xpi | Bin 34052 -> 33856 bytes install.rdf | 4 ++-- lib/modifiedAPI.js | 4 ++-- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/canvasblocker.xpi b/canvasblocker.xpi index b489809144694142c28c4066b99462db94b51107..9bdabc6f1b27737a3c46a7a94f9d461d0f75a157 100644 GIT binary patch delta 3752 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 delta 3826 zcmZ{ncQo8h+sAiTj}~2YLL{pt$l^vsi7o^yM7KmI%8LH8dP|faqC|@piN4XImmupV zB3h!e8zg#-2p-(;bKd9q^>5C}Qsxp%1g zYGn*uj|c*xBZojJ�rDm$$Wxi>RmV1ydTb7&(i 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 DGVlJ5 diff --git a/install.rdf b/install.rdf index 58e92d0c2..e138c4229 100644 --- a/install.rdf +++ b/install.rdf @@ -3,7 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> CanvasBlocker@kkapsner.de - 0.2.2.1-OtherRelease + 0.2.2.2-OtherRelease 2 true false @@ -12,7 +12,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - 36.0 + 28.0 40.0 diff --git a/lib/modifiedAPI.js b/lib/modifiedAPI.js index 3e424bda4..ca92b5d4d 100644 --- a/lib/modifiedAPI.js +++ b/lib/modifiedAPI.js @@ -18,7 +18,7 @@ window.HTMLCanvasElement.prototype.getContext.call(original, "experimental-webgl") || window.HTMLCanvasElement.prototype.getContext.call(original, "webgl2") || window.HTMLCanvasElement.prototype.getContext.call(original, "experimental-webgl2"); - imageData = new window.wrappedJSObject.ImageData(original.width, original.height); + imageData = context.createImageData(original.width, original.height); source = new window.wrappedJSObject.Uint8Array(imageData.data.length); window.WebGLRenderingContext.prototype.readPixels.call( context, @@ -98,7 +98,7 @@ var context = window.HTMLCanvasElement.prototype.getContext.call(getFakeCanvas(window, this.canvas), "2d"); var data = window.CanvasRenderingContext2D.prototype.getImageData.apply(context, arguments).data; - var imageData = new window.wrappedJSObject.ImageData(sw, sh); + var imageData = context.createImageData(sw, sh); for (var i = 0, l = data.length; i < l; i += 1){ imageData.data[i] = data[i]; } diff --git a/package.json b/package.json index f1a238912..a034dc99b 100644 --- a/package.json +++ b/package.json @@ -107,6 +107,6 @@ "main": "lib/main.js", "author": "Korbinian Kapsner", "license": "MPL 2.0", - "version": "0.2.2-Release", + "version": "0.2.2.2-OtherRelease", "permissions": {"private-browsing": true} }