Backed out changeset f940d6d04ccd (Bug 1174857) for build failures
authorBenoit Girard <b56girard@gmail.com>
Wed, 17 Jun 2015 14:51:32 -0400
changeset 267743 f069ca975718c46fe372e5742cf93db1803bf364
parent 267742 f940d6d04ccd9d15c5dbb57730a326a4ff220431
child 267744 06c3ceb5914083881e4ba817be9d152bf6257249
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1174857
milestone39.0
backs outf940d6d04ccd9d15c5dbb57730a326a4ff220431
Backed out changeset f940d6d04ccd (Bug 1174857) for build failures
dom/canvas/WebGLContext.cpp
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -5,17 +5,16 @@
 
 #include "WebGLContext.h"
 
 #include "AccessCheck.h"
 #include "CanvasUtils.h"
 #include "gfxContext.h"
 #include "gfxCrashReporterUtils.h"
 #include "gfxPattern.h"
-#include "gfxPlatform.h"
 #include "gfxPrefs.h"
 #include "gfxUtils.h"
 #include "GLBlitHelper.h"
 #include "GLContext.h"
 #include "GLContextProvider.h"
 #include "GLReadTexImageHelper.h"
 #include "ImageContainer.h"
 #include "ImageEncoder.h"
@@ -864,20 +863,16 @@ WebGLContext::SetDimensions(int32_t sign
         GenerateWarning("Too many WebGL contexts created this run.");
         return NS_ERROR_FAILURE; // exit without changing the value of mGeneration
     }
 
     // Get some prefs for some preferred/overriden things
     NS_ENSURE_TRUE(Preferences::GetRootBranch(), NS_ERROR_FAILURE);
 
     bool disabled = Preferences::GetBool("webgl.disabled", false);
-
-    // TODO: When we have software webgl support we should use that instead.
-    disabled |= gfxPlatform::InSafeMode();
-
     if (disabled) {
         GenerateWarning("WebGL creation is disabled, and so disallowed here.");
         return NS_ERROR_FAILURE;
     }
 
     // Alright, now let's start trying.
     bool forceEnabled = Preferences::GetBool("webgl.force-enabled", false);
     ScopedGfxFeatureReporter reporter("WebGL", forceEnabled);