Backed out changeset e62923d406f0 (bug 1362166) on suspicion of causing reftest failures on Linux x64 QuantumRender opt, e.g. multicol-rule-hidden-000-ref.xht. r=backout

gfx/layers/ipc/CompositorManagerChild.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include "mozilla/layers/CompositorManagerParent.h"
 #include "mozilla/layers/CompositorThread.h"
-#include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/dom/ContentChild.h"   // for ContentChild
 #include "mozilla/dom/TabChild.h"       // for TabChild
 #include "mozilla/dom/TabGroup.h"       // for TabGroup
@@ -162,7 +161,6 @@ CompositorManagerChild::CompositorManagerChild(CompositorManagerParent* aParent,
 
   mCanSend = true;
   AddRef();
-  SetReplyTimeout();
 }
 
 CompositorManagerChild::CompositorManagerChild(Endpoint<PCompositorManagerChild>&& aEndpoint,
@@ -177,7 +175,6 @@ CompositorManagerChild::CompositorManagerChild(Endpoint<PCompositorManagerChild>
 
   mCanSend = true;
   AddRef();
-  SetReplyTimeout();
 }
 
 void
@@ -246,26 +243,5 @@ CompositorManagerChild::GetSpecificMessageEventTarget(const Message& aMsg)
   return do_AddRef(tabChild->TabGroup()->EventTargetFor(TaskCategory::Other));
 }
 
-void
-CompositorManagerChild::SetReplyTimeout()
-{
-#ifndef DEBUG
-  // Add a timeout for release builds to kill GPU process when it hangs.
-  if (XRE_IsParentProcess()) {
-    int32_t timeout = gfxPrefs::GPUProcessIPCReplyTimeoutMs();
-    SetReplyTimeoutMs(timeout);
-  }
-#endif
-}
-
-bool
-CompositorManagerChild::ShouldContinueFromReplyTimeout()
-{
-  if (XRE_IsParentProcess()) {
-    GPUProcessManager::Get()->KillProcess();
-  }
-  return false;
-}
-
 } // namespace layers
 } // namespace mozilla

gfx/layers/ipc/CompositorManagerChild.h

@@ -66,8 +66,6 @@ public:
 
   bool DeallocPCompositorBridgeChild(PCompositorBridgeChild* aActor) override;
 
-  bool ShouldContinueFromReplyTimeout() override;
-
 private:
   static StaticRefPtr<CompositorManagerChild> sInstance;
 
@@ -92,8 +90,6 @@ private:
   already_AddRefed<nsIEventTarget>
   GetSpecificMessageEventTarget(const Message& aMsg) override;
 
-  void SetReplyTimeout();
-
   bool mCanSend;
   uint32_t mNamespace;
   uint32_t mResourceId;

gfx/thebes/gfxPrefs.h

@@ -552,7 +552,6 @@ private:
   DECL_GFX_PREF(Once, "layers.gpu-process.enabled",            GPUProcessEnabled, bool, false);
   DECL_GFX_PREF(Once, "layers.gpu-process.force-enabled",      GPUProcessForceEnabled, bool, false);
   DECL_GFX_PREF(Once, "layers.gpu-process.timeout_ms",         GPUProcessTimeoutMs, int32_t, 5000);
-  DECL_GFX_PREF(Once, "layers.gpu-process.ipc_reply_timeout_ms", GPUProcessIPCReplyTimeoutMs, int32_t, 10000);
   DECL_GFX_PREF(Live, "layers.gpu-process.max_restarts",       GPUProcessMaxRestarts, int32_t, 1);
   DECL_GFX_PREF(Once, "layers.gpu-process.allow-software",     GPUProcessAllowSoftware, bool, false);
   // Note: This pref will only be used if it is less than layers.gpu-process.max_restarts.