Bug 1375424 - Enable the GPU time out mechanism for WR, r?sotaro draft
authorpeter chang <pchang@mozilla.com>
Fri, 24 Nov 2017 14:27:00 +0800
changeset 703091 879a501b27400b90e68dfa2fd47f37a1562ecc4a
parent 702882 3f5d48c08903475b5f556f3d5906773978b30489
child 741666 3b48cf2aa34e835cffcfe88eadac25beea9d8e4d
push id90706
push userbmo:howareyou322@gmail.com
push dateFri, 24 Nov 2017 09:36:43 +0000
reviewerssotaro
bugs1375424
milestone59.0a1
Bug 1375424 - Enable the GPU time out mechanism for WR, r?sotaro MozReview-Commit-ID: JlsODvvdQiJ
gfx/layers/ipc/CompositorManagerChild.cpp
--- a/gfx/layers/ipc/CompositorManagerChild.cpp
+++ b/gfx/layers/ipc/CompositorManagerChild.cpp
@@ -282,20 +282,18 @@ CompositorManagerChild::GetSpecificMessa
   return nullptr;
 }
 
 void
 CompositorManagerChild::SetReplyTimeout()
 {
 #ifndef DEBUG
   // Add a timeout for release builds to kill GPU process when it hangs.
-  // Don't apply timeout when using web render as it tend to timeout frequently.
   if (XRE_IsParentProcess() &&
-      GPUProcessManager::Get()->GetGPUChild() &&
-      !gfx::gfxVars::UseWebRender()) {
+      GPUProcessManager::Get()->GetGPUChild()) {
     int32_t timeout = gfxPrefs::GPUProcessIPCReplyTimeoutMs();
     SetReplyTimeoutMs(timeout);
   }
 #endif
 }
 
 bool
 CompositorManagerChild::ShouldContinueFromReplyTimeout()