Capture browser GL mocking in the window module

js/ui/map.js

@@ -5,7 +5,6 @@ var browser = require('../util/browser');
 var window = require('../util/window');
 var Evented = require('../util/evented');
 var DOM = require('../util/dom');
-var webGLContext = require('../util/webgl_context');
 
 var Style = require('../style/style');
 var AnimationLoop = require('../style/animation_loop');
@@ -952,10 +951,13 @@ util.extend(Map.prototype, /** @lends Map.prototype */{
     },
 
     _setupPainter: function() {
-        var gl = webGLContext(this._canvas, util.extend({
+        var attributes = util.extend({
             failIfMajorPerformanceCaveat: this._failIfMajorPerformanceCaveat,
             preserveDrawingBuffer: this._preserveDrawingBuffer
-        }, isSupported.webGLContextAttributes));
+        }, isSupported.webGLContextAttributes);
+
+        var gl = this._canvas.getContext('webgl', attributes) ||
+            this._canvas.getContext('experimental-webgl', attributes);
 
         if (!gl) {
             this.fire('error', { error: new Error('Failed to initialize WebGL') });

js/util/window.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var jsdom = require('jsdom');
+var gl = require('gl');
 
 var window = jsdom.jsdom().defaultView;
 
@@ -9,4 +10,11 @@ window.cancelAnimationFrame = clearImmediate;
 
 window.devicePixelRatio = 1;
 
+window.HTMLCanvasElement.prototype.getContext = function(type, attributes) {
+    if (!this._webGLContext) {
+        this._webGLContext = gl(this.width, this.height, attributes);
+    }
+    return this._webGLContext;
+};
+
 module.exports = window;

package.json

@@ -82,7 +82,6 @@
   "browser": {
     "./js/util/ajax.js": "./js/util/browser/ajax.js",
     "./js/util/window.js": "./js/util/browser/window.js",
-    "./js/util/webgl_context.js": "./js/util/browser/webgl_context.js",
     "./js/util/web_worker.js": "./js/util/browser/web_worker.js"
   },
   "scripts": {