Backed out changeset 55f389b590b7 (bug 1268638)

--HG--
extra : rebase_source : 148700074878399bb64f4bcb76ea0096eb85e85e

dom/canvas/WebGLContext.cpp

@@ -695,15 +695,16 @@ bool
 WebGLContext::CreateAndInitGL(bool forceEnabled,
                               std::vector<FailureReason>* const out_failReasons)
 {
-    bool disableNativeGL = true;
-    if (forceEnabled) {
-        disableNativeGL = false;
-    } else if (IsWebGL2()) {
+    bool blacklistOpenGL = false;
+    if (!forceEnabled) {
         const nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo();
-        const auto feature = nsIGfxInfo::FEATURE_WEBGL_OPENGL;
 
         FailureReason reason;
-        if (IsFeatureInBlacklist(gfxInfo, feature, &reason.key)) {
+        if (IsFeatureInBlacklist(gfxInfo, nsIGfxInfo::FEATURE_WEBGL_OPENGL,
+                                 &reason.key))
+        {
+            blacklistOpenGL = true;
+
             reason.info = "Refused to create native OpenGL context because of blacklist"
                           " entry: ";
             reason.info.Append(reason.key);
@@ -711,8 +712,6 @@ WebGLContext::CreateAndInitGL(bool forceEnabled,
             out_failReasons->push_back(reason);
 
             GenerateWarning(reason.info.BeginReading());
-        } else {
-            disableNativeGL = false;
         }
     }
 
@@ -728,7 +727,7 @@ WebGLContext::CreateAndInitGL(bool forceEnabled,
 
     //////
 
-    if (!disableNativeGL) {
+    if (!blacklistOpenGL) {
         const bool useEGL = PR_GetEnv("MOZ_WEBGL_FORCE_EGL");
 
         if (useEGL)