Don't double-call EnsureProcessTerminated when killing the GPU process. (bug 1310111, r=billm)
authorDavid Anderson <danderson@mozilla.com>
Fri, 14 Oct 2016 23:27:32 -0700
changeset 318153 e63eae10adb149bf36d4296888339c88754148bf
parent 318152 bb80294893738efd57ab7f172ae56ef1705bce1e
child 318154 c8183800343eb8363702ff76e2e7df9bf41b2be5
push id33211
push usercbook@mozilla.com
push dateMon, 17 Oct 2016 09:38:38 +0000
treeherderautoland@e4ef6fa03aa8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbillm
bugs1310111
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Don't double-call EnsureProcessTerminated when killing the GPU process. (bug 1310111, r=billm)
gfx/ipc/GPUProcessHost.cpp
--- a/gfx/ipc/GPUProcessHost.cpp
+++ b/gfx/ipc/GPUProcessHost.cpp
@@ -201,18 +201,16 @@ void
 GPUProcessHost::KillHard(const char* aReason)
 {
   ProcessHandle handle = GetChildProcessHandle();
   if (!base::KillProcess(handle, base::PROCESS_END_KILLED_BY_USER, false)) {
     NS_WARNING("failed to kill subprocess!");
   }
 
   SetAlreadyDead();
-  XRE_GetIOMessageLoop()->PostTask(
-    NewRunnableFunction(&ProcessWatcher::EnsureProcessTerminated, handle, /*force=*/true));
 }
 
 uint64_t
 GPUProcessHost::GetProcessToken() const
 {
   return mProcessToken;
 }