Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix shutdown crash in VsyncBridgeChild when the GPU process is enabled. (bug 1314816, r=mattwoodrow)

Browse Source
This commit is contained in:
David Anderson 2016-11-02 16:45:38 -07:00
parent 790be48aa6
commit ec7cac2aa1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/ipc/GPUProcessManager.cpp
View File

@ -397,7 +397,10 @@ GPUProcessManager::DestroyProcess()
mProcessToken = 0;
mProcess = nullptr;
mGPUChild = nullptr;
mVsyncBridge = nullptr;
if (mVsyncBridge) {
mVsyncBridge->Close();
mVsyncBridge = nullptr;
}
}
RefPtr<CompositorSession>

8
gfx/ipc/VsyncBridgeChild.cpp
View File

@ -114,8 +114,14 @@ VsyncBridgeChild::Close()
if (!mProcessToken) {
return;
}
PVsyncBridgeChild::Close();
// Clear the process token so we don't notify the GPUProcessManager. It already
// knows we're closed since it manually called Close, and in fact the GPM could
// have already been destroyed during shutdown.
mProcessToken = 0;
// Close the underlying IPC channel.
PVsyncBridgeChild::Close();
}
void