Bug 1289813 - split out safe mode from FEATURE_FAILURE_WEBGL_DISABLED. r=jrmuizel draft
authorBenoit Girard <b56girard@gmail.com>
Fri, 29 Jul 2016 14:28:51 -0400
changeset 394448 825eaae61c3a685ff2853eba3820a02087779dd5
parent 394447 e5db12322fd393fe7970e726cd1f4b64845f6d23
child 526806 40f1ab5fa452b1bd8a079f504f82f07527da2268
push id24566
push userb56girard@gmail.com
push dateFri, 29 Jul 2016 18:29:21 +0000
reviewersjrmuizel
bugs1289813
milestone50.0a1
Bug 1289813 - split out safe mode from FEATURE_FAILURE_WEBGL_DISABLED. r=jrmuizel MozReview-Commit-ID: Jmp911jYjix
dom/canvas/WebGLContext.cpp
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -952,17 +952,21 @@ WebGLContext::SetDimensions(int32_t sign
     ++mGeneration;
 
     bool disabled = gfxPrefs::WebGLDisabled();
 
     // TODO: When we have software webgl support we should use that instead.
     disabled |= gfxPlatform::InSafeMode();
 
     if (disabled) {
-        failureId = NS_LITERAL_CSTRING("FEATURE_FAILURE_WEBGL_DISABLED");
+        if (gfxPlatform::InSafeMode()) {
+            failureId = NS_LITERAL_CSTRING("FEATURE_FAILURE_WEBGL_SAFEMODE");
+        } else {
+            failureId = NS_LITERAL_CSTRING("FEATURE_FAILURE_WEBGL_DISABLED");
+        }
         const nsLiteralCString text("WebGL is currently disabled.");
         ThrowEvent_WebGLContextCreationError(text);
         return NS_ERROR_FAILURE;
     }
 
     if (gfxPrefs::WebGLDisableFailIfMajorPerformanceCaveat()) {
         mOptions.failIfMajorPerformanceCaveat = false;
     }