Merge remote-tracking branch 'openlayers/master' into vector-api

2013-12-05 16:52:36 +01:00
parent 82fa4861e7 fac8936688
commit 1dd5f7f7c8
7 changed files with 148 additions and 13 deletions
@@ -52,15 +52,21 @@ ol.webgl.getContext = function(canvas, opt_attributes) {
 * @const
 * @type {boolean}
 */
-ol.webgl.SUPPORTED = (function() {
-  if (!('WebGLRenderingContext' in goog.global)) {
-    return false;
-  }
-  try {
-    var canvas = /** @type {HTMLCanvasElement} */
-        (goog.dom.createElement(goog.dom.TagName.CANVAS));
-    return !goog.isNull(ol.webgl.getContext(canvas));
-  } catch (e) {
-    return false;
-  }
-})();
+ol.webgl.SUPPORTED = (
+    /**
+     * @return {boolean} WebGL supported.
+     */
+    function() {
+      if (!('WebGLRenderingContext' in goog.global)) {
+        return false;
+      }
+      try {
+        var canvas = /** @type {HTMLCanvasElement} */
+            (goog.dom.createElement(goog.dom.TagName.CANVAS));
+        return !goog.isNull(ol.webgl.getContext(canvas, {
+          failIfMajorPerformanceCaveat: true
+        }));
+      } catch (e) {
+        return false;
+      }
+    })();