Merge pull request fingerprintjs#57 from Schinkentanz/master

Add detection for webgl support.
apple006 · Jul 17, 2015 · 6a78d84 · 6a78d84
2 parents 92e22c6 + 3f43175
commit 6a78d84
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/fingerprint2.js b/fingerprint2.js
@@ -217,7 +217,7 @@
       return keys;
     },
     webglKey: function(keys) {
-      if(!this.options.excludeWebGL && this.isCanvasSupported()) {
+      if (!this.options.excludeWebGL && this.isWebGlSupported()) {
         keys.push(this.getWebglFp());
       }
       return keys;
@@ -659,6 +659,14 @@
       result.push("webgl stencil bits:" + gl.getParameter(gl.STENCIL_BITS));
       result.push("webgl vendor:" + gl.getParameter(gl.VENDOR));
       result.push("webgl version:" + gl.getParameter(gl.VERSION));
+
+      if (!gl.getShaderPrecisionFormat) {
+        if (typeof NODEBUG === "undefined") {
+          this.log("Skipping FPing of specific webgl functions (getShaderPrecisionFormat). This browser does not support them.");
+        }
+        return result.join("~");
+      }
+
       result.push("webgl vertex shader high float precision:" + gl.getShaderPrecisionFormat(gl.VERTEX_SHADER, gl.HIGH_FLOAT ).precision);
       result.push("webgl vertex shader high float precision rangeMin:" + gl.getShaderPrecisionFormat(gl.VERTEX_SHADER, gl.HIGH_FLOAT ).rangeMin);
       result.push("webgl vertex shader high float precision rangeMax:" + gl.getShaderPrecisionFormat(gl.VERTEX_SHADER, gl.HIGH_FLOAT ).rangeMax);
@@ -695,6 +703,7 @@
       result.push("webgl fragment shader low int precision:" + gl.getShaderPrecisionFormat(gl.FRAGMENT_SHADER, gl.LOW_INT ).precision);
       result.push("webgl fragment shader low int precision rangeMin:" + gl.getShaderPrecisionFormat(gl.FRAGMENT_SHADER, gl.LOW_INT ).rangeMin);
       result.push("webgl fragment shader low int precision rangeMax:" + gl.getShaderPrecisionFormat(gl.FRAGMENT_SHADER, gl.LOW_INT ).rangeMax);
+
       return result.join("~");
     },
     getAdBlock: function(){
@@ -846,6 +855,16 @@
       var elem = document.createElement("canvas");
       return !!(elem.getContext && elem.getContext("2d"));
     },
+    isWebGlSupported: function() {
+      if (!this.isCanvasSupported()) {
+        return false;
+      }
+
+      var canvas = document.createElement("canvas"),
+          glContext = canvas.getContext && (canvas.getContext("webgl") || canvas.getContext("experimental-webgl"));
+
+      return !!window.WebGLRenderingContext && !!glContext;
+    },
     isIE: function () {
       if(navigator.appName === "Microsoft Internet Explorer") {
         return true;

diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
     "eslint": "^0.14.1",
     "gulp": "^3.8.11",
     "gulp-eslint": "^0.4.2",
+    "gulp-jasmine-phantom": "^1.2.0",
     "gulp-uglify": "^1.1.0"
   },
   "scripts": {