Bug 1316988: Change the wording of the error message. r?rhunt
MozReview-Commit-ID: GB1sF1APkBJ
--- a/gfx/ipc/GPUProcessManager.cpp
+++ b/gfx/ipc/GPUProcessManager.cpp
@@ -227,17 +227,17 @@ GPUProcessManager::EnsureVRManager()
}
void
GPUProcessManager::OnProcessLaunchComplete(GPUProcessHost* aHost)
{
MOZ_ASSERT(mProcess && mProcess == aHost);
if (!mProcess->IsConnected()) {
- DisableGPUProcess("Failed to launch GPU process");
+ DisableGPUProcess("Failed to connect GPU process");
return;
}
mGPUChild = mProcess->GetActor();
mProcessToken = mProcess->GetProcessToken();
Endpoint<PVsyncBridgeParent> vsyncParent;
Endpoint<PVsyncBridgeChild> vsyncChild;
@@ -316,17 +316,20 @@ GPUProcessManager::OnProcessDeviceReset(
void
GPUProcessManager::OnProcessUnexpectedShutdown(GPUProcessHost* aHost)
{
MOZ_ASSERT(mProcess && mProcess == aHost);
DestroyProcess();
if (mNumProcessAttempts > uint32_t(gfxPrefs::GPUProcessDevMaxRestarts())) {
- DisableGPUProcess("GPU processed crashed too many times");
+ char disableMessage[64];
+ SprintfLiteral(disableMessage, "GPU process disabled after %d attempts",
+ mNumProcessAttempts);
+ DisableGPUProcess(disableMessage);
}
HandleProcessLost();
}
void
GPUProcessManager::HandleProcessLost()
{