From 1f1d7052a12d486711f6fbeca410ff52280aeda9 Mon Sep 17 00:00:00 2001 From: kkapsner Date: Sun, 3 Jan 2021 22:23:46 +0100 Subject: [PATCH] Fix bug in webGl parameter faking Fixes #508 --- lib/modifiedCanvasAPI.js | 10 ++++++---- lib/webgl.js | 4 ++-- versions/updates.json | 4 ++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/modifiedCanvasAPI.js b/lib/modifiedCanvasAPI.js index c4a9b9c..6de1b79 100644 --- a/lib/modifiedCanvasAPI.js +++ b/lib/modifiedCanvasAPI.js @@ -549,10 +549,12 @@ webgl.parameterChangeDefinition[originalValue.UNMASKED_VENDOR_WEBGL] && webgl.parameterChangeDefinition[originalValue.UNMASKED_RENDERER_WEBGL] ){ - const vendorDef = webgl.parameterChangeDefinition[originalValue.UNMASKED_VENDOR_WEBGL]; - const {vendorValue, vendorFaked} = vendorDef.fake(originalValue, window, prefs); - const rendererDef = webgl.parameterChangeDefinition[originalValue.UNMASKED_RENDERER_WEBGL]; - const {rendererValue, rendererFaked} = vendorDef.fake(originalValue, window, prefs); + const {value: vendorValue, faked: vendorFaked} = webgl + .parameterChangeDefinition[originalValue.UNMASKED_VENDOR_WEBGL] + .fake(this.getParameter(originalValue.UNMASKED_VENDOR_WEBGL), window, prefs); + const {value: rendererValue, faked: rendererFaked} = webgl + .parameterChangeDefinition[originalValue.UNMASKED_RENDERER_WEBGL] + .fake(this.getParameter(originalValue.UNMASKED_RENDERER_WEBGL), window, prefs); if ( vendorFaked && vendorValue === null && rendererFaked && rendererValue === null diff --git a/lib/webgl.js b/lib/webgl.js index 8cf30a8..f99179d 100644 --- a/lib/webgl.js +++ b/lib/webgl.js @@ -209,8 +209,8 @@ scope.initializeParameterDefinitions = function(){ function singleFake(originalValue, window, prefs){ - let value = parameterFakeTypes[this.type](originalValue, this, window, prefs); - let faked = value === originalValue; + const value = parameterFakeTypes[this.type](originalValue, this, window, prefs); + const faked = value !== originalValue; this.fake = function(){ return {value, faked}; }; diff --git a/versions/updates.json b/versions/updates.json index ea04719..bf6a254 100644 --- a/versions/updates.json +++ b/versions/updates.json @@ -157,6 +157,10 @@ { "version": "1.5Alpha20210103", "update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.5Alpha20210103-an+fx.xpi" + }, + { + "version": "1.5Alpha20210104", + "update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.5Alpha20210104-an+fx.xpi" } ] }