Bug 1375424 - Enable the GPU time out mechanism for WR, r=sotaro

MozReview-Commit-ID: JlsODvvdQiJ

--HG--
extra : rebase_source : bab4170b1e47652e33c5395342490d992735d713
This commit is contained in:
peter chang 2017-11-24 14:27:00 +08:00
parent 374cfaa39e
commit e28fd08cee

View File

@ -287,10 +287,8 @@ CompositorManagerChild::SetReplyTimeout()
{ {
#ifndef DEBUG #ifndef DEBUG
// Add a timeout for release builds to kill GPU process when it hangs. // 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() && if (XRE_IsParentProcess() &&
GPUProcessManager::Get()->GetGPUChild() && GPUProcessManager::Get()->GetGPUChild()) {
!gfx::gfxVars::UseWebRender()) {
int32_t timeout = gfxPrefs::GPUProcessIPCReplyTimeoutMs(); int32_t timeout = gfxPrefs::GPUProcessIPCReplyTimeoutMs();
SetReplyTimeoutMs(timeout); SetReplyTimeoutMs(timeout);
} }