Bug 1256371 - Disable the WebGL crash guard on Android. (bug 1256371, r=snorp). r=snorp, a=sylvestre
authorDavid Anderson <danderson@mozilla.com>
Tue, 15 Mar 2016 13:24:22 -0400
changeset 323490 85a96d03d8189507ec044d3a8bace14206152bdd
parent 323489 0651d94c89dfee98a8dc66f5ddc8ee1902a00f6e
child 323491 5e411e20a00622675fe06a32b6178f825afd3000
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp, snorp, sylvestre
bugs1256371
milestone47.0a2
Bug 1256371 - Disable the WebGL crash guard on Android. (bug 1256371, r=snorp). r=snorp, a=sylvestre
gfx/src/DriverCrashGuard.cpp
--- a/gfx/src/DriverCrashGuard.cpp
+++ b/gfx/src/DriverCrashGuard.cpp
@@ -486,16 +486,23 @@ void
 GLContextCrashGuard::Initialize()
 {
   if (XRE_IsContentProcess()) {
     // Disable the GL crash guard in content processes, since we're not going
     // to lose the entire browser and we don't want to hinder WebGL availability.
     return;
   }
 
+#if defined(MOZ_WIDGET_ANDROID)
+  // Disable the WebGL crash guard on Android - it doesn't use E10S, and
+  // its drivers will essentially never change, so the crash guard could
+  // permanently disable WebGL.
+  return;
+#endif
+
   DriverCrashGuard::Initialize();
 }
 
 bool
 GLContextCrashGuard::UpdateEnvironment()
 {
   static bool checked = false;
   static bool changed = false;