Backed out changeset 690c50d5a4ca (bug 1305941) for build bustage. r=backout on a CLOSED TREE

gfx/ipc/GPUProcessManager.cpp

@@ -60,8 +60,7 @@ GPUProcessManager::GPUProcessManager()
  : mTaskFactory(this),
    mNextLayerTreeId(0),
    mProcess(nullptr),
-   mGPUChild(nullptr),
-   mNumProcessAttempts(0)
+   mGPUChild(nullptr)
 {
   mObserver = new Observer(this);
   nsContentUtils::RegisterShutdownObserver(mObserver);
@@ -108,7 +107,7 @@ GPUProcessManager::OnXPCOMShutdown()
 }
 
 void
-GPUProcessManager::LaunchGPUProcess()
+GPUProcessManager::EnableGPUProcess()
 {
   if (mProcess) {
     return;
@@ -117,8 +116,6 @@ GPUProcessManager::LaunchGPUProcess()
   // Start the Vsync I/O thread so can use it as soon as the process launches.
   EnsureVsyncIOThread();
 
-  mNumProcessAttempts++;
-
   // The subprocess is launched asynchronously, so we wait for a callback to
   // acquire the IPDL actor.
   mProcess = new GPUProcessHost(this);
@@ -130,10 +127,6 @@ GPUProcessManager::LaunchGPUProcess()
 void
 GPUProcessManager::DisableGPUProcess(const char* aMessage)
 {
-  if (!gfxConfig::IsEnabled(Feature::GPU_PROCESS)) {
-    return;
-  }
-
   gfxConfig::SetFailed(Feature::GPU_PROCESS, FeatureStatus::Failed, aMessage);
   gfxCriticalNote << aMessage;
 
@@ -254,13 +247,6 @@ GPUProcessManager::OnProcessUnexpectedShutdown(GPUProcessHost* aHost)
 
   DestroyProcess();
 
-  if (mNumProcessAttempts > gfxPrefs::GPUProcessDevMaxRestarts()) {
-    DisableGPUProcess("GPU processed crashed too many times");
-  }
-  if (gfxConfig::IsEnabled(Feature::GPU_PROCESS)) {
-    LaunchGPUProcess();
-  }
-
   // The shutdown and restart sequence for the GPU process is as follows:
   //
   //  (1) The GPU process dies. IPDL will enqueue an ActorDestroy message on

gfx/ipc/GPUProcessManager.h

@@ -73,7 +73,7 @@ public:
   ~GPUProcessManager();
 
   // If not using a GPU process, launch a new GPU process asynchronously.
-  void LaunchGPUProcess();
+  void EnableGPUProcess();
 
   // Ensure that GPU-bound methods can be used. If no GPU process is being
   // used, or one is launched and ready, this function returns immediately.
@@ -194,7 +194,6 @@ private:
   ipc::TaskFactory<GPUProcessManager> mTaskFactory;
   RefPtr<VsyncIOThreadHolder> mVsyncIOThread;
   uint64_t mNextLayerTreeId;
-  uint32_t mNumProcessAttempts;
 
   nsTArray<RefPtr<RemoteCompositorSession>> mRemoteSessions;
   nsTArray<GPUProcessListener*> mListeners;

gfx/thebes/gfxPlatform.cpp

@@ -2178,7 +2178,7 @@ gfxPlatform::InitAcceleration()
 
     if (gpuProc.IsEnabled()) {
       GPUProcessManager* gpu = GPUProcessManager::Get();
-      gpu->LaunchGPUProcess();
+      gpu->EnableGPUProcess();
     }
   }
 }

gfx/thebes/gfxPrefs.h

@@ -479,7 +479,6 @@ private:
   DECL_GFX_PREF(Live, "layers.frame-counter",                  DrawFrameCounter, bool, false);
   DECL_GFX_PREF(Once, "layers.gpu-process.dev.enabled",        GPUProcessDevEnabled, bool, false);
   DECL_GFX_PREF(Once, "layers.gpu-process.dev.timeout_ms",     GPUProcessDevTimeoutMs, int32_t, 5000);
-  DECL_GFX_PREF(Live, "layers.gpu-process.dev.max_restarts",   GPUProcessDevMaxRestarts, int32_t, 0);
   DECL_GFX_PREF(Once, "layers.gralloc.disable",                DisableGralloc, bool, false);
   DECL_GFX_PREF(Live, "layers.low-precision-buffer",           UseLowPrecisionBuffer, bool, false);
   DECL_GFX_PREF(Live, "layers.low-precision-opacity",          LowPrecisionOpacity, float, 1.0f);