mozilla-beta: changeset 166167:8a514666c2aca42af2090e132174ffd5d0c7f05d

author	Phil Ringnalda <philringnalda@gmail.com>
	Sat, 26 Oct 2013 11:03:18 -0700
changeset 166167	8a514666c2aca42af2090e132174ffd5d0c7f05d
parent 166166	b33d8088a5984c344f73cba952d59380f9e5b05a
child 166168	e33596185286f8b753144c13cbe112621ab04314
push id	3066
push user	akeybl@mozilla.com
push date	Mon, 09 Dec 2013 19:58:46 +0000
treeherder	mozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	931344
milestone	27.0a1
backs out	fb8d9cb4698b55bd98391b80bb64cb14cea97fa3
first release with	nightly linux32 a80dce1126db / 27.0a1 / 20131027030205 / files nightly linux64 a80dce1126db / 27.0a1 / 20131027030205 / files nightly mac a80dce1126db / 27.0a1 / 20131027030205 / files nightly win32 a80dce1126db / 27.0a1 / 20131027030205 / files nightly win64 a80dce1126db / 27.0a1 / 20131027030205 / files
last release without	nightly linux32 ef3f5669b53e / 27.0a1 / 20131026030205 / files nightly linux64 ef3f5669b53e / 27.0a1 / 20131026030205 / files nightly mac ef3f5669b53e / 27.0a1 / 20131026030205 / files nightly win32 ef3f5669b53e / 27.0a1 / 20131026030205 / files nightly win64 ef3f5669b53e / 27.0a1 / 20131026030205 / files

--- a/browser/devtools/shadereditor/test/head.js
+++ b/browser/devtools/shadereditor/test/head.js
@@ -98,16 +98,17 @@ function test() {
 }
 
 function createCanvas() {
   return document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
 }
 
 function isWebGLSupported() {
   let supported =
+    !TiltGL.isWebGLForceEnabled() &&
      TiltGL.isWebGLSupported() &&
      TiltGL.create3DContext(createCanvas());
 
   info("Apparently, WebGL is" + (supported ? "" : " not") + " supported.");
   return supported;
 }
 
 function once(aTarget, aEventName, aUseCapture = false) {